Commit Graph

691 Commits

Author SHA1 Message Date
Tom Overton
6125d48b07
Document object_kibako (#542)
* Document object_kibako

* File comment header

* Single line comment styling
2022-01-04 07:04:30 +00:00
Tom Overton
9c682e5e52
Document Deku Flower objects and other Obj_Etcetera-related cleanup (#544)
* Document Deku Flower objects

* Fix warnings, whoops

* Respond to Elliptic's review

* Better formatting

* Small typo fix
2022-01-04 06:57:45 +00:00
Maide
92302fa6d6
En_Ishi (#538)
* En_Ishi

* PR

* PR

* Merge
2022-01-04 06:51:21 +00:00
Tom Overton
f48e1f8de8
Document kibako2 object (#541)
* Document kibako2 object

* Remove "1" from "gLargeCrateTLUT". Was a leftover from OoT

* File header comment and tlut naming

* Single line comment styling
2022-01-04 06:45:46 +00:00
Maide
af52799bc7
Obj_Flowerpot (#539)
* Obj_Flowerpot

* PR
2022-01-04 06:37:52 +00:00
Maide
d90a15ba6e
En_Kame (#536)
* En_Kame

* PR
2022-01-04 06:25:29 +00:00
Maide
0a5bc25e8d
Obj_Hugebombiwa (#535)
* Obj_Hugebombiwa

* PR

* PR
2022-01-04 06:17:52 +00:00
Maide
bf6a4c04be
En_Ssh (#532)
* En_Ssh

* ptrs

* PR
2022-01-04 06:11:59 +00:00
Maide
897e68fbae
Boss_04 (#529)
* Boss_04

* What even is spelling anyway

* PR

* PR
2022-01-04 06:02:29 +00:00
Tom Overton
4ca8658d77
Document object_giant and finish documenting En_Giant (#521)
* First stab at XML

* Use object symbols in En_Giant

* Finish documenting En_Giant

* Document unknown blob and all Vtx

* Improve XML

* Respond to Elliptic's review

* Remove EN_ from the limb enum

* palette -> tlut

* File comment header

* Some reordering to make things more sensible

* One line comment styling

* Preserve ordering
2022-01-04 05:57:00 +00:00
Derek Hensley
d3e4a3368f
Effect_soft_sprite_old_init and particleOverlayTable OK (#520)
* Migrated data

* Migrate particleOverlayTable

* Import data for effect_soft_sprite, add g to effect table, minor cleanup of z64effect.h

* Name data

* Comment out static variable in variables.h

* Use better macros

* PR review and other cleanup

* Update bug comment
2022-01-04 05:50:12 +00:00
Derek Hensley
8cd978585e
EnItem00 OK (#519)
* Match three nonmatchings

* Remove duplicate parens

* turn u32 into s32

* fix thiefbird

* Remove some unnessesary casts

* Fix merge
2022-01-04 05:44:57 +00:00
Savino Jossi
06a08a3322
Ovl obj jg gakki (#512)
* add gakki decompilation

* add gakki header file

* modify spec to remove data

* Use THIS macro for this = thisx

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Change reloc include to the generated one

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* spacing variables and functions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* spacing variables and functions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* spacing variables and functions

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* clean up unnecessary mips_to_c hints

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* clean up old mips_to_c hints

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* variable cleanup and lookup

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* remove unnecessary cast

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* rerun format after code review

* fix naming convention

* add variable name hints for data

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* reformatted file

* Fix collider naming

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* fix more renaming

Co-authored-by: Savino Jossi <sj@redballoonsecurity.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 05:38:41 +00:00
Derek Hensley
1d7e721cb7
Graph OK (#511)
* Match Graph_FaultAddrConvFunc

* Remove undef
2022-01-04 05:31:28 +00:00
Lucas Shaw
9e5382076a
ovl_Obj_Roomtimer OK (#505)
* ovl_Obj_Roomtimer OK

* add packed params

* made suggested changes

* fixed
2022-01-04 05:25:41 +00:00
Maide
c1858172b5
Refactor disasm for speedups (#465)
* First try

* OK

* Optimize .text a bit

* Split sections

* Fixups

* Combine .text

* async rodata

* Split code and rodata

* Almost there

* Done?

* Reduce console spam, add back extra space to delay slots

* Add makefile flag

* Prevent empty file creation and some wayward symbols

* Re-add printing

* Remove incorrect Boj_05 variables (thanks Anghelo for finding this)

* Cleanup formatting

* Update

* Update

* Change offsets back

* Make offsets object-relative
2022-01-04 05:17:22 +00:00
Lucas Shaw
005fd64e41
ovl_Obj_Dowsing ok (#504)
* ovl_Obj_Dowsing OK

* update spec

* params pack

* made suggested changes
2022-01-04 05:10:13 +00:00
Nick Sturgeon
78cb55ce97
ovl_En_Ruppecrow OK with documentation (#502)
* Implement EnRuppecrow_Init

* Implement EnRuppecrow_Destroy

* Implement EnRuppecrow_Update

* Implement EnRuppecrow_Draw

* Implement func_80BE2260, func_80BE2808

* Implement func_80BE30F4

* Implement func_80BE2F6C

* Implement func_80BE35A4

* Implement func_80BE2728

* Initial work on func_80BE2B80

* Implement func_80BE2B80

* Implement func_80BE2794

* Implement func_80BE3354

* Implement func_80BE348C

* Implement func_80BE2E18

* Implement func_80BE2D4C

* Run format script for cleanup

* Implement func_80BE2668

* Implement func_80BE3178

* Implement func_80BE32DC

* Initial work on func_80BE2874

* Implement func_80BE2874

* Implement func_80BE2330

* Implement func_80BE24CC

* Move static data into C file

* Rename D_WORDs to static names

* Format and document EnRuppecrow

* Update documentation

* Apply feedback

* Remove unecessary struct padding

* Implement review suggestions

* Run actorfixer

* Use object header
2022-01-04 05:02:53 +00:00
retro
de61e04312
EnMm2 OK (#492)
* all matching except draw

* all matching

* done except importing data

* data extracted

* added xml for asset extraction

* clang format

* remove global_asm macros

* bit of documentation

* format

* use THIS macro

* remove unnecessary &

* space between vars and code

* feedback

* use OPEN_DISPS, CLOSE_DISPS, and POLY_OPA_DISP++ macros

* remove comment

* use matrix macros

* change comment format

* change comment format

* rename assets in xml

* fix indent
2022-01-04 04:56:35 +00:00
kyleburnette
99761a9c0d
EnColMan OK (#479)
* EnColMan OK

* Fix description at top of file

* Made suggested changes

* Make suggested changes

* Format

* Include gameplay_keep and use symbols
2022-01-04 04:51:03 +00:00
Maide
520a2ecc68
Obj_Snowball (1 non-matching) (#468)
* Obj_Snowball

* PR

* PR & Object

* PR
2022-01-04 04:45:14 +00:00
Maide
9a0079de8a
En_Gb2 (#453)
* En_Gb2

* Negs

* PR

* Update src/overlays/actors/ovl_En_Gb2/z_en_gb2.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 04:35:21 +00:00
Maide
fc37051216
En_Fish (#450)
* En_Fish

* R

* PR

* PR

* Update src/overlays/actors/ovl_En_Fish/z_en_fish.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-01-04 04:29:49 +00:00
Maide
f66a9f8d0e
Object_Kankyo (1 non-matching) (#445)
* Object_Kankyo

* Removing permuter

* PR

* Re-add description

* PR
2022-01-04 04:24:35 +00:00
Maide
22a759a923
En_Peehat (#444)
* En_Peehat

* Fix

* Revert m2ctx

* PR

* Warning

* PR
2022-01-04 04:17:40 +00:00
Maide
429a5ee9ff
En_St (#443)
* En_St

* Warning

* PR

* undef

* PR
2022-01-04 04:09:32 +00:00
Maide
6b50345831
En_Water_Effect (#435)
* En_Water_Effect

* PR

* PR

* undef

* PR
2022-01-04 04:03:47 +00:00
Maide
4ee7dc1da6
En_Bomjima (1 non-equiv) (#433)
* En_Bomjima

* Damn caps

* PR

* PR

* undef

* PR
2022-01-04 03:57:40 +00:00
Maide
934c562471
En_Wiz_Fire (#406)
* En_Wiz_Fire

* Remove padding

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:51:11 +00:00
Maide
0b45e0f87a
En_Go (3 non-matching) (#405)
* En_Go

* PR

* PR

* Object

* Undef

* PR
2022-01-04 03:45:36 +00:00
kyleburnette
3af87ca611
pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK (#385)
* pfsreadwrite file OK, contpfs OK and data/bss migrated, pfsgetstatus OK

* Made tharo's suggestions

* Update pfsgetstatus.c

* Made suggested changes (other than uintptr_t)
2022-01-04 03:29:11 +00:00
EllipticEllipsis
4a38b51ab4
Update recomp (#543)
* Update recomp

* Add fat binaries for macos
2022-01-04 03:20:21 +00:00
Maide
618b25f41d
En_Fishing (3 non-matching) (#378)
* En_Fishing

* PR

* PR

* Object

* Undef

* PR

* format
2022-01-03 18:48:37 -05:00
Maide
3d883491e1
En_Kusa2 (#363)
* En_Kusa2

* PR

* Warnings

* PR

* Match

* pepega
2022-01-01 13:09:44 -05:00
Tom Overton
44ccdbe0d5
En_Talk_Gibud (Gibdos in the well) OK and somewhat documented (#486)
* Good start

* More progress

* More progress, need to try importing data now

* Import data to C

* Match a tricky item function

* Matched another item function

* Improve definition of EnTalkGibudUnkStruct

* func_80AFFD3C OK

* Draw functions done

* EnTalkGibud_Init OK

* EnTalkGibud OK

* Document item and switch flag stuff

* Name all static variables

* Enum for animations

* Document type

* Document limb stuff

* Tons of documentation

* Document effect stuff

* Document most unknown struct vars

* Name most functions

* Name final function + document text IDs

* Organize forward declarations

* Name stack variables

* Document damage effects

* Document limbs

* One final pass

* Respond to Anghelo's review

* Respond to Anghelo's second review

* Add space to force Jenkins to rerun (testing PR dashboard, please ignore)

* Removing previously added space

* Fix limb enum to add LIMB_NONE

* Run ./format.sh, whoops

* Respond to hensldm review + small cleanup

* Respond to engineer's review

* Fix item enum

* This is a legacy PR, so using autogenned object symbols

* Fix merge conflict

* Move Talk_Gibud specific enums to .c
2021-12-28 02:15:32 +00:00
Tom Overton
527c54b66e
Obj_Tokeidai (Clock Tower) OK and mostly documented (#442)
* Migrate data to C

* ObjTokeidai_Init OK

* ObjTokeidai_Destroy OK

* func_80AB2BBC OK

* func_80AB3BB0 OK

* func_80AB29F8 OK

* func_80AB27B4 OK

* func_80AB2834 OK

* func_80AB2790 OK

* func_80AB28C8 OK

* ObjTokeidai_Update OK

* func_80AB4040 OK

* func_80AB3010 OK

* func_80AB3CCC OK

* func_80AB3240 OK

* func_80AB3C50 OK

* func_80AB4080 OK

* func_80AB4160 OK

* func_80AB319C OK

* func_80AB3BE8 OK

* func_80AB3BD8 OK

* func_80AB3B34 OK

* func_80AB3A7C OK

* func_80AB3ED0 OK

* func_80AB39BC OK

* func_80AB38B0 OK

* func_80AB3880 OK

* func_80AB363C OK

* func_80AB36C4 OK

* func_80AB3808 OK

* func_80AB365C OK

* func_80AB3598 OK

* func_80AB3544 OK

* func_80AB34CC OK

* func_80AB3370 OK

* func_80AB32F0 OK

* ObjTokeidai_Draw OK

* func_80AB4894 OK

* func_80AB4664 OK

* func_80AB4394 OK

* Use compiled reloc

* Initial documentation pass

* Little more documentation

* Last bit of first pass documentation

* Finish documentation

* Respond to review feedback

* Respond to Anghelo's feedback

* Incorporate new enum

* Respond to engineer's feedback

* Respond to engineer's feedback

* Update comments because the things I thought were unused ARE actually used

* Switch to using "Open" instead of "Transform"

* Run ./format.sh

* Respond to engineer + hensldm by removing some macros

* Fix func_801A3F54 argument

* Fix func_801A3F54 argument

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* This is a legacy PR, so using autogenned object symbols

* Move enum to .c

* Revert "Move enum to .c"

This reverts commit de13c50f0a.

* Move tokeidai-specific defines to .c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-12-28 02:10:15 +00:00
Maide
7cb71922e3
En_Geg (#436)
* En_Geg

* Format comments

* PR

* Object

* undef

* PR
2021-12-28 01:44:27 +00:00
LtPeriwinkle
1a08089da0
Effect_Ss_Stick (#464)
* Effect_Ss_Stick OK

* fix spec

* space between declarations and code

* Gfx -> Gfx[], fix spacing

* add deku stick to description

* add fragment to file description

* use autogenned gameplay_keep symbol
2021-12-28 01:36:04 +00:00
Tom Overton
70419d6044
En_Fall (the moon, Moon's Tear, and effects) OK and mostly documented (#476)
* EnFall_Init OK

* EnFall_Destroy OK

* EnFall_Update OK

* func_80A6C3AC and func_80A6C3FC OK

* func_80A6BF90 OK

* func_80A6CA9C OK

* func_80A6CD38 OK

* func_80A6CF60 OK

* func_80A6C9A8 OK

* Import data into C

* func_80A6CB74 OK

* func_80A6CD74 OK

* func_80A6CF70 OK

* func_80A6CECC OK

* func_80A6D698 OK

* func_80A6D220 OK

* func_80A6D100 OK

* func_80A6D75C OK

* func_80A6D88C OK

* func_80A6D98C OK

* func_80A6DC20 OK

* func_80A6DA7C OK

* func_80A6DC40 OK

* func_80A6DD3C OK

* func_80A6E214 OK

* func_80A6E37C OK

* func_80A6C7C0 OK

* func_80A6D444 OK

* func_80A6C1DC OK

* func_80A6D504 OK

* func_80A6E07C OK

* Move all statics to in-function

* Migrate bss to C and use compiled reloc

* Clean up UnkFallStruct

* Initial documentation pass

* Some more function names

* Name some more unknowns

* Name yet more unknowns

* Name all struct variables and static data

* Do one last documentation pass

* Respond to engineer's style review

* Respond to hensldm's review

* This is a legacy PR, so using autogenned object symbols
2021-12-28 01:26:06 +00:00
EllipticEllipsis
96eff2a4fd
Building on Macs (#513)
* Building on Macs

* Add Mac building documentation

* Review

* Update for new z64compress

* Review

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "155a463a5"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "155a463a5"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Fix some obvious warnings

* Rewrite docs

* -;

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "fd5a7f434"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "fd5a7f434"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-28 01:07:41 +00:00
Maide
c291ebb232
fix the fixer (#540) 2021-12-27 13:04:44 -05:00
engineer124
f19571dfcd
Bigslime OK and Documented (#361)
* git subrepo pull tools/asm-differ --force

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "d218cdf0"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "d218cdf0"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "f5fe93d7"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "f5fe93d7"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "e7a8a48c"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "e7a8a48c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Bring Bigslime over from old branch

* Format

* Improve docs

* format

* More cleanup

* Fix Zero Vectors Name

* Improve docs

* Spelling/Grammar

* Small typo

* Extra space

* Fix zapd merge conflict

* tab

* Fix remaining names

* format

* Better documentation

* format

* fix

* Add names to identity matrices

* Minor Cleanup

* easier to read comments

* Another touch-up

* Missed a spot

* one more...

* typo

* Another typo

* Fix merge master, fix EnBigslime_ApplyDamageEffectBigslime

* PR Feedback

* Fix variable

* Add in gZeroVec3f in new prs

* Fix gZeroVec3f

* gZeroVec3f

* PR Feedback, move lots of static data inside functions

* Use z_actor decomp of `func_800BE680` for better macro name

* Naming gone wrong, but fixed now

* Fix dList

* Add an extra line of docs about shadows for a function

* dList -> shadowDList

* Next round of PR feedback

* Document object file, still need to double check some

* Small cleanup

* Improve and fix many docs, unname unknown material texture

* format

* Oops

* Clean up blobs from object file

* Aha! I finally get what's going on

* Remove Bigslime undefined_syms

* Remove more undefined symbols

Co-authored-by: Angie <angheloalf95@gmail.com>
2021-12-27 04:24:45 +00:00
Lucas Shaw
5455cbc0c8
z_kaleido_manager and z_kaleido_scope_call OK (#489)
* migrated data and bss for z_kaleido_manager, renamed ovl_Player_Actor to ovl_player_actor to make it work with the data

* z_kaleido_manager OK

* add to functions.h variables.h and variables.txt

* init

* rename parameters in func_80163700

* rename func_80163700 to KaleidoManager_FaultAddrConvFunc

* change u32 casts to uintptr_t casts in z_kaleido_manager. (u8 *) casts must stay, they are the only casts that match

* ran format, uintptr_t

* made suggested changes
2021-12-27 03:59:50 +00:00
engineer124
27903c6286
code_80194710 OK (Audio libultra_code_O2) (#474)
* code_80194710.c OK

* Add new line after variable declaration

* format

* Function declarations

* Name changes to match OoT

* Rename file

* s32 -> size_t
2021-12-27 03:51:37 +00:00
EllipticEllipsis
76c39482bc
contchannelreset OK (#428)
* contchannelreset OK

* Add to functions.h

* Rename argument
2021-12-27 03:42:31 +00:00
EllipticEllipsis
8ebdb50470
pfsfreeblocks OK (#423)
* pfsfreeblocks OK

* Update src/libultra/io/pfsfreeblocks.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-12-27 03:36:06 +00:00
engineer124
2664f75ac2
Match 8 BgCheck functions (7 remaining) (#496)
* Match CollisionPoly_CheckYIntersect

* Match CollisionPoly_SphVsPoly

* Match StaticLookup_AddPolyToSSList

* Match BgCheck_CheckStaticCeiling

* Match BgCheck_SphVsFirstStaticPolyList

* Match BgCheck_Allocate

* Match BgCheck_CheckLineImpl

* Match BgCheck_SphVsDynaWallInBgActor

* Update src/code/z_bgcheck.c

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Add comment about in-function static bss

Co-authored-by: mzxrules <mzxrules@gmail.com>
2021-12-27 03:29:50 +00:00
Tom Overton
8f11e841a7
Document object_gmo (#517)
* Update XML for gmo

* Update object references in Baguo

* Add comment to indicate potential original name

* Update unused idle animation
2021-12-27 03:23:04 +00:00
Derek Hensley
d2c411e132
Document Object Tokei Step (#523)
* Cleanup and doc object

* Rename actor stack variable

* Revert actor change and fix ARRY_COUNT typo

* More actor cleanup from review

* Format

* didPrevBounce to hasPrevBounced
2021-12-27 03:15:12 +00:00
Isghj
af7525e2d3
[Object] Bigpo object documentation (+ some gameplay_keep) (#525)
* Bigpo: object documentation starts and already issues

* Bigpo: almost all named

* Bigpo: done with object except ubused blobs

* Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass

* Bigpo: forgot to remove sym and replace everywhere, with formater pass

* Bigpo: forgot about actorfixer

* Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now

* Bigpo: warnings

* Bigpo: remove extern for gameplay_keep display list reference from aqua

* EnBigpo: suggested fixes to header calls and function name

Co-authored-by: Isghj8 <isghj8@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-12-27 03:08:36 +00:00