* Match func_80095D04
* Match func_80096FE8
Most of the work was done by the co-authors, putting in this PR for convenience.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
* Format
* Remove asm
* Caps
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* score = 965
* score = 305
* Clean-Up
* More clean-up
* Down to `sp30` <--> `sp34` swap, and extra `.data + 0x18` at the top?
* clean-up
* EnTorch2 OK, but does not reloc properly
* final cleanup
* Remove comments about non-matching
* Fix reloc non-matching
* Delete reloc
* Better solution
* PR Suggestions
* Make a XML for ganon_mant
* cleanup
* Apply suggestions from code review
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* sForceAlignment
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* fix ganon organ reloc data and extract its assets
* Named all textures
* RangeEnd
* static
* Remove D_ comments from XML
* Rename pad to sForceAlignment
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
* Fix all headers to comply with C standard
* fix a file in libultra
* Update include/stdbool.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update stdbool.h
* Update z64animation.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Data imported, 8 easy functions matched
* Init only remaining nonmatching, data in
* some renaming & fiddling with Init, still nonmatching
* fix colours
* Init still not matching
* Decompile object_tp
* renames
* Rename func_80B20DE0
* Horrible new idea
* Known equivalent, docs next
* Another attempt
* Finished naming in object_tp
* Named functions, more enums
* DrawBridge -> Drawbridge
* skulltulla -> Skulltula
* Name almost all struct variables
* Named most of the temps
* delete asm
* spec
* Missed data file, whoops
* Review
* More review changes
* Match EnTp_Init
* spec
* Delete asm
* Initial progress on Door_Warp1
* Fix merge
* More work on Door_Warp1
* Decompile most of Door_Warp1
* 2 more functions OK
* All decompiled, 3 nonmatching
* Tiny improvements, fix several warnings
* Remove commented GLOBAL_ASM lines
* Fix
* Fix merge
* Two more matches
* Some docs
* More docs
* Use generated reloc under NON_MATCHING
* Fix accesses in ru1
* Add break and add limbs and dlists for the skeleton to the object xml
* Comment values for enums
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* boolean returns for flag checking functions
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Named more loop variables i and named DoorWarp1_FloatPlayer
* Last function matched thanks to Roman
* Some further suggestions
* Fix
Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Ydan_SP
* func_8002D7EC
* Gameplay_ChangeCameraStatus
* Graph_InitTHGA
* CollisioCheck_LineOC
* Fix more in camera and jpeg
* revert comment in player
* Fix includes using braces instead of quotes
* Remove some unused printf arguments
* Fix a condition in Door_Shutter
* Run the formatter
* Cleanup incorrect uses of DynaPolyMoveFlag as function arguments
* Cleanup combined Math_StepToF checks
* `// Translates to:` -> `//`
* `// Translation: ([^"].*)` -> `// "$1"`
* Manual cleanup
* Manual cleanup in `src/code/`
* Use more lowercase for some all caps translations
* Move translations to end of lines where it fits under 100 bytes
* Move one translation to end of line manually
* Run formatter
* Cleanup in EnHeishi1 as suggested by Roman
* Update src/code/z_play.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Match AudioDebug_ProcessInput_SEFlagSwap
* Data migration
* Migrate in-function statics for func_800EE824
* More data migration
* Migrate in-function static for func_800F510C
* Last bit of migration
* formatting
* naming fix
* Prune variables.h
Co-authored-by: zelda2774 <zelda2774@invalid>
* Match func_800DDB64
* Match func_800DC910
* remove stack comments
* Move nop padding to ucode_disas
* Partially label audio_synthesis
To some extent copied from sm64.
* cleanup
* Reverb and ReverbBits have nothing to do with reverbs
* review
* naming
* Undo changes to permuter_settings.toml
Co-authored-by: zelda2774 <zelda2774@invalid>
* Rename MtxF members like xy -> now_21
* Revert comments I didn't mean to commit
* Rename c*/r* temps in `SkinMatrix_MtxFMtxFMult`
* Rename MtxF members like now_21 -> yx
* Implement a single Object Table for the enum and the segments
* Implement a single Actor Table for the enum and the overlays
* Implement a single Effect SS Table for the enum and the overlays
* Remove initvars.h and move its content to relevant files
* Update object 0 to use OBJECT_NONE and document it in the table
* Rename OBJECT_NONE to OBJECT_INVALID to avoid confusion
* Initial progress
* Improve the last NON_EQUIVALENT to NON_MATCHING
* 2 functions down to stack, migrate data
* 2 more matches, some other improvements
* Use Vtx over Vtx_tn
* Begin documenting
* Some names
* More docs
* Finish docs
* Remove VTX_TN
* Review suggestions
* Single line comments
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* en_ganon_mant fully matched thanks to Roman
Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Match func_800EEA50
* Document some audio debug stuff
* more doc
* more doc
* formatting
* Fix enums, and some more bits of doc
* review
* LIM -> MAX
* missed review suggestion...
* more review
* ganon comments
* more review
* 🐍☠️
* more review
* Update functions.h
* quotes
* review
Co-authored-by: zelda2774 <zelda2774@invalid>
* Document EnGoroiwa and BgJyaGoroiwa
* Run format.sh
* Add renamed functions to actorfixer script
* no more calling out "the devs" for bad code
* `EnGoroiwa#flags` -> `stateFlags`
* `Matrix_MtxFToRotS` -> `Matrix_MtxFToYXZRotS` (and not ZXY oops), `func_800D2264` -> `Matrix_MtxFToZYXRotS`
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* it begins
* more functions
* another match
* starting documentation
* the big function works. also two more matches
* small fix
* data cleanup
* removed .s
* match with player
* inching closer to matching
* two more matches. almost there
* OH MY GOD IT MATCHES
* cleanup: part 1 of infinity
* named a bunch of stuff
* Naming particle fields
* terminal commas
* terminal commas
* small enum fix
* added description of droplet widths
* merge
* updating
* Gfx
* vt
* xml
* bgcheck
* more on objects
* unused stuff
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "44f5d7cb9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "44f5d7cb9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* object names
* fixes
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* ZAPD works
* .s
* merge
* starting work
* more stuff
* builds OK
* first pass
* PR fixes (Louis)
* Bg_toki_hikari all functions matching (#781)
* starting toki_hikari
* func_808BA018 matched and some work on other func
* init and draw matched, one to go
* matched final function, removed ASM, updated spec
* adding suggested changes
* Volvagia (ovl_Boss_Fd) and related actors (#352)
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* Lots of functions matched. Some big ones are close.
* Five left unmatched, one close.
* Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched.
* Three unmatched, one essentially matched, the rest matched.
* More fixes.
* Documented more of the structure and cleaned up a bit.
* BossFd2, BgVbSima, and EnVbBall matched and documented
* Also removed unneeded .s files
* And need to name EnVbBall's functions
* give this a shot
* fix conflict
* one more try
* removing darkmeiro changes
* and again
* now OK from make clean
* minor cleanup
* One more matching function for BossFd
* which means it doesn't need its .s
* splitting
* splitting
* splitting
* forgot some .s
* fancy new names
* fancy new names
* trying again
* sneaky .s files
* sound effects and some hex to decimal conversions
* Sound effects and static variable cleanup
* format.sh and clean up static variables
* sfx and formatting
* ZAP and cleanup
* small cleanup
* cleanup and ZAP
* ZAP
* looking at the giant function again
* looking at the giant function again
* Only the big function left.
* Those .s files aren't mine, officer
* float literals might be fixed. regalloc still a nightmare
* almost done with the big function
* should make now
* not much of a change
* all functions match. rodata somehow doesn't.
* forgot some things
* lots of cleanup
* and a little more
* small error
* large cleanup. Also BossFd has function names and inlined variable declarations
* still more cleanup
* the quest for 0.1f continues
* forgot to put NON_MATCHING back in
* Data structures fully documented. Still more cleanup.
* DECR now works with BossFd2
* should match now
* cleanup
* small cleanup
* cleanup and names
* tiny thing
* particles and headers and stuff
* now with more enums
* merge
* test
* end test
* update
* cleanup
* object 2
* object 1
* doc object_fd2
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* formatting
* .s
* merge actor
* vertex arrays
* a little more
* formatting
* merge opd
* fixed damage check
* cleanup
* fixes
* effect struct
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
* fix mistake in z_bg_hidan_hamstep (#771)
if you're just going to close this pr just wait a week and review it then.
* ovl_En_River_Sound 1 non-matching (#786)
* ovl_En_River_Sound
* Implement review suggestions, run through clang-format
* Responding to PR comments
* Use CHECK_QUEST_ITEM, run through clang-tidy.
* EnTp, 1 nonmatching, and object_tp (#782)
* Data imported, 8 easy functions matched
* Init only remaining nonmatching, data in
* some renaming & fiddling with Init, still nonmatching
* fix colours
* Init still not matching
* Decompile object_tp
* renames
* Rename func_80B20DE0
* Horrible new idea
* Known equivalent, docs next
* Another attempt
* Finished naming in object_tp
* Named functions, more enums
* DrawBridge -> Drawbridge
* skulltulla -> Skulltula
* Name almost all struct variables
* Named most of the temps
* delete asm
* spec
* Missed data file, whoops
* Review
* More review changes
* cleanup en_dha (#787)
* Set __FILE__ in asm_processor (#793)
* Set __FILE__ in asm_processor
* bss fix
* Update to upstream version
Co-authored-by: zelda2774 <zelda2774@invalid>
* ovl_Efc_Erupc OK (#773)
* a few good dead Gfx_TwoTexScrolls
* EfcErupc OK, mostly documented
* review
* remove fake match
Co-authored-by: Fig02 <fig02srl@gmail.com>
* z_bg_mizu_movebg and object_mizu_objects (#747)
* OK a few functions
* BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall
* migrate data
* create mizu_objects, defines for water temple water level
* clean up some code
* implement most suggestions
* review
* review2
* formatting
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Document BodyBreak (en_part, body part spawner) (#797)
* done
* status defines
* whoops
* comment wording
* size calc change
* elseif
* Improve the format in z_map_mark_data.c and cleanup mapmark.py (#798)
* Cleanup mapmark.py script
* Rename map mark defines
* Remove unused entries from map_mark_data
* `assert` macro OK (#755)
* create assert macro and replace a bunch of __assert
Signed-off-by: angie <angheloalf95@gmail.com>
* Another bunch of assert
Signed-off-by: angie <angheloalf95@gmail.com>
* more assert
Signed-off-by: angie <angheloalf95@gmail.com>
* assert(false)
Signed-off-by: angie <angheloalf95@gmail.com>
* last assert used in matching code
Signed-off-by: angie <angheloalf95@gmail.com>
* the non-matchings
Signed-off-by: angie <angheloalf95@gmail.com>
* typo
Signed-off-by: angie <angheloalf95@gmail.com>
* format
Signed-off-by: angie <angheloalf95@gmail.com>
* change macro to uppercase
Signed-off-by: angie <angheloalf95@gmail.com>
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Change ASSERT(false) to ASSERT(0)
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* General object cleanup (#799)
* Object cleanup
* Fix running man
* fix mm symbols
* Updated to use latest version of ZAPD (#777)
* Updated config file
* Added missing files
* Temporarily removed asm_processor changes.
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "96ffc1e62"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "96ffc1e62"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "179af7d11"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "179af7d11"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Cleanup and fixes.
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "50ad2fe78"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "50ad2fe78"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Makefile fix
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b9120803e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "b9120803e"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
* Decompile `object_zo` 🐬 (#794)
* Initial xml
* most of in-code references
* Add limbs and evrything else
* Functions used by EnRiverSound
* Fix forearm and use void* for textures
* Run formatter
* Change Hints in scene's XMLs (#800)
* Remove blobhint
* Add segments and offsets, and remove most hints
* Change PathHint to Path
* Add missing final new lines in scenes xmls
* finished object_skb (#790)
* finished object_skb
* neglected the limbs and dlists, so I added them
* adding the textures
* fixing some names
* ....forgot to change the c file....
* hopefully fixed formatting issue
* EnFish, OK and documented (#795)
* Matching
* Some naming
* spec
* Name another function
* Name animations, clarify use of GI_MAX and GI_NONE
* Documented bottle range functions
* Simplify squared distance function in EnIceHono, actor descriptions
* Functions for dropped fish
* More naming
* Change 65535.5f to (0xFFFF + 0.5f)
* Change 65535.5f to (0xFFFF + 0.5f)
* name phases
* Named other types, Docile functions
* Naming complete
* delete asm
* format, remove outdated comment
* Fix a few DrawFlexOpa arguments
* Review changes
* Change back to original playSound
* Function comments per review
* Update asm-processor and add make dependencies for global asm and early includes (#801)
* Update asm-processor to latest master
* Add make dependencies for global asm and early includes
* Update asm-processor to latest master
* Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803)
* Decompile ovl_kaleido_scope + minor cleanups
* Add a common header for ovl_kaleido_scope
* Start cleaning up and documenting kaleido_scope (+ some interface docs)
* Improve and fix some kaleido_scope non matchings
* Match KaleidoSetup_Init
* Extract icon_item_fra/ger_static files
* Add more documentation and matches to kaleido_scope
* Improve the z_kaleido_collect.c non matching
* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c
* Update most kaleido variables to be static
* Improve GS flag macros
* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script
* Various minor fixes and improvements
* Minor fixes and review changes
* Review changes part 2
* Rename gSetTileCustom to gDPSetTileCustom
* Review changes part 3
* Delete `-j` from `make setup` and document use of `-jN` and `-j` in readme (#804)
* Add nproc to make setup
* Add cross-platform nproc equivalents
* Scrap that, just ditch -j in makefile altogether
* Clarified thread advice
* ViMode progress (#802)
* ViMode OK
* Fix variable name in regconvert tool
* ViMode: fix formatting
* Add nonmatching impl for ViMode_Configure, respond to PR
- Fixed struct field naming (unkXX -> unk_XX)
- ViMode_Configure args are not flags for top/left etc; seem to be for
video mode
- Used @Random06457's implementation of `ViMode_LogPrint`
* Use plain LOG_ADDRESS in ViMode_LogPrint
* Incorporate PR feedback from Roman971
* Add scene macros (#792)
* add scene macros
* SCENECMD -> SCENE_CMD
* light renaming
* SCENE_CMD_ROOM_BEHAVIOR
* update params names
* Remove extra spaces
* More review changes by fig
* remove MM cmd ids
* more review changes
* last minute edit
* I keep confusing both lights commands
* Review changes
* Yet another cutscene change
* Unused02 is unused
* Add UNK_09 macro and other minor fixes (#813)
(cherry picked from commit d3a6d4d2e1)
* Match BossFd_Fly (ovl_Boss_Fd OK) (#807)
* Simplify PNGs rules in the makefile (#814)
* simplify rules
* update `-eh`
* Add every unreserved object in an automated way (#805)
* it's crashing
* fix stuff
* fix xmls
* problematic objects
* fix tabs
* Fix suffixes
* add missing new lines
* Add comments to the problematic objects
* Find and replace fixes
* Add Fig's objects
* I forgot to add a Name in a cutscene, so I'm adding it here
* Update object decomp tutorial a little bit
* Update problematic objects
* Update docs/tutorial/object_decomp.md
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Change comments
* comment out a few blobs
* dammit tluts
* Change a bunch of objects
* update the last bunch
* update comments on oA11 and oB2
* Ninja-edit to fix compatibility with ZAPD's PR 142
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Add clean assets (#785)
* makefile change
* also delete
* Add cleantools
* rename cleanassets and assetclean
* add rules to PHONY in makefile
* Remove toolsclean
* object_hata OK (#806)
* everything except limbs
* spec
* object_hata OK
* Replace symbols, unused data, enums, some cleanup
* Fix compiler warnings in EnRiverSound
* Address Roman's review
* Correct limbs name
* Changed unk_192 to timer, as well as add missing trailing comma for formating (#817)
* Remove some unused duplicated C files (#818)
* Removes qemu from the README.md (#819)
* Removes qemu from the README.md
* Increments the step references in other parts of the README.md
* Update README.md
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update README.md
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update README.md
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update README.md
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Match EnSkb_PostLimbDraw (obl_en_skb OK) (#821)
* Small bgcheck documentation pass (#816)
* implement some documentation
* remove unnecessary comments related to decomp
* eliminate comment function prototypes
* Add `actorfixer.py` ~~and `graphovl.py`~~; and a few improvements to `extract_assets.py` (#783)
* Only process touched files and abort the extraction if one file wasn't extracted properly
Signed-off-by: angie <angheloalf95@gmail.com>
* add actorfixer and graphovl
Signed-off-by: angie <angheloalf95@gmail.com>
* Re set execution permisions to diff.py
Signed-off-by: angie <angheloalf95@gmail.com>
* Add graphs/ to gitignore
Signed-off-by: angie <angheloalf95@gmail.com>
* Add looners flag to graphovl
Signed-off-by: angie <angheloalf95@gmail.com>
* Parse macros
Signed-off-by: angie <angheloalf95@gmail.com>
* cleanup
Signed-off-by: angie <angheloalf95@gmail.com>
* Add enum parser to graphovl
Signed-off-by: angie <angheloalf95@gmail.com>
* Remove redundant code
Signed-off-by: angie <angheloalf95@gmail.com>
* cleanup
Signed-off-by: angie <angheloalf95@gmail.com>
* Custom colors to graphovl!
* Select multiples styles for graphovl
* Add solarized light style
* Add renames of #796
* Add unaccounted warning flag
* remove graphovl
* git subrepo clone https://github.com/AngheloAlf/graphovl.git tools/graphovl
subrepo:
subdir: "tools/graphovl"
merged: "577e71592"
upstream:
origin: "https://github.com/AngheloAlf/graphovl.git"
branch: "master"
commit: "577e71592"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* remove graphovl
* Add `graphovl/` to gitignore
* Label a bug in Door_Shutter (#810)
* comment
* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
* change message
* typo
* repeated myself
* extra space lmao
* change wording again
* Update src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
* indent
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
* en_weather_tag Quick documentation pass (#808)
* Quick documentation pass
* Fill out the En_Weather_Tag enum
* move the enum into the header
* implement roman's suggestion
* object_sa OK (#789)
* object_sa OK
* PR fixes (AngheloAlf)
* PR fixes (Roman)
* Improve z_jpeg documentation (#825)
* Improve z_jpeg documentation
* JpegWork::data is probably better than address
* Rename Jpeg_SendTask to Jpeg_ScheduleDecoderTask
* Rename njpegUCode to gJpegUCode
* Rename GetU16 to GetUnalignedU16 and improve docs
* Decompile a bunch of objects (#603)
* Mostly done but shifted
* still messed up
* Almost OK
* OBJECT_JYA_OBJ OK, OBJECT_GR OK
* Done
* Merge master and format
* Cleanup
* Cleanup 2
* Start object MB dont merge yet
* Object_MB OK
* Object_ydan_objects OK
* General 'ydan' actor cleanup
* Forgot some small things
* Object_EC OK
* add .gitkeep and run format
* Object_sd OK but no textures cause of a zap issue
* PR fixes
* Fix object_sd
* fix ydan
* delete .gitkeep files
* OBJECT_BOX as far as it can go with current ZAP
* Fix undefined_syms
* Start child link object
* Push progress, dont merge yet
* Object_mori_objects OK
* Fixed?
* Fix conflicts again
* Seems like i missed some textures
* Extract data for BgBombwall
* More field
* ZAP YEP 2.0
* Object_Box OK
* Object_SD ok. Ready to merge
* remove ASM and merge master
* remove ASM
* remove files wrongfully added to docs/
* Almost done
* Change comment in z_player_lib.c
* forgot some DLists in player_lib.c
* Fix conflict, run format
* Same as before but this time with Tex and TLUT
* Last few things
* fix object_GR and add limbs to object_sd
* Nane -> Name
* gChildDekuShieldMtx is now a matrix and not a blob
* PR fixes (Fig)
* add a space for comment in z_player_lib.c
* re push and new lines
* PR fixes (AngheloAlf)
* PR fixes (Roman)
* Fix Heishi2
* PR fixes (Fig)
* Replace spacing in a file
* PR fixes (Roman)
* Track XML extraction time (#826)
* extracted-assets.json
* delete `.extracted-assets.json` in distclean
* Move `rm .extracted-assets.json` to `assetclean`
* Outname -> OutName for OBJECT_LINK_CHILD (#827)
* Outname -> OutName
* ANother child fix
* TLUT -> tlut
* Change nanoseconds to seconds in extract_assets.py (#829)
* Match 2 more functions in z_eff_blure.c (#831)
* Match ViMode_Configure (z_vimode.c OK) (#830)
* warnings fixed (#835)
* ZAPD update: libpng, zroom improvements and others (#811)
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "769f5702a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "769f5702a"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Add `libpng` to readme
* Remove `-ifp` since it doesn't exists anymore in ZAPD
* Remove extra print I added
* Add UNK_09 macro and other minor fixes
* Simplify PNG rules
* simplify gitignore
* Update README.md
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update dockerfile
* basic instructions for cygwin and mac
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "86160be69"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "86160be69"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Change nanoseconds to seconds in extract_assets.py
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* "Decompile" more objects. (#784)
* Object_hakach_objects OK and fix a warning in z_play.c
* Object Warp1 OK
* Object_spot16_obj OK
* object_cs Skeleton and limbs OK
* Limbs are broken
* Limbs OK
* Object_CS OK
* Object_jya_door OK
* fix errors and add new lines
* PR fixes (AngheloAlf)
* PR fixes (EllipticEllipsis)
* PR fixes (Fig)
* Rename Spot16 and Jya
* GraveYard -> Graveyard
* PR fixes
* -s
* PR fixes
* Object_RU1, Object_MA1, and warp pad objects Decompiled (#828)
* Ruto limbs
* RutoLimb enum
* the enum doesn't go in en_door
* Limb DLists
* Name almost all textures and clean up EnRu1.c
* remove padding
* Name all but 1 animation and remove undefined syms
* Object MA limbs OK
* (MA1)Most textures
* Small renames in EnMa1.c
* Object MA1 OK
* add base object for Mjin
* Mjin OK
* Update object_ma1.xml
* PR fixes (Fig)
* PR fixes
* Missed one
* Update assets/xml/objects/object_ru1.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* En_River_Sound OK (#833)
* match en_river_sound
* remove asm
* some docs
* more docs
* saria song
* review stuff
* z_sram OK (#834)
* match z_sram
* format and remove unused asm, also make some data static
* review comments
* another change
* Match Jpeg_Decode (z_jpeg.c OK) (#839)
* Match EnDaiku_UpdateText (En_Daiku OK) (#841)
* Match 1 of the 2 remaining functions in Bg_Mizu_Movebg (#840)
* Improve Audio_SequencePlayerProcessSequence (#844)
Co-authored-by: zelda2774 <zelda2774@invalid>
* Fix and rename nes_font_static (#753)
* renames
* change digits and control pad names
* Add codepoints, rename blank char 0x7F
* BgGndFiremeiro OK and documented (#850)
* OK, data imported
* Name everything
* Delete asm
* Add struct `LegacyLimb` and rename `AnimationHeader2` for `object_human` (#849)
* Add LegacyLimb and rename AnimationHeader2
* Simplify SkelAnime_GetFrameDataLegacy
* Minor fixes
* Move LegacyLimb with the rest of the limbs
* EnVali OK and documented, object_vali and object_bl completely analysed and documented (#845)
* OK
* Some naming
* Name more, correct typo in Biri, extract skel
* just Draws need names, fix typos in bili and warp1
* Decompile object_vali and add symbols
* Few more names
* Bari naming done
* object_bl completed, symbols added
* Label object_bl
* Formatter
* delete asm
* review changes
* review changes
* review
* Interface improvements (#822)
* Add symbols, does NOT build OK
* parameter OK with syms
* Use `static` more and inline arrays
* wip docs
* Start on Interface_Draw, NOT OK yet
* rename variables since interface dev is weird
* nonmatching for now
* kaleido
* Update src/code/z_parameter.c
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Make most texture rectangles use shifts
* fix symbols for all interface things
* done with interface_draw for now
* Update z_parameter.c
* format files
* fix wrong function calls
* fix bss
* improvements in matching
* remove button enum for now
* (void)0 to fix warning
* make conditional look nicer
* fix
* fix wrong combiner
* Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* format
* remove "HUD" naming
* review suggestions
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Migrate .bss for fault drawer and .data for item00 (#823)
* Item00 and fault drawer
* Test
* Test2
* test3
* test4
* remove .data file for item00
* revert hex
* WHY
* PLEASE
* PR fixes (Roman) and run clang-format version 10
* Fault_drawer was swapped ...again)
* Decompile and label EnEiyer (#852)
* En_Eiyer OK
* Label EnEiyer
* Style fixes
* Rename colCyl -> collider
* Use CLAMP_MIN
* Format
* Review changes
* Match Camera_PrintSettings (z_camera OK) (#853)
* Match Camera_PrintSettings
* rm asm
* Match Math3D_LineSegMakePerpLineSeg (#854)
* Match Math3D_LineSegMakePerpLineSeg
Also renamed to Math3D_LineVsLineClosestTwoPoints
* Fix UB
* Some actor.c docs (in preparation for en_test) (#820)
* renames
* format
* format functions.h
* clean
* arg name
* remove asm
* Decompile obj_bean (magic bean and soft soil). 2 NON_MATCHINGs (#846)
* did a bunch
* Do a bunch more
* all functions in C
* Macros for draw and collision part of state flags
* Done for now
* remove ASM
* PR fixes (Elliptic)
* all angles are hex and take away bad names
* PR fixes (Roman)
* PR fixes
* PR fixes (Fig)
* restore map mark
* Fix the other messed with files
* Decompile some more objects (#848)
* Object_FU limbs and skel OK
* limbs OK
* Object_FU textures OK
* Object_FU face textures OK
* Symbols in en_fu.c
* en_fu.c limb enum
* Remove Object_fu from undefined_syms, move textures to draw, and small cleanup
* Object_bird OK
* Object_Bird OK, added cutscene for shot sun, and song of storms
* Rainbow Bridge CS
* Great fairy CS
* Cutscene -> Cs
* remove '&' from Cutscenes
* Cleanup object_bird
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.h
* DC intro CS
* Zeldas lullaby CS
* Nabooru Knuckle CS
* Owl Lake Hylia CS
* Sun song CS
* Undefined sym in Boss Dodongo
* Missed a few more
* DC tex name
* Windmill man limbs
* z_En_Ossan and dependencies (#824)
* fix colliderinit typo
* fix initchain
* reloc
* progress
* progress
* Pick off a few easy functions, reduce number of warnings
* more tough OKs
* Getting closer to all OK, fix en_girla header
* some hard OKs, 7 to go
* two funcs remaining
* func_80AC7094 OK!
* Fix warnings, begin documentation
* get most of object_ossan documented, document some of en_ossan
* improve en_girla function names
* more EnOssan documentation
* more documentation
* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements
* delete TIME ITSELF
* object_oF1d_map OK
* more names, fixed a poition typo
* Nearly all en_ossan functions named, all variables named
* format.sh
* forgot to delete data
* implement pr changes
* EnOssan OK! implement most of Roman's suggestions
* ugh
* implement figs suggestions
* implement roman's suggestion
* Can't tell my left from my other left
Co-authored-by: fig02 <fig02srl@gmail.com>
* Some progress on z_vr_box.c (#838)
* z_vr_box.c progress
* Rename dpList to dlistBuf and SKYBOX_CLEAR_SKY to SKYBOX_NORMAL_SKY
* Fix
* renamed dlistBuf to dListBuf and split large string further
* Change PreRenderContext to just be PreRender (#862)
* Decompile Fishing and document object_fish (#856)
* Start decompiling Fishing
* Decompile more functions in Fishing
* Decompile a few more functions in Fishing
* Decompile func_80B6E9E0 and func_80B7825C (non matching)
* Minor Fishing cleanups
* Migrate fishing bss to C and match 3 functions
* Decompile and match Fishing_Update
* Migrate fishing data to C and minor cleanups
* Fix the object_fish xml and use its symbols in Fishing
* Partially document Fishing and object_fish
* Add more documentation/cleanups to Fishing and object_fish
* Use object_fish symbols in Demo_Ec and fix naming
* Minor fixes to Fishing docs
* Apply review suggestions for Fishing
* Apply 2 more review suggestions for Fishing
* Apply some review suggestions for Fishing
* Extract all "place name" title cards (#858)
* Forest and shadow temple
* fire temple
* Water temple
* Spirit temple
* Deku tree
* jabu jabu
* DC
* Inside Ganons castle
* GTG
* Castle courtyard
* great fairy's fountain
* chamber of sages
* shooting gallery
* Temple of time
* market
* back alley
* kokir shop
* goron shop
* zora shop
* House of skulltula
* bazarr
* potion shop
* gravekeepers hut
* lakeside lab
* hyrule field
* kak
* graveyard
* zoras river
* kokiri forest
* lake hylia
* zoras domain
* zoras fountain
* gerudo valley
* lost woods
* the rest of them
* cleanup
* final cleanup
* PR fixes (Zel)
* (Re) fix case
* segment 0
* Fix map name static conflict
* Comment about ZAPD
* number 0
* Update place_title_cards.xml
* Update spec
* Fix all xmls to explicitly use offsets (#859)
* Forest and shadow temple
* fire temple
* Water temple
* Spirit temple
* Deku tree
* jabu jabu
* DC
* Inside Ganons castle
* GTG
* Castle courtyard
* great fairy's fountain
* chamber of sages
* shooting gallery
* Temple of time
* market
* back alley
* kokir shop
* goron shop
* zora shop
* House of skulltula
* bazarr
* potion shop
* gravekeepers hut
* lakeside lab
* hyrule field
* kak
* graveyard
* zoras river
* kokiri forest
* lake hylia
* zoras domain
* zoras fountain
* gerudo valley
* lost woods
* the rest of them
* cleanup
* final cleanup
* PR fixes (Zel)
* Fra -> FRA and cleanup map_name_static
* map_name_static
* DONE
* SHould be it
* Done done done done
* vector
* remove another pr
* ?
* EnDekubaba OK and documented, object_dekubaba documented (#864)
* 13 functions left, data imported
* 2 left
* 1 left
* OK
* Begin naming
* sfx rename
* spec
* Begin naming, add LINK_IS_CHILD to EnDu
* Fix spelling of its/it's
* Document most of object_dekubaba, import symbols
* Document draw functions, begin on actionfuncs
* New actor function names, some float constants
* Name almost everything
* Delete asm
* Name size, format
* Review changes
* Review changes
* Brackets, format
* Fix Sheik typo (#867)
* db_camera (#842)
* Decompile shrink_window.c
* progress
* progress
* makefile
* progress
* match 8 functions
* 1 more match
* match 2 functions
* decompile func_800B9638
* fix flow
* migrate .bss
* doc
* name some stuff
* fixes
* comment fix
* remove scene .c files
* old z_camera .s files
* revert z_camera change
* revert unwanted z_camera change
* fixes
* remove unused files, run clang-format and fix non-matching
* fix clang-format causing non-matching
* remove newline + old comment in func_800B3BD4
* make db_camera global variables static
* add s prefix to startic variables
* change magic constants
* rename "unk_50"
* Match func_800B3BD4 and Match DbCamera_UpdateDemoControl (-bss)
* Lots of progress on update
* Mainly cleanup
* run format.sh + remove unused asm
* replace chevrons with add quotes
* remove useless cast + use correct empty argument function declaration
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
* Match Interface_Draw (z_parameter OK) (#876)
* Interface_Draw down to permuter score = 175
* Fix typo
* Matched Interface_Draw!
* clean-up
* Another touch-up
* a little more cleanup
* No more direct gGameInfo->data access
* Audio WIP (#836)
* being code_800EC960
* wip
* wip
* more audio progress
* migrate data in code_800E11F0
* wip
* make ok
* remove asm
* wip
* move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094
* more progress
* wip
* wip
* split code_800E11F0
* migrate rodata in code_800E11F0
* match functions that couldn't because of data issues
* move code_800E4FE0 asm files
* wip
* more wip
* fix global functions, and forward declarations
* wip
* wip
* wip
* ocarina wip
* match a couple functions
* some progress
* separate some bss
* match func_800EDA3C
* some matching
* more matches
* migrate audio rodata
* some matches
* more matchess
* start on synthesis
* work on synthesis
* fix function declaration
* Merge branch 'master' into audio
* match a few more functions
* wip
* wip
* more matching, rename Audio_SetBGM to Audio_QueueSeqCmd
* name several audio functions, and audiocontext members
* more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis
* audio wip
* match a few more functions.
* wip
* add missing NON_MATCHING directive
* wip
* some matching, data reogranization
* match cursed function
* wip
* wip
* formatting
* remove prefix from struct memebers
* missed function rename
* review
Co-authored-by: fig02 <fig02srl@gmail.com>
* ZAPD update: Gotta go fast! (#877)
* copy over the xml
* Rename anims
* A bunch of renames
* minor extract_assets fixes
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "820678b4e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "820678b4e"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Change rgb5a1 to rgba16
* eye and eyebrows
* some dlists
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6be9af65d"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6be9af65d"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Dancing Couple (ovl_En_Tg) (#866)
* Match EnTg_Destroy
* Match EnTg_Init
* Matching EnTg_Update
* Match func_80B18360
Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match.
* Probably equivalent, non-matching func_80B183F8
* Matching EnTg_Draw
* Matching update function
* Matching func_80B18778
* All functions decompiled
* Move data to C code
* All functions matched excepted weird switch/case
* Last matching function
* Remove unused ASM
* Name obvious symbols
* Clang format
* Name text-related functions and variables
* Describe actor as Dancing Couple
See https://github.com/zeldaret/oot/pull/866#discussion_r664726581
* Use named constants
* Name drawing constants
* Use THIS macro for void*
* Name the function that sets environment color
* Add comments to parts of code that aren't clear
* Rename timesSpokenTo to nextDialogue, treat isTalking as boolean
* z_en_ko OK (#869)
* .data OK
* Progress
* push some old stuff
* Finish a chain
* Progress
* Progress
* Run mathfixer.py
* Progress
* match one more
* Up to date
* Match func_80A97610
* func_80A96FD0
* most of the way through the mega switch
* small formatting thing. still stuck on the switch
* start a big switch function
* a little closer
* done with matching for now starting objects
* func_80A97738 OK!
* func_80A995CC OK!
* func_80A99864 OK!
* en_ko OK!
* Code clean-up pass
* more EnKo cleanups, object_fa and object_kw1 textures documented
* complete object_km1, more EnKo documentation
* More documentation
* delete asm
* Clean-up rebase issues
* bleh
* Implement Dragorn's suggestions
* fix spec, implement fig's suggestions
* whoops (ill leave it for the docs tho lol)
* whoops again
* i made an ouchie
* smile
* last one for real
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
* z_en_bigokuta OK (#878)
* start
* Did some more
* Progress
* More
* IDK
* Chip away a little
* im done
* func_809BEBBC OK!
* get rid of graphovl
* revert random changes
* Big Okuta OK!
* more clean-ups
* implement dragorn's suggestions
* implement fig and louist's suggestions
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
* z_obj_mure OK (#875)
* almost matching init, matching data
* more matchings, some non-matching progress
* finishing up SpawnActor, fixing .data types
* first decompile pass done, few non matchings
* cleanup/update matchings and remove asm
* format code
* pick up some OKs
* 1 non_matching left, some documentation
* z_obj_mure OK... but at what cost?
* implement suggested changes, some more documentation
* Implement Fig's suggestions
* review
Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
* convert remaining RGB5a1 to RGBA16 (#879)
* Stalfos (en_test) OK and object_sk2 documented (#868)
* fix colliderinit typo
* migrate data
* init has 1 problem
* progress
* progress
* builds now
* progress
* progress
* lots of funcs matched
* many functions, fix warnings
* 1 left
* done
* docs progress
* remove graphovl
* missed some
* change some funcs
* some more
* another
* format
* more docs
* cleanups1
* limbs, DLs, textures
* limbs named (thanks elliptic)
* more docs
* Name animations, import symbols
* Named sections of xml
* more docs
* rename limbs and use flag macros
* name
* review1 and use limb enum
* review2
* agro -> aggro
* review3
* review4
* review5
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
* Use a temp symbol for RomStart/RomEnd symbols, makes the map show the right value for actual RomStart/RomEnd symbols (#880)
* builds OK
* first pass
* PR fixes (Louis)
* fixes
* a little more
* format
* dragorn's stuff
* more cleanup, merge, and format
* now with work buffers
* forgot sfx
* update and draw
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
Co-authored-by: glankk <glankk@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: zelda2774 <69368340+zelda2774@users.noreply.github.com>
Co-authored-by: zelda2774 <zelda2774@invalid>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
Co-authored-by: Zach Banks <zjbanks@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: pixel-stuck <mathmcclintic@gmail.com>
Co-authored-by: Vijfhoek <me@vijf.life>
Co-authored-by: Synray <31429825+Synray@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Aly Cerruti <aprime2003@gmail.com>
Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* When life gives you Bari, make Barinade
* Now with more names
* merge
* enums everywhere
* just one left
* OK
* more docs
* a little more
* I don't even remember what I changed
* small cleanup
* maybe it's time
* weird
* not sure what's up with sys_matrix
* camera functions
* it's no object
* unused
* back to being unused
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* hope this works
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* object fix
* stuff
* test merge
* merge colchk
* merge colchk
* one more thing
* naming things
* naming things
* implement most suggestions, and format
* fixes
* format
* more fixes
* more fixes and format
* body -> get_body
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Document Moblins (EnMb)
* Use actual decomp-style function names
* Add renamed functions to actorfixer.py
* Add general documentation and add EnMbType enum to check moblin subtype
* Add fig's doc comment on Actor_TestFloorInDirection
* Revert documentation on z_eff_ss_dead.c
* remove `gSPFogPosition(?,?)` comments on `gSPFogFactor` uses in z_rcp.c
* run formatter
* Match a few
* Remove cast
* BossGanon2_Destroy
* Some struct layout
* Missed one
* Work on BossGanon2_Update
* Oops missed another
* Work on update more
* Get it to compile
* Work a bit on update
* func_808FD27C
* Cleanup a bit
* Fix incompatible pointer type
* Work more on update
* Multiply
* Fix janky cast regalloc
* Remove some casts
* Move switch case to right spot
* Tiny regalloc
* Fix stack
* Try to fix jump table
* Migrate bss
* Make data match
* Fix minor formatting
* Another minor formatting
* Replace hex with symbols
* Do display lists
* Vertices
* jnt items init
* Split gfx into separate file
* func_808FCF40
* func_808FCF5C
* func_808FD080
* func_808FD4D4
* func_808FF898
* func_808FFA24
* func_808FFAC8
* func_808FFBBC
* func_808FFC84
* use unk_313 as a bool
* func_808FFCFC
* func_808FFDB0
* Add commented static
* func_808FFEBC
* func_808FFFE0
* func_809000A0
* Remove useless cast in func_809000A0
* Remove useless temp
* Fix wrong branch
* BossGanon2_Update
* Fix implicit function declarations
* Type D_8090EB2C to zelda pointer
* Reorder include because why not
* Deduplicate undefined syms
* Add more to struct
* Work on func_808FD5F4
* Major work on func_808FD5F4
* Get func_808FD5F4 to compile
* Make unk_398 unsigned
* Work on func_808FD5F4
* Progress
* func_808FD210
* BossGanon2_Draw
* Make it compile
* Fix compiler warnings
* Fix branches func_808FD5F4
* re-nonmatching func_808FD5F4
* stuff
* fix math functions
* clang format
* more progress
* Replace bit stuff with type
* Merge master
* Add possibly janky things and fix while loop
* Why does this help
* Chained assignment
* Remove dubious thing
* Reorder thing
* Add possibly fake notices
* Use true and false
* Make func_808FD5F4 equivalent
* Massage stack a little
* func_80906AB0
* Correct texture params
* Whitespace is good
* Use decimal line numbers
* func_809069F8
* Work on func_809060E8
* Make funny loop less funny
* Float stuff
* Remove useless cast
* Merge upstream
* Fix compiler error in nonmatchings
* func_809060E8
* Change tex alloc to be full integer
* Add unk_234
* Correct size of unk_2F4
* Make textures u64[]
* Type textures to u64[]
* func_80905DA8
* func_80905674
* Replace some pi
* BossGanon2_PostLimbDraw2
* func_8090523C
* func_80904FC8
* func_80904D88
* BossGanon2_PostLimbDraw
* BossGanon2_OverrideLimbDraw
* func_8090464C
* func_80903F38
* Match func_80900890
* Move func_80906538 prototype
* Work on func_80902348
* Match func_80902348
* Add fake warning to array thing
* Work on func_8090120C
* Remove useless var from func_8090120C
* Work more on func_8090120C
* Move case probably into place func_8090120C
* Work on func_8090120C until 4914
* Add break to switch
* Pass player to startPlayerCutscene
* Work more on func_8090120C
* Work on func_80902524
* Move function prototype
* Match func_80902524
* Clean up sfx ids in func_808FD5F4
* Correct SFX_FLAG in func_8090120C
* Match func_8090120C
* Match func_80904340
* Change tex to u8[]
* Cleanup func_808FD5F4 a bit
* Clean up another inequality func_808FD5F4
* Match func_80904108
* Cleanup for PR
* Cleanup for PR part 2
* Cleanup data a bit and start on func_80906538
* Basically match func_80906538
* Match func_80906538
* Rename tex to shadowTexture
* Work on func_809034E4 a bit
* replace 255 with 0xFF for texture
* Correct NON_MATCHING guard
* Make func_809034E4 equivalent and not ugly!
* Reuse i in func_809034E4
* Minor cleanup in func_809034E4
* Remove unused asm
* Static all the data
* Switch to using assets xml for overlay graphics :)
* Remove now unused undefined syms
* Rename pad to D_809071FC
* Some cleanup
* Cleanup and name more stuff
* Name BossGanon2_DrawShadowTexture
* Rename to sZelda
* Correct array in func_809034E4.s
* Start using proper symbols for assets
* Add morre undefined syms comments
* Cleanup a bit
* Cleanup a bit more
* Use THIS in limb functions
* Update comments
* Use define for actor id
* Remove unnecessary padding in struct
* Rename rand_float to randFloat
* Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Various minor suggestions
* Replace shadowTexture with void* wherever possible
* Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Do multiply
* Name some variables from debug prints
* Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Use ARRAY_COUNT(sParticles) everywhere
* Put data and bss in _data.c
* Remove unecessary @bug s
* Minor suggestions
* Why are there so many timers
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* bss OK
* Small fix
* Pr fixes (Dragorn) and some named symbols
* added the comment Fig requested
* rip jenkins box
* Update src/code/z_en_item00.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Change combined if to 2 ifs
* GI enum
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* fix colliderinit typo
* migrate data
* init has 1 problem
* progress
* progress
* builds now
* progress
* progress
* lots of funcs matched
* many functions, fix warnings
* 1 left
* done
* docs progress
* remove graphovl
* missed some
* change some funcs
* some more
* another
* format
* more docs
* cleanups1
* limbs, DLs, textures
* limbs named (thanks elliptic)
* more docs
* Name animations, import symbols
* Named sections of xml
* more docs
* rename limbs and use flag macros
* name
* review1 and use limb enum
* review2
* agro -> aggro
* review3
* review4
* review5
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
* almost matching init, matching data
* more matchings, some non-matching progress
* finishing up SpawnActor, fixing .data types
* first decompile pass done, few non matchings
* cleanup/update matchings and remove asm
* format code
* pick up some OKs
* 1 non_matching left, some documentation
* z_obj_mure OK... but at what cost?
* implement suggested changes, some more documentation
* Implement Fig's suggestions
* review
Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
* start
* Did some more
* Progress
* More
* IDK
* Chip away a little
* im done
* func_809BEBBC OK!
* get rid of graphovl
* revert random changes
* Big Okuta OK!
* more clean-ups
* implement dragorn's suggestions
* implement fig and louist's suggestions
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
* .data OK
* Progress
* push some old stuff
* Finish a chain
* Progress
* Progress
* Run mathfixer.py
* Progress
* match one more
* Up to date
* Match func_80A97610
* func_80A96FD0
* most of the way through the mega switch
* small formatting thing. still stuck on the switch
* start a big switch function
* a little closer
* done with matching for now starting objects
* func_80A97738 OK!
* func_80A995CC OK!
* func_80A99864 OK!
* en_ko OK!
* Code clean-up pass
* more EnKo cleanups, object_fa and object_kw1 textures documented
* complete object_km1, more EnKo documentation
* More documentation
* delete asm
* Clean-up rebase issues
* bleh
* Implement Dragorn's suggestions
* fix spec, implement fig's suggestions
* whoops (ill leave it for the docs tho lol)
* whoops again
* i made an ouchie
* smile
* last one for real
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
* Match EnTg_Destroy
* Match EnTg_Init
* Matching EnTg_Update
* Match func_80B18360
Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match.
* Probably equivalent, non-matching func_80B183F8
* Matching EnTg_Draw
* Matching update function
* Matching func_80B18778
* All functions decompiled
* Move data to C code
* All functions matched excepted weird switch/case
* Last matching function
* Remove unused ASM
* Name obvious symbols
* Clang format
* Name text-related functions and variables
* Describe actor as Dancing Couple
See https://github.com/zeldaret/oot/pull/866#discussion_r664726581
* Use named constants
* Name drawing constants
* Use THIS macro for void*
* Name the function that sets environment color
* Add comments to parts of code that aren't clear
* Rename timesSpokenTo to nextDialogue, treat isTalking as boolean
* being code_800EC960
* wip
* wip
* more audio progress
* migrate data in code_800E11F0
* wip
* make ok
* remove asm
* wip
* move some variables outside of gAudioContext to the AudioContext structure due to the size used in func_800E3094
* more progress
* wip
* wip
* split code_800E11F0
* migrate rodata in code_800E11F0
* match functions that couldn't because of data issues
* move code_800E4FE0 asm files
* wip
* more wip
* fix global functions, and forward declarations
* wip
* wip
* wip
* ocarina wip
* match a couple functions
* some progress
* separate some bss
* match func_800EDA3C
* some matching
* more matches
* migrate audio rodata
* some matches
* more matchess
* start on synthesis
* work on synthesis
* fix function declaration
* Merge branch 'master' into audio
* match a few more functions
* wip
* wip
* more matching, rename Audio_SetBGM to Audio_QueueSeqCmd
* name several audio functions, and audiocontext members
* more naming, rename code_800E11F0 to audio_load, code_800DAAC0 to audio_synthesis
* audio wip
* match a few more functions.
* wip
* add missing NON_MATCHING directive
* wip
* some matching, data reogranization
* match cursed function
* wip
* wip
* formatting
* remove prefix from struct memebers
* missed function rename
* review
Co-authored-by: fig02 <fig02srl@gmail.com>
* Interface_Draw down to permuter score = 175
* Fix typo
* Matched Interface_Draw!
* clean-up
* Another touch-up
* a little more cleanup
* No more direct gGameInfo->data access
* 13 functions left, data imported
* 2 left
* 1 left
* OK
* Begin naming
* sfx rename
* spec
* Begin naming, add LINK_IS_CHILD to EnDu
* Fix spelling of its/it's
* Document most of object_dekubaba, import symbols
* Document draw functions, begin on actionfuncs
* New actor function names, some float constants
* Name almost everything
* Delete asm
* Name size, format
* Review changes
* Review changes
* Brackets, format
* Start decompiling Fishing
* Decompile more functions in Fishing
* Decompile a few more functions in Fishing
* Decompile func_80B6E9E0 and func_80B7825C (non matching)
* Minor Fishing cleanups
* Migrate fishing bss to C and match 3 functions
* Decompile and match Fishing_Update
* Migrate fishing data to C and minor cleanups
* Fix the object_fish xml and use its symbols in Fishing
* Partially document Fishing and object_fish
* Add more documentation/cleanups to Fishing and object_fish
* Use object_fish symbols in Demo_Ec and fix naming
* Minor fixes to Fishing docs
* Apply review suggestions for Fishing
* Apply 2 more review suggestions for Fishing
* Apply some review suggestions for Fishing
* z_vr_box.c progress
* Rename dpList to dlistBuf and SKYBOX_CLEAR_SKY to SKYBOX_NORMAL_SKY
* Fix
* renamed dlistBuf to dListBuf and split large string further
* fix colliderinit typo
* fix initchain
* reloc
* progress
* progress
* Pick off a few easy functions, reduce number of warnings
* more tough OKs
* Getting closer to all OK, fix en_girla header
* some hard OKs, 7 to go
* two funcs remaining
* func_80AC7094 OK!
* Fix warnings, begin documentation
* get most of object_ossan documented, document some of en_ossan
* improve en_girla function names
* more EnOssan documentation
* more documentation
* en_tana basically complete, en_girla vars all named, en_ossan documentation improvements
* delete TIME ITSELF
* object_oF1d_map OK
* more names, fixed a poition typo
* Nearly all en_ossan functions named, all variables named
* format.sh
* forgot to delete data
* implement pr changes
* EnOssan OK! implement most of Roman's suggestions
* ugh
* implement figs suggestions
* implement roman's suggestion
* Can't tell my left from my other left
Co-authored-by: fig02 <fig02srl@gmail.com>
* Object_FU limbs and skel OK
* limbs OK
* Object_FU textures OK
* Object_FU face textures OK
* Symbols in en_fu.c
* en_fu.c limb enum
* Remove Object_fu from undefined_syms, move textures to draw, and small cleanup
* Object_bird OK
* Object_Bird OK, added cutscene for shot sun, and song of storms
* Rainbow Bridge CS
* Great fairy CS
* Cutscene -> Cs
* remove '&' from Cutscenes
* Cleanup object_bird
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.c
* Update z_en_fu.h
* Update z_en_fu.h
* DC intro CS
* Zeldas lullaby CS
* Nabooru Knuckle CS
* Owl Lake Hylia CS
* Sun song CS
* Undefined sym in Boss Dodongo
* Missed a few more
* DC tex name
* Windmill man limbs
* did a bunch
* Do a bunch more
* all functions in C
* Macros for draw and collision part of state flags
* Done for now
* remove ASM
* PR fixes (Elliptic)
* all angles are hex and take away bad names
* PR fixes (Roman)
* PR fixes
* PR fixes (Fig)
* restore map mark
* Fix the other messed with files
* Add symbols, does NOT build OK
* parameter OK with syms
* Use `static` more and inline arrays
* wip docs
* Start on Interface_Draw, NOT OK yet
* rename variables since interface dev is weird
* nonmatching for now
* kaleido
* Update src/code/z_parameter.c
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
* Make most texture rectangles use shifts
* fix symbols for all interface things
* done with interface_draw for now
* Update z_parameter.c
* format files
* fix wrong function calls
* fix bss
* improvements in matching
* remove button enum for now
* (void)0 to fix warning
* make conditional look nicer
* fix
* fix wrong combiner
* Update src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* format
* remove "HUD" naming
* review suggestions
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* OK
* Some naming
* Name more, correct typo in Biri, extract skel
* just Draws need names, fix typos in bili and warp1
* Decompile object_vali and add symbols
* Few more names
* Bari naming done
* object_bl completed, symbols added
* Label object_bl
* Formatter
* delete asm
* review changes
* review changes
* review
* Ruto limbs
* RutoLimb enum
* the enum doesn't go in en_door
* Limb DLists
* Name almost all textures and clean up EnRu1.c
* remove padding
* Name all but 1 animation and remove undefined syms
* Object MA limbs OK
* (MA1)Most textures
* Small renames in EnMa1.c
* Object MA1 OK
* add base object for Mjin
* Mjin OK
* Update object_ma1.xml
* PR fixes (Fig)
* PR fixes
* Missed one
* Update assets/xml/objects/object_ru1.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Object_hakach_objects OK and fix a warning in z_play.c
* Object Warp1 OK
* Object_spot16_obj OK
* object_cs Skeleton and limbs OK
* Limbs are broken
* Limbs OK
* Object_CS OK
* Object_jya_door OK
* fix errors and add new lines
* PR fixes (AngheloAlf)
* PR fixes (EllipticEllipsis)
* PR fixes (Fig)
* Rename Spot16 and Jya
* GraveYard -> Graveyard
* PR fixes
* -s
* PR fixes
* Mostly done but shifted
* still messed up
* Almost OK
* OBJECT_JYA_OBJ OK, OBJECT_GR OK
* Done
* Merge master and format
* Cleanup
* Cleanup 2
* Start object MB dont merge yet
* Object_MB OK
* Object_ydan_objects OK
* General 'ydan' actor cleanup
* Forgot some small things
* Object_EC OK
* add .gitkeep and run format
* Object_sd OK but no textures cause of a zap issue
* PR fixes
* Fix object_sd
* fix ydan
* delete .gitkeep files
* OBJECT_BOX as far as it can go with current ZAP
* Fix undefined_syms
* Start child link object
* Push progress, dont merge yet
* Object_mori_objects OK
* Fixed?
* Fix conflicts again
* Seems like i missed some textures
* Extract data for BgBombwall
* More field
* ZAP YEP 2.0
* Object_Box OK
* Object_SD ok. Ready to merge
* remove ASM and merge master
* remove ASM
* remove files wrongfully added to docs/
* Almost done
* Change comment in z_player_lib.c
* forgot some DLists in player_lib.c
* Fix conflict, run format
* Same as before but this time with Tex and TLUT
* Last few things
* fix object_GR and add limbs to object_sd
* Nane -> Name
* gChildDekuShieldMtx is now a matrix and not a blob
* PR fixes (Fig)
* add a space for comment in z_player_lib.c
* re push and new lines
* PR fixes (AngheloAlf)
* PR fixes (Roman)
* Fix Heishi2
* PR fixes (Fig)
* Replace spacing in a file
* PR fixes (Roman)
* Improve z_jpeg documentation
* JpegWork::data is probably better than address
* Rename Jpeg_SendTask to Jpeg_ScheduleDecoderTask
* Rename njpegUCode to gJpegUCode
* Rename GetU16 to GetUnalignedU16 and improve docs
* it's crashing
* fix stuff
* fix xmls
* problematic objects
* fix tabs
* Fix suffixes
* add missing new lines
* Add comments to the problematic objects
* Find and replace fixes
* Add Fig's objects
* I forgot to add a Name in a cutscene, so I'm adding it here
* Update object decomp tutorial a little bit
* Update problematic objects
* Update docs/tutorial/object_decomp.md
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Change comments
* comment out a few blobs
* dammit tluts
* Change a bunch of objects
* update the last bunch
* update comments on oA11 and oB2
* Ninja-edit to fix compatibility with ZAPD's PR 142
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* ViMode OK
* Fix variable name in regconvert tool
* ViMode: fix formatting
* Add nonmatching impl for ViMode_Configure, respond to PR
- Fixed struct field naming (unkXX -> unk_XX)
- ViMode_Configure args are not flags for top/left etc; seem to be for
video mode
- Used @Random06457's implementation of `ViMode_LogPrint`
* Use plain LOG_ADDRESS in ViMode_LogPrint
* Incorporate PR feedback from Roman971
* Decompile ovl_kaleido_scope + minor cleanups
* Add a common header for ovl_kaleido_scope
* Start cleaning up and documenting kaleido_scope (+ some interface docs)
* Improve and fix some kaleido_scope non matchings
* Match KaleidoSetup_Init
* Extract icon_item_fra/ger_static files
* Add more documentation and matches to kaleido_scope
* Improve the z_kaleido_collect.c non matching
* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c
* Update most kaleido variables to be static
* Improve GS flag macros
* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script
* Various minor fixes and improvements
* Minor fixes and review changes
* Review changes part 2
* Rename gSetTileCustom to gDPSetTileCustom
* Review changes part 3
* Matching
* Some naming
* spec
* Name another function
* Name animations, clarify use of GI_MAX and GI_NONE
* Documented bottle range functions
* Simplify squared distance function in EnIceHono, actor descriptions
* Functions for dropped fish
* More naming
* Change 65535.5f to (0xFFFF + 0.5f)
* Change 65535.5f to (0xFFFF + 0.5f)
* name phases
* Named other types, Docile functions
* Naming complete
* delete asm
* format, remove outdated comment
* Fix a few DrawFlexOpa arguments
* Review changes
* Change back to original playSound
* Function comments per review
* finished object_skb
* neglected the limbs and dlists, so I added them
* adding the textures
* fixing some names
* ....forgot to change the c file....
* hopefully fixed formatting issue
* Initial xml
* most of in-code references
* Add limbs and evrything else
* Functions used by EnRiverSound
* Fix forearm and use void* for textures
* Run formatter
* OK a few functions
* BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall
* migrate data
* create mizu_objects, defines for water temple water level
* clean up some code
* implement most suggestions
* review
* review2
* formatting
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Data imported, 8 easy functions matched
* Init only remaining nonmatching, data in
* some renaming & fiddling with Init, still nonmatching
* fix colours
* Init still not matching
* Decompile object_tp
* renames
* Rename func_80B20DE0
* Horrible new idea
* Known equivalent, docs next
* Another attempt
* Finished naming in object_tp
* Named functions, more enums
* DrawBridge -> Drawbridge
* skulltulla -> Skulltula
* Name almost all struct variables
* Named most of the temps
* delete asm
* spec
* Missed data file, whoops
* Review
* More review changes
* ovl_En_River_Sound
* Implement review suggestions, run through clang-format
* Responding to PR comments
* Use CHECK_QUEST_ITEM, run through clang-tidy.
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* Lots of functions matched. Some big ones are close.
* Five left unmatched, one close.
* Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched.
* Three unmatched, one essentially matched, the rest matched.
* More fixes.
* Documented more of the structure and cleaned up a bit.
* BossFd2, BgVbSima, and EnVbBall matched and documented
* Also removed unneeded .s files
* And need to name EnVbBall's functions
* give this a shot
* fix conflict
* one more try
* removing darkmeiro changes
* and again
* now OK from make clean
* minor cleanup
* One more matching function for BossFd
* which means it doesn't need its .s
* splitting
* splitting
* splitting
* forgot some .s
* fancy new names
* fancy new names
* trying again
* sneaky .s files
* sound effects and some hex to decimal conversions
* Sound effects and static variable cleanup
* format.sh and clean up static variables
* sfx and formatting
* ZAP and cleanup
* small cleanup
* cleanup and ZAP
* ZAP
* looking at the giant function again
* looking at the giant function again
* Only the big function left.
* Those .s files aren't mine, officer
* float literals might be fixed. regalloc still a nightmare
* almost done with the big function
* should make now
* not much of a change
* all functions match. rodata somehow doesn't.
* forgot some things
* lots of cleanup
* and a little more
* small error
* large cleanup. Also BossFd has function names and inlined variable declarations
* still more cleanup
* the quest for 0.1f continues
* forgot to put NON_MATCHING back in
* Data structures fully documented. Still more cleanup.
* DECR now works with BossFd2
* should match now
* cleanup
* small cleanup
* cleanup and names
* tiny thing
* particles and headers and stuff
* now with more enums
* merge
* test
* end test
* update
* cleanup
* object 2
* object 1
* doc object_fd2
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* formatting
* .s
* merge actor
* vertex arrays
* a little more
* formatting
* merge opd
* fixed damage check
* cleanup
* fixes
* effect struct
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
* starting toki_hikari
* func_808BA018 matched and some work on other func
* init and draw matched, one to go
* matched final function, removed ASM, updated spec
* adding suggested changes
* Started
* did some more
* did a few more
* update
* Fixed corrupted git repo
* did some more
* Did a few more functions
* taking a break
* fix undefined
* matched the stupid hard function
* a few more
* did some more, done for tonight
* commit in case i mess up
* 3 non matching
* .
* remove tools/ZAP2 from origin master
* idk
* i cant figure this out
* object_xc OK
* compiles now
* the evil function is now ok
* z_en_xc OK
* some documentation
* more documentation i guess
* more documentation
* more z_en_xc docs
* z_en_xc updates
* Final pass, its been nearly a year
* Remove unnecessary comment
* forgot to remove unused asm
* Merge
* Made suggested changes and fixed warnings in z_en_xc
* Remove symbols from undefined_syms.txt
* Add some missing animmode to en_Xc
* review
* review
* fix tot cutscene
* comment
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Fixed upstream
* move .data
* match init
* mathc func_808C1D00
* match func_808C32F4, func_808C2B38, func_808C3224, func_808C2AB0
* match func_808C30F4, func_808C2A40, func_808C3704, func_808C3704
* func_808C18B0
* match another chain of functions
* Match func_808C29B0, Draw, and most of OverrideLimbDraw
* start update
* Really close
* Almost match update, match Override Limb Draw
* start the big switch
* Make a little progress on the big switch function
* Test
* chip away at the big one some more
* test
* progress
* More progress
* Add
* Finished another chain of functions
* Decomp effect functions
* Get the whole file in C
* Move data to its own C file
* Start the effect file en_bdfire.c
* Messed up expected
* Finish EnBdfire.c
* A little clean up
* done as far as I can get it
* Delete scenes directory
* Delete graphs directory
* Delete graphovl.py
* match and such
* Delete BossDodongo_Update.s
* PR fixes
* restore old IDO
* Color Filter
* PR fixes (Roman)
* Fixed added assets
* remove asm
* PR fixes (Roman)
* quick format change
* remove unwanted files
Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* object_ge1
* more stuff named
* object_gla OK, symbols added to C
* eff fire fix in gameplay_keep
* object_nb OK, fixed gameplay_keep
* replaced symbols in EnNb, limb enums
* Change EnGeldB limb enums to hex
* Use enum in header too
* Add descriptions to EnGe2 and EnNb, rearrange xml
* Reorder xml
* review changes
* match a few
* delete ASM
* Almost done
* One reg swap left
* GlobalCtx2 YEP
* Start object SKJ
* Start some documentation
* Big doc pass
* Name the first batch of functions
* Done
* fix some issues real quick
* lets try this again
* remove left over doc tools and add 3 textures
* Finish object_skj docs
* PR fixes
* PR fixes
* Delete BuildInfo.ha
* PR fixes (Roman)
* PR fixes (Roman)
* two matches
* cleanup and formatting
* Update assets/xml/overlays/ovl_Bg_Jya_Cobra.xml
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* no more extract
* format
* owl exterminators
* new match
* new match
* small thing
* whoops
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* First pass
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* more matching fun
* fun with bongo
* clean this up later
* found the matching versions
* diff.py has escaped?
* now with more docs
* Now with floor and more docs
* one more thing
* incremental progress
* It's Bongo time
* one little thing
* merge ZAP
* update
* camera
* gfx now in their own file
* now with more object decomp
* name animations
* now shiftable
* missed some. also DECR
* opd merge
* start xml
* now with xml asset extraction
* format
* cleanup
* removed union
Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* named members of TitleCardContext
* changed screenX/Y to just x/y
* added clarifying comments and renamed timer -> duration because i think its better
* changed names to delayTimer and durationTimer
* made texture a void*
Co-authored-by: gamestabled <chandler2016@yahoo.com>
* ovl_Boss_Goma OK, except func_80917D98
* ovl_Boss_Goma OK and documented
* Minor cleanup: shorten enums, use named constants...
* Floats with .0f, less useless static usage, details on oversight about spawning child gohmas, cleanup...
* More documentation, hopefully less weird about documenting setups and actions
* fix fhg_fire
* remove warnings
* formatting things
* newlines
* review
Co-authored-by: Fig02 <fig02srl@gmail.com>
* fix hidan door
Signed-off-by: angie <angheloalf95@gmail.com>
* doors and lens of truth in gameplaykeep
Signed-off-by: angie <angheloalf95@gmail.com>
* other minor fixes
Signed-off-by: angie <angheloalf95@gmail.com>
* Fix a typo
Signed-off-by: Angie <angheloalf95@gmail.com>
* matches
* more matches
* progress?
* it's time
* so close
* organize declarations
* docs
* more fixes
* more fixes
* fix stage 1
* more fixes
* first try
* demo ids in decimal
* final cleanup
* one more thing
* fixes
* more cleanup
* onepointcs
* OnePointCutscene
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* It's Phantom Ganon time
* Fhg_Fire matched
* small touch up
* more documentation
* starting naming fire
* renaming
* cleanup
* hooray for new names
* merge
* first pass
* camera status
* bgcheck
* object 1
* object 2
* .s
* .s
* fig's comments
* implementing zel's suggestions and a few other things
* the work begins
* work continues
* docs, shifts, cleanup
* cleanup
* texture names
* addressing the rest of the notes
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* Decompile and document En_Clear_Tag
* Adds a define for setting the total count of ClearTag particles.
* Fixes swap in particle effect struct member names.
Additionally, implements the DECR macro where available.
Additionally, implements the CLAMP_MIN macro.
Additionally, adds more comments inside of functions explaining how the Arwing works.
* Reformats z_en_clear_tag.c after recent fixes.
* Removes not OK DECR and CLAMP_MIN macros.
I don't know why they built locally OK for me. May have had a stale build.
* Added static to data declarations.
Additionally added white spacing between data definitions.
* Various syling fixes in EnClearTag
Fixes inconsistent usage of particle/effect. They're Effect is the better name, so I went with that.
Fixed a naming issue in CalculateFloorTangent.
Adds s prefix to all the static variables.
Renames clearTagParticlesBuffer to sClearTagEffects
Consistent capitalization in comments.
Adds more descriptive comments to function level comments that didn't say a lot already.
Renamed gameplay.particleEffects to gameplay.specialEffects.
Renames cameraNumber to cameraId.
Fixed capitalization in display list variable names.
* Always capitalize the A in arwing.
* Fixes issue with overzealous replacement of arwing -> Arwing
* Renames arwing display lists to include the g prefix.
* Renames effect seed -> random
* Removes unnecessary decrement timer comments.
* Updates Arwing comments to detail why it's important that the roll is updated to zero.
* Updates stack variable names in EnClearTag_Update to be more consistent with each other.
* Updates Arwing crashing documentation.
* Further update documentation on arwing crashing.
* Even further updates to Arwing crashing docs.
* Fixes issue of missing newline in En_Clear_Tag.xml
* targetDirection reset now has a chained assignment
* Rotation angle to hex
* Fixes rotation hex and identifies float.
* Updates arwing fire check.
* Arwing cutscene timer is multiplied by 128 rather than shifting 7
* Updates scaledCrashingTimer assignment to be more consistent.
* Updates max scale to multiply by 2
* Gives name to the work buffer indices.
Additionally, makes enum names more consistent.
* Removes unnecessary globalCtx2 in EnClearTag_CreateFlashEffect
* Runs format.sh after recent changes.
* Updated path of ClearTag assets.
* Clear tag now uses Arwing in the display list name for all effects.
* Updates work buffer to expand and contract as new enums are added.
* Uses c99 defines in my c89
* Updates the unknown 8 bytes in en_clear_tag
* review
Co-authored-by: fig02 <fig02srl@gmail.com>
* Shift to new branch
* object_jj decomped
* docs
* Documented blinking, various other things
* more naming
* Most stuff in the object named
* implement eye enums
* delete asm
* Changes from Fig's review
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* .gitkeep and xml
Signed-off-by: angie <angheloalf95@gmail.com>
* comment out most of the xml
Signed-off-by: angie <angheloalf95@gmail.com>
* add all animations
Signed-off-by: angie <angheloalf95@gmail.com>
* textures
Signed-off-by: angie <angheloalf95@gmail.com>
* more textures
Signed-off-by: angie <angheloalf95@gmail.com>
* another texture
Signed-off-by: angie <angheloalf95@gmail.com>
* eye and mouth textures
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add to spec and comment out a problematic skeleton
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* replace almost all d_ references
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add missing include
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* fix problems with overlapping data
Signed-off-by: angie <angheloalf95@gmail.com>
* replace references to Darunia's skeleton
Signed-off-by: Angie <angheloalf95@gmail.com>
* rename cutscenes in en_du
Signed-off-by: Angie <angheloalf95@gmail.com>
* last renaming
Signed-off-by: Angie <angheloalf95@gmail.com>
* ups, forgot to delete some pointers from undefined_syms.txt
Signed-off-by: Angie <angheloalf95@gmail.com>
* Rename the animations
Signed-off-by: angie <angheloalf95@gmail.com>
* run format
Signed-off-by: angie <angheloalf95@gmail.com>
* gDaruniaSageFormationAnim
Signed-off-by: angie <angheloalf95@gmail.com>
* update actor symbols from object
Signed-off-by: angie <angheloalf95@gmail.com>
* rename eyes
Signed-off-by: angie <angheloalf95@gmail.com>
* rename a mouth texture
Signed-off-by: angie <angheloalf95@gmail.com>
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* typo
Signed-off-by: angie <angheloalf95@gmail.com>
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com>
* link of the pr
Signed-off-by: Angie <angheloalf95@gmail.com>
* update the cs name to the correct one
Signed-off-by: angie <angheloalf95@gmail.com>
* tlut
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* add object name to outname in palettes
Signed-off-by: angie <angheloalf95@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Init
Signed-off-by: angie <angheloalf95@gmail.com>
* destroy and non_matching update
Signed-off-by: angie <angheloalf95@gmail.com>
* declare externs to data
Signed-off-by: angie <angheloalf95@gmail.com>
* nonmatching draw
Signed-off-by: angie <angheloalf95@gmail.com>
* everything is a disaster
Signed-off-by: angie <angheloalf95@gmail.com>
* import bss
Signed-off-by: angie <angheloalf95@gmail.com>
* first step to extract data
Signed-off-by: angie <angheloalf95@gmail.com>
* import data
Signed-off-by: angie <angheloalf95@gmail.com>
* func_80A89860
Signed-off-by: angie <angheloalf95@gmail.com>
* draw
Signed-off-by: angie <angheloalf95@gmail.com>
* func_80A89A6C is crap
Signed-off-by: angie <angheloalf95@gmail.com>
* EnJsjutan_Update
Signed-off-by: angie <angheloalf95@gmail.com>
* change some hexs into decs
Signed-off-by: angie <angheloalf95@gmail.com>
* convert hexs of D_80A8AA98 into decimals and run format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* move data to its own file
Signed-off-by: angie <angheloalf95@gmail.com>
* this function is nightmare
Signed-off-by: angie <angheloalf95@gmail.com>
* i'm really trying
Signed-off-by: angie <angheloalf95@gmail.com>
* i think i am finally doing it
Signed-off-by: angie <angheloalf95@gmail.com>
* move the temps to where they are used
Signed-off-by: angie <angheloalf95@gmail.com>
* rename distance
Signed-off-by: Angie <angheloalf95@gmail.com>
* rename a few variables
Signed-off-by: Angie <angheloalf95@gmail.com>
* unclamp stuff :s
Signed-off-by: Angie <angheloalf95@gmail.com>
* i tried to see if i'm going better that older way
Signed-off-by: Angie <angheloalf95@gmail.com>
* moving stuff around
Signed-off-by: Angie <angheloalf95@gmail.com>
* this is the third try
Signed-off-by: angie <angheloalf95@gmail.com>
* changing bit by bit
Signed-off-by: angie <angheloalf95@gmail.com>
* step by step
Signed-off-by: angie <angheloalf95@gmail.com>
* more stuff
Signed-off-by: angie <angheloalf95@gmail.com>
* slow
Signed-off-by: angie <angheloalf95@gmail.com>
* a few small changes
Signed-off-by: angie <angheloalf95@gmail.com>
* go back to second try
Signed-off-by: Angie <angheloalf95@gmail.com>
* changing a s8 to u8 made a bigger difference than expected
Signed-off-by: Angie <angheloalf95@gmail.com>
* i am slowly doing it
Signed-off-by: Angie <angheloalf95@gmail.com>
* some problems are so dumb
Signed-off-by: Angie <angheloalf95@gmail.com>
* it is improving slowly again
Signed-off-by: Angie <angheloalf95@gmail.com>
* erase the old tries
Signed-off-by: Angie <angheloalf95@gmail.com>
* remove four variables
Signed-off-by: Angie <angheloalf95@gmail.com>
* fix the missing instructions at the end
Signed-off-by: angie <angheloalf95@gmail.com>
* theres only regalloc problems left
Signed-off-by: angie <angheloalf95@gmail.com>
* fix stack
Signed-off-by: angie <angheloalf95@gmail.com>
* add ifdef non_matching
Signed-off-by: Angie <angheloalf95@gmail.com>
* i'm getting desesperate
Signed-off-by: Angie <angheloalf95@gmail.com>
* Remove unnecessary casts
Signed-off-by: Angie <angheloalf95@gmail.com>
* random stuff that improves codegen
Signed-off-by: angie <angheloalf95@gmail.com>
* dumb is dumb
Signed-off-by: angie <angheloalf95@gmail.com>
* erase stuff
Signed-off-by: angie <angheloalf95@gmail.com>
* add some comments
Signed-off-by: Angie <angheloalf95@gmail.com>
* use bomb_explosion param and add some comments
Signed-off-by: angie <angheloalf95@gmail.com>
* add a few comments in about stuff
Signed-off-by: Angie <angheloalf95@gmail.com>
* extract carpet's texture instead of hardcode it
Signed-off-by: Angie <angheloalf95@gmail.com>
* set segment 128 in the xml
Signed-off-by: Angie <angheloalf95@gmail.com>
* Add baseaddress, which fixes dlist in xml
Signed-off-by: Angie <angheloalf95@gmail.com>
* fix the second dlist
Signed-off-by: Angie <angheloalf95@gmail.com>
* compiler complain that the symbol doesn't exists
Signed-off-by: angie <angheloalf95@gmail.com>
* last cleanup
Signed-off-by: angie <angheloalf95@gmail.com>
* format and delete unused asm
Signed-off-by: angie <angheloalf95@gmail.com>
* Cleanup and add a few comments
Signed-off-by: Angie <angheloalf95@gmail.com>
* add non matching to spec
Signed-off-by: angie <angheloalf95@gmail.com>
* update xml and add a note to future people
Signed-off-by: angie <angheloalf95@gmail.com>
* Finally remove z_en_jsjutan_data.c
Signed-off-by: angie <angheloalf95@gmail.com>
* Rename extracted variables
Signed-off-by: angie <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* xml
Signed-off-by: Angie <angheloalf95@gmail.com>
* add xmls of anime1 and anime2
Signed-off-by: Angie <angheloalf95@gmail.com>
* add unaccounted data from animes
Signed-off-by: Angie <angheloalf95@gmail.com>
* add all unaccounted data and a bit of renaming
Signed-off-by: Angie <angheloalf95@gmail.com>
* add to spec and change the pointer to the decompiled names
Signed-off-by: Angie <angheloalf95@gmail.com>
* add palettes
Signed-off-by: angie <angheloalf95@gmail.com>
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com>
* run format
Signed-off-by: angie <angheloalf95@gmail.com>
* change palette to Tlut
Signed-off-by: angie <angheloalf95@gmail.com>
* change `Tlut` to `TLUT`
Signed-off-by: angie <angheloalf95@gmail.com>
* Update asm_processor to current master
* Update variables in En_Torch2 to actually be static
This is now possible because asm_processor was updated to handle static symbols in GLOBAL_ASM
* Update tutorial to reflect changes about static symbol limitations
* Commit Before Draw Decomp
* Closer EnMu_Draw
* Matched draw function
* EnMu Matching with OK
* Removed ASM
* EnMu OK
* Implemented pull request changes as of 2020/03/16
* Reverted header
* Split increment and switched 0s to NULLs
* Fix setup warnings
Signed-off-by: angie <angheloalf95@gmail.com>
* Casting the problems away
Signed-off-by: angie <angheloalf95@gmail.com>
* I don't really like changing the type to void
Signed-off-by: angie <angheloalf95@gmail.com>
* We're out of EARLY hell
Signed-off-by: angie <angheloalf95@gmail.com>
* ./format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* Change skel type to "Normal"
Signed-off-by: angie <angheloalf95@gmail.com>
* Changes requested
Signed-off-by: angie <angheloalf95@gmail.com>
* suggestion of roman
Signed-off-by: angie <angheloalf95@gmail.com>
* early is back :c
Signed-off-by: angie <angheloalf95@gmail.com>
* This will be a fix in ZAPD
Signed-off-by: angie <angheloalf95@gmail.com>
* xml
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add spec
Signed-off-by: angie <angheloalf95@gmail.com>
* replace all hardcoded pointers in demo_gj
Signed-off-by: angie <angheloalf95@gmail.com>
* add the rest of the unaccounted data as a blob
Signed-off-by: angie <angheloalf95@gmail.com>
* i forgot to erase a undefined_sym
Signed-off-by: angie <angheloalf95@gmail.com>
* name everything in object_gj
Signed-off-by: angie <angheloalf95@gmail.com>
* Categorize by how are ussed each rubble
Signed-off-by: Angie <angheloalf95@gmail.com>
* forgot to erase the externs
Signed-off-by: angie <angheloalf95@gmail.com>
* the cool laser meme is ded
Signed-off-by: angie <angheloalf95@gmail.com>
* delete gitkeep
Signed-off-by: angie <angheloalf95@gmail.com>
* Init done
* slight tweak
* Destroy done
* func_80995020
* func_809951C4 done
* started func_80995A84
* func_80995A84, func_80995284, func_809952B8 done
* started the mess that is func_80995368
* most functions done except for 3 trouble cases
* func_80995368 done
* func_809958E4 done
* fully matching. Documentation and cleanup to come
* fixed fake matches
* documentation progress
* More documentation
* getting close on tidying up everything
* Finalised documentation and made some comments and name changes in player and other door files
* formatting and final touches to comments
* pr stuff
* merge master
* merge
* format
* remove unused asm after merge
* review
* \n
Co-authored-by: fig02 <fig02srl@gmail.com>
* first two funcs done
* fixing struct var name due to external use
* func_80A07CA4 done
* started EnEncount2_Update
* EnEncount2_Update done
* Encount2 done!
* EnFireRock_Init done (but will only match once initvars are uncommented
* progress
* 4 funcs left
* Fully matching
* minor formatting
* renames
* change structs back to normal
* formatting
* removing unused comments
* even more formatting stuff
* removed unused asm
* pr stuff
* pr stuff
* added newline at end of file
* some merge suggestions
* more pr stuff
* review
Co-authored-by: fig02 <fig02srl@gmail.com>
* DemoDu_Init and externed data
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* functions called by init
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* DemoDu_Destroy
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* DemoDu_Update
Signed-off-by: angie <angheloalf95@gmail.com>
* DemoDu_Draw
Signed-off-by: angie <angheloalf95@gmail.com>
* func_80969FD0
Signed-off-by: angie <angheloalf95@gmail.com>
* func_8096B840
Signed-off-by: angie <angheloalf95@gmail.com>
* two non matching functions
Signed-off-by: angie <angheloalf95@gmail.com>
* import data
Signed-off-by: angie <angheloalf95@gmail.com>
* func_8096BF60
Signed-off-by: angie <angheloalf95@gmail.com>
* func_8096BF54
Signed-off-by: angie <angheloalf95@gmail.com>
* about half of the updates functions
Signed-off-by: angie <angheloalf95@gmail.com>
* almost the other half of update functions
Signed-off-by: angie <angheloalf95@gmail.com>
* the rest of the updates functions
Signed-off-by: angie <angheloalf95@gmail.com>
* DemoDu_UpdateEyes
Signed-off-by: angie <angheloalf95@gmail.com>
* bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com>
* func_8096A970
Signed-off-by: angie <angheloalf95@gmail.com>
* Another chunk of functions
Signed-off-by: angie <angheloalf95@gmail.com>
* More functions and a bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* More functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* a bit of renaming and five more functions
Signed-off-by: angie <angheloalf95@gmail.com>
* nonmatching function still not matching
Signed-off-by: angie <angheloalf95@gmail.com>
* func_8096B57C and a bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* func_8096A528
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* move static variables around
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* another bit of renaming
Signed-off-by: angie <angheloalf95@gmail.com>
* REG
Signed-off-by: angie <angheloalf95@gmail.com>
* Document the functions that give the medallion to player
Signed-off-by: angie <angheloalf95@gmail.com>
* More function renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* more function renaming
Signed-off-by: angie <angheloalf95@gmail.com>
* firemedallion and credits
Signed-off-by: angie <angheloalf95@gmail.com>
* rename some variables in a nonmatching function
Signed-off-by: angie <angheloalf95@gmail.com>
* i hate this function, and it is so dumb.
it took me days to figure it out, the error was so stupid
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* rename mouthtextures and some variables
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* Rename almost all the missing functions
Signed-off-by: angie <angheloalf95@gmail.com>
* whoops, i forgot to run format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* Renaming the references to the cutscene at the chamber of the sages after killing ganon
Thanks to @tharo
Signed-off-by: angie <angheloalf95@gmail.com>
* Many of the changes requested by @petrie911
Signed-off-by: angie <angheloalf95@gmail.com>
* Inline the assignments at DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink
Signed-off-by: angie <angheloalf95@gmail.com>
* change wrong type
Signed-off-by: angie <angheloalf95@gmail.com>
* changes requested by @fig02
Signed-off-by: angie <angheloalf95@gmail.com>
* run format
Signed-off-by: angie <angheloalf95@gmail.com>
* remove s prefix in dustPosOffsets
Signed-off-by: angie <angheloalf95@gmail.com>
* a bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com>
* another bunch of functions
Signed-off-by: angie <angheloalf95@gmail.com>
* add dummies to func_8097911C to match it
Signed-off-by: angie <angheloalf95@gmail.com>
* fix some functions declarations
Signed-off-by: angie <angheloalf95@gmail.com>
* Add functions of the array used by the update function
Signed-off-by: angie <angheloalf95@gmail.com>
* add functions used by draw
Signed-off-by: angie <angheloalf95@gmail.com>
* draw and update functions
Signed-off-by: angie <angheloalf95@gmail.com>
* DemoGj_Init
Signed-off-by: angie <angheloalf95@gmail.com>
* fix some functions declarations
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* 9 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* Some unmatched functions and 12 small matched functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* another 7 small functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* add data
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* small types fixes
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* six more functions
Signed-off-by: angie <angheloalf95@gmail.com>
* func_80978C20
Signed-off-by: angie <angheloalf95@gmail.com>
* func_8097BA48
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* five repeated functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* Array of cylinders and two other functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* seven equals and problematic functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* func_80978F60 and func_80979860
Signed-off-by: angie <angheloalf95@gmail.com>
* func_8097923C doesn't want to match :c
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* three not matching functions
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* func_80978AFC
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* three more
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* DemoGj_FindGanon
Signed-off-by: angie <angheloalf95@gmail.com>
* func_809797E4
Signed-off-by: angie <angheloalf95@gmail.com>
* func_80978B90
Signed-off-by: angie <angheloalf95@gmail.com>
* last non matching function
Signed-off-by: angie <angheloalf95@gmail.com>
* erase reloc
Signed-off-by: angie <angheloalf95@gmail.com>
* a bit of renaming
Signed-off-by: angie <angheloalf95@gmail.com>
* another chunk of renaming
Signed-off-by: angie <angheloalf95@gmail.com>
* fix reg macros and a few comments
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* vt, arrayfuncs renaming and another bit of renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* More renaming
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* i'm hating this actor
Signed-off-by: angie <angheloalf95@gmail.com>
* format
Signed-off-by: angie <angheloalf95@gmail.com>
* Changes asked by @shawlucas
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* swap globalCtx and globalCtx2
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* Move static variables nearer to where they are used and general cleanup
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* A bunch of changes
Signed-off-by: angie <angheloalf95@gmail.com>
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* Forgot to change updateMode
Signed-off-by: Angie <angheloalf95@gmail.com>
* Rename the references to object_gj
Signed-off-by: Angie <angheloalf95@gmail.com>
* Rename some functions
Signed-off-by: Angie <angheloalf95@gmail.com>
* document the actor params, a few members and rename some draw functions
Signed-off-by: Angie <angheloalf95@gmail.com>
* Rename DemoGj_DrawRubbleDisplayList into DemoGj_DrawRotated
Signed-off-by: angie <angheloalf95@gmail.com>
* The first type is the the rubble that is around the fight's arena
Signed-off-by: angie <angheloalf95@gmail.com>
* rename the enums
Signed-off-by: angie <angheloalf95@gmail.com>
* Document the value read from the Ganon instance and rename a few functions from that
Signed-off-by: Angie <angheloalf95@gmail.com>
* rename init and draw functions
Signed-off-by: Angie <angheloalf95@gmail.com>
* rename smoke spawner functions
Signed-off-by: angie <angheloalf95@gmail.com>
* run format.sh
Signed-off-by: angie <angheloalf95@gmail.com>
* fix merge issues
Signed-off-by: Angie <angheloalf95@gmail.com>
* Getting started
* matched tsubo_init
* matched func_80BA0DF4 and func_80BA100C
* matched func_80BA1294, with progress func_80BA15BC
* matched final func, deleted asm, some documenting
* Fixing some control flow, and names
* Fixing suggested changes (some still remain)
* adding the dangeon_keep gfx
* init done
* Everything done except for draw
* matching
* Tidied for pr
* merge master into en_ba
* run format.sh
* fixing merge mistakes
* how many different ways can I screw up a merge challenge
* some pr comments
* breathing new life into these skeletons
* StalZone Progress StalZone
* another match
* matched override
* some progress
* one down, one to go
* naming and prepping for pr
* removing asm and prepping for PR
* fixing damage table and asm issues
* hopefully this fixes it (thank you louis)
* fixing some suggested changes
* inlining data into EnSkb_SpawnDebris
* Fixing suggestions and adding a note
* fixing the asm and function name
* fix
* whoops
Co-authored-by: Fig02 <fig02srl@gmail.com>
* init, func_809B1120, and func_809B11C0 OK
Also migrate data to c
* Match Destroy, func_809B142C, func_809B1524, func_809B15CC
Start on func_809B16AC, but float register diffs :(
* Everything OK but func_809B16AC
and what a devil it is...
* Work on func_809B16AC
What an ugly function
* Do some documentation
* More documentation
* Run formatter
* Rename a few things
* Address PR comments
* Missed a couple angle macro opportunities
* Update src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Anubice OK
* Deleted the wrong part of the spec
* A curtain was missed
* Forgot a comment
I changed the declaration but not the reference :I
* More PR comments
Co-authored-by: mzxrules <mzxrules@gmail.com>
* Fixing mkldscript.c for mac
* 1 to go
* merge update
* almost
* small update
* updating API with master
* NON_MATCHING
* names of vars
* almost matching
Signed-off-by: angie <angheloalf95@gmail.com>
* BgHidanHrock_Init matching
Signed-off-by: Anghelo <angheloalf95@gmail.com>
* renames
* format
* PR suggestions
Co-authored-by: angie <angheloalf95@gmail.com>
* all done, graphics commands written in draw however very messy and non matching
* figuring out data
* OK
* formatting before merge
* pr stuff
* more pr stuff
* pr changes
* Less warnings in boot & code segments
* few more warnings gone
* Ran formatter
* z_view warning gone
* -> 1
* f31 -> 31
* Remove function casts
* Few more small improvements
* Separate declaration and assignment in func_80091738 and Item_Give
Co-authored-by: Thar0 <maximilianc64@gmail.com>
* ObjWarp2block OK
* Address petrie's comments
* Rename unused temp to reflect that it's padding
* Address fig comments
* Use a single byte in offset and size comments
* Address roman's comments
* all functions matching
* en_sth OK
* text formatting and added a description at the top
* some suggested changes
* merge master and remove text comments
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Make func_800C213C match original ROM
The C code for this function was very close to done, and was
functionally equivalent to the ROM. This commit uses a few tricks
to convince the compiler to allocate the same registers as the original
ROM. The two tricks used are:
1. Introduced a new temporary variable "yinc".
2. Added a "do while(0) {}" line in two places.
Both of these ideas came from the decomp-permuter tool. I took the
do/while idea and guess as to what it might have been in the original
code. I imagined that the "do while(0) {}" was probably left over from
a standard multi-line macro, which for some reason had an empty body.
I further suggest that maybe the empty body is because it was a feature
compiled out during RELEASE builds - perhaps a debug logging macro.
* Use simpler code for func_800C213C
Replaced dummy LOG macro with "do {} while(0);". This version makes
less assumptions about what the original code looked like.
* starting out
* match demo
* full match
* cleanup
* more names
* more names
* headers
* dist from link
* docs
* objects
* format
* organization of xmls
* merge actor
* Update src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* format
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* All get item objects OK
* Name z_draw functions
* fix skulltula tokens draw ids
* Review suggestions, merge extract_single_asset into extract_assets as an optional argument
Co-authored-by: Thar0 <maximilianc64@gmail.com>
* fix colliderinit typo
* fix initchain
* start init
* match init
* progress
* progress
* more funcs
* match func_809B3DD8
* progress
* last func almost done
* enum
* name some more types
* progress
* all but one
* fix warning
* remove undefined syms
* match arrows
* review
* spec
* remove asm
* OK, data imported
* naming
* spec, more naming
* more naming, in EnDyExtra too
* more naming
* deleat asm
* change one function name
* addressed review comments
* Actor changes
* Address review comments
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* OK, spec
* all functions and variables named,
some docs on the complicated function
* delete asm
* updated to reflect Actor changes
* simplify one thing into a ternary
* Address review comments
* all functions matched, data imported
* some function names
* more naming
* corrections, naming
* some state flags named
* naming completed (some may be inaccurate)
* spec
* delete asm
* Review changes
* review
* review
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Ge3: OK and data migrated
* Functions and most variables named
* finished enums for limbs, inlined data
* spec updated, asm deleted
* fix dists
* changes
* changes
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Decompiled, not yet matched
* Another match
* Fix merge
* OK
* Move cutscene data to separate source files, name some functions and variables
* Small cleanup
* Some docs
* Small improvements
* Struct_Unk_150 -> DemoKankyo_Unk_150
* Review Suggestions
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Further review changes
* rm reloc asm
Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* mostly done, one function left
* daiku_kakariko OK
* should be ready for pr
* removed unused asm
* should build OK now
* builds OK now
* all of fig's suggestions resolved
* match
* docs might be a while
* cues
* .s
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* get data in
* Match Init and one other
* match some more
* match a bunch more
* merge master
* OK
* Some naming done
* OBJECT_NY almost done. waiting on ZAP changes
* Remove ASM
* Cleanup
* Commit before merge
* fix damage table
* Change comment
* some functions finished
* some more progress
* a bit more progress
* more functions done, one wip
* 2 functions remain
* one function remains
* actor mostly done, still one function left
* some progress, still not equivalent
* dodojr OK
* dodojr ready
* correct actor struct
* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* builds OK now
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* 2 functions left, data imported
* one function left
* setup for NON_MATCHING
* struct variables named
* most of the functions named, type enums
* delete ASM
* Actor fixes
* First batch of files
* Add missing folders back
* Fix missing folders again
* Finish fixing existing texture files
* Gameplay_Keep XML finished
* Most actor gameplay_keep undefined syms removed
* Only ~200 gkeep symbols remain
* All gkeep symbols that ZAP supports are fixed
* Cleanup, and make gkeep names more accurate
* Starting to figure out what some unknown blobs are, merge zeldaret in
* fix a few more things
* refactor gkeep
* Change how gitkeep is handled
* gkeep xml cleanup
* Gkeep finished, now just waiting up ZAP updates
* 100 link animations finished
* 150 link animations finished
* 200 link animations finished
* 250 link animations finished
* 350 link animations finished
* 400 link animations finished
* 450 link animations finished
* 500 link animations finished
* 550 link animations finished
* All Link animations finished
cannot build yet because ZAP doesn't have LinkAnimationHeader yet
* xml changes for new zap stuff
* finish gameplay_keep
* fixing existing objects
* ready for pr besides zap padding issue
* mostly ready for pr
* format all c files
* all conflicts fixed
* make changes that roman requested
* fix thing i didn't mean to change
* some animation symbols renamed
* fixed roman's stuff
* lifemeter hardcoded pointers removed
* fix issue with incorrect data in gameplay_keep
* removed unused asm
* fixed most of fig's comments
* fix all of fig's comments
* reformat files
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update assets/xml/textures/icon_item_static.xml
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* fixed stuff
* fixed most of roman's comments
* remove leading zeroes
* should build now
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "f84d8337b"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "f84d8337b"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* all of gkeep symbols fixed
* compiler error fixed
* format files
* final changes
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* stuck on init
* init matches
* more functions matched
* just a few functions left
* three functions left
* all finished
* fix compiler error
* various improvements
* add actor description
* remove unused asm
* fix remaining dyna things
* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* fixed all of roman's comments
* format c files
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* started init, not matched yet
* all except init matched
* haka_zou OK
* haka_zou done
* fix jenkins problem
* various improvements
* removed unused asm
* fixed things
* fixed new dyna names
* more dyna fixes
* ok now?????
* this better build OK
* applied roman's suggestions
* function renames
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Start work on Jya Cobra
* Match two functions
* Work on func_80896ABC
* func_80896CB4 and most of func_80896D78
* Fix func_80895BEC, clean up func_80896ABC
* Work on func_80896EE4
* Match func_80896EE4
* Nearly match func_80895A70, finish BgJyaCobra_Draw
* Match func_808969F8, start on func_80895C74
* Work on func_80895C74 and func_80895EF0, data move
Also ran permuter
* Some cleanup
* Almost match func_80895C74, tiny bit of work on func_80895EF0
* Remove variables in func_80895EF0
* Make init match nicer
* Work on func_80896518
* Progress in func_80896518
* Figured something out in func_80896518
Going to experiment with stack stuff
* func_80896518 has tiny stack and regalloc issues
* Work on func_80895EF0
* Some work on func_80895EF0
* Update diff script
* Work on func_90995EF0
Use 2d array indexing in func_80895EF0
Small regalloc improvement in func_80896518
Change not equal to to less than where possible
* match func_80896ABC and func_80896D78
* Improve func_80895EF0 a bit
* Do some cleanup
* Change commented out functions to ifdefs
* Another bit of cleanup
* Run formatter
* Remove now unused include
* Another another bit of cleanup
* Revert update to diff script
* PR suggestions
* PR comments
* PR comments, a bit of documentation
* Run formatter
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* More PR comments
* actor fixes
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Data migrated, all but Draw matched
* Draw likely equivalent
but serious regalloc issues,
and that last Gfx_TwoTexScroll is being very stubborn
* Merge remote-tracking branch 'upstream/master' into Thunder
* some improvements, set up to PR as nonmatching
* spec
* corrected header
* added function to functions.h
* delete asm
* Added new collider init
Co-authored-by: fig02 <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* some decomp
* still playing around with this
* rename functions
* ZAP again
* ZAP again
* the renaming begins
* more renaming. hopefully didn't break anything
* change all the things
* this and then merge
* and done
* one little thing
* small docs, small rename
* changed mind on cylinder and quad elements
* something
* more stuff
* more docs
* more adjustments
* Fixed some types
* more fixes
* all sorts of cleanup
* now with flags
* match!
* names and such
* update tools
* damage tables
* ColChkInfo
* one more thing
* formatting
* more formatting
* anime merge
* some stuff
* damage table
* again
* changes
* .s
* changes
* oc2 type
* a couple things
* format
* un-name magic arrows, not enough proof yet
* fix damage table script and remove old one
* EnAObj
* changes
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Fixed descriptions of Zelda's Lullaby, Song of Time, and Scarecrow's Song effect actors
* Added enums for song types
* fixes
Co-authored-by: Fig02 <fig02srl@gmail.com>
* matched functions, still need data
* shopnuts OK
* cleaned up some things in hintnuts by comparing to shopnuts
* merge with new animation stuff
* fixing merge 2
* suggested changes
* missed a DECR
* suggestions
* Migrate data to C
* Partially decompile Init
* func_80B959D0 OK
* ObjKibako2_Destroy OK
* ObjKibako2_Update OK
* ObjKibako2_Draw OK
* func_80B95CA4 OK
* ObjKibako2_Init OK
* func_80B95DFC
* func_80B95ED4 OK
* func_80B95A28 OK
* Name functions
* Delete unused asm and update spec
* Fixup math post rebase
* Name statics
* Clean up variable names
* Run formatter
* xzDistFromLink -> xzDistToLink
* Respond to feedback in ObjKibako2_Break
* Type sp2C as a CollisionHeader* and initalize it when declaring it
* Respond to remaining review feedback
* Respond to review feedback from Roman
* z_lifemeter OK
There were a few versions that matched, so the duplicate `ddfactor`
might be fake. The `if (interfaceCtx)` at the start seems to be required.
I think `sHeartsPrimFactors[0]` vs `sHeartsDDPrimFactors[ddtype]` is
real, because the asm loads `sHeartsDDPrimFactors` for each access,
while it only loads `sHeartsPrimFactors` once. It could have something
to do with `reduceixa` in uopt.
* Make vars function-static
* Fix names
* Gameplay_Init ok
* add (void)0 to prevent warnings in gameplay_init
* update nigthflag
* .
* remove tools/ZAP2 from origin master
* made suggested change
* made sgugested changes
* z_lifemeter cleanup finished, one non-matching
* made Health_UpdateData a bit better, nowhere near matching still
* lifemeter done for now
* fixed define issue
* improve z_lifemeter, still doesn't match
* z_lifemeter done
* Rename functions
* Add files via upload
* Update Health_Update.s
* fix missing symbols in asm file
* Update Health_Update.s
* Update Health_Update.s
* fixed stuff
* Add files via upload
* Delete Health_Update.s
* Rename things according to Roman's suggestions
* lifemeter done hopefully
* fix unused asm that for some reason didn't merge
* fix feedback
* compiles right now
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
* beginning of migrating changes
* got matching
* changed order a bit
* clean up bgcheck
* fix conflict
* fix conflict again
* first stab at identifying types, some oks
* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs
* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args
* couple more OKs
* pushing some OKs
* fix compilation issues
* code_800430A0.c OK, more files decomp'd
* 8003A3E0 big OK :)
* Decomp most of func_8003C614, decomp helper funcs
* Decomp SurfaceType, CamData, and WaterBox property related functions
* more OKs, big OK in 8003C078
* more OKs, more progress, move a function definition in z_collision_check to functions.h
* more clean-ups, more OKs, dyn_vtx is now defined as u8*
* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better
* data migrated, more OKs
* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled
* func_80040284, 800409A8 non_matching, add IS_ZERO macro
* All asm files have C representations, some big OKs, lots of minor tweaks
* More OKs, non-matching code cleanup
* 8003FBF4 and 80040BE4 OK, improve codegen for most functions
* format z_bgcheck.c
* fix warnings, compile errors on NON_MATCHING
* func_8003EE80 is now NON_MATCHING
* begin documenting some functions
* formatting
* more documentation, func_8003A95C OK
* fix PHYSICAL_TO_VIRTUAL changes
* fix var rename
* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP
* func_8004239C ok, more NON_MATCHING improvements, more documentation
* Implement most suggested changes
* Convert comments to slower comments
* /**
* Implement ZAP2 changes
* my anti-virus ate my format.sh results
* Rename a couple hundred functions, fix minor stuff
* rename var so that clang formats correctly
* run format.sh
* implement Petrie's matches/suggestions
* format
* matches
* and the asm
* slight error
* Add SSList
* two more matches
* stuff
* implement code changes
* clean up Petrie's matchings
Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* EnTite_Update matching
* Fixes to update
* made good progress, func_80B1A2A0 is in a good place to be matching soon
* Merge stuff
* func_80B19E94 done, func_80B18CC4 done
* EnTite_Destroy and EnTite_Init done
* Commenting out sDamageTable and EnTite_Init until all the data matches
* Some more small functions done
* more progress
* func_80B19918 done
* func_80B18E7C done
* func_80B19524 done
* more progress
* EnTite_Draw equiv but nonmatching, file otherwise done
* Found some unstaged changed on old laptop
* Draw matching: File fully matching!
* Documentation
* finished documentation
* deleted data files
* update spec
* fixed waterY -> yDistToWater rename after merge
* ran format.sh
* fixing accidental renames in camera
* Fixed some obvious number/comment formatting issues
* Removed unecessary prototypes
* merge
* running format.sh
* suggestions
* more pr comment changes
* format to push
* one more change
* more renames (see pr comments)
* merge
* renames
* format.sh
* fix renames
* function comment formatting
* merge + format
* endless merge fixes
* merge fixes until die
* yet again a merge fix
* pr suggestions
* objmure2 about halfway
* all decompiled, one non-matching
* some documentation
* mure2 done, one nonmatching
* Update spec
* Update z_obj_mure2.c
* Update z_obj_mure2.c
* Add files via upload
* fix formatting
* Fix fake match
* Changed data formatting
* More formatting changes
* fixed name of var
Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* match
* sfx fix
* should be good to go
* comments and such
* Matrix macros escape me
* format
* fix bubble
* remove comments
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* more names
* so many names
* we got subsystems now
* slight cleanup
* merge part 2
* new naming scheme
* slight adjustment
* no limit
* syms maybe
* step one
* OK, it's fixed
* table
* some names and such
* comments**
* update zap
* gitkeep to please jenkins
* ZAP
* fixer
* fixer2
* fixer3
* zap
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* bwall
* cleanup
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* slug-o-cola
* sfx macros
* Matched
* this will have to do
* well maybe a little more
* good enough
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* a good start
* done
* Log
* formatting
* thisx
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* OK
* documented (with one odd float value)
* delete asm and alter spec
* uniformise spawn data to sIsSpawned,
fix compile warnings in Bg_Jya_Lift and Bg_Mori_Elevator
* translate last printf
* re-delete modified asm
* addressed review comments
* remove outdated comment
* addressed comments, made defines
* untrack scenes dir
* remove scenes dir
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* Oh boy more giant functions
* now functional, but not equivalent
* Now only non-matching
* cleaned up illusion room
* much closer. static variables still suck though
* much closer. static variables still suck though
* some docs and cleanup. matching is horrible.
* static varaibles are a troublesome lot
* ifdef
* merge ZAP
* merge again
* small cleanup
* small fixes
* swordstate
* resolve conflict
* comments and such
Co-authored-by: fig <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Fixed newline issue with ZAPD
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
* Finished matching remaining scenes.
* Removed old commented out spec lines
* Decompiled a few object files.
* Reorganized xmls a bit. Updated pu_box overlay to use proper symbol.
* Updated texture and object file decomp
* Moved scenes/ into the assets/ folder
* Fixed a few compile errors
* Fixed merge issues.
* Fixed makefile merge error
* Fixed additional merge error
* Fixed several more merge issues
* Commented out gameplay_keep and sk2 extraction, since currently unused.
* Reenabled gameplay_keep extraction since it's used in the spec
* Fixed build error
* Removed test struct
* Fixed makefile error that would happen on fresh builds
* Fixed merge issue
* Removed relative paths
* Multithreading on extraction, spec uses numbers, few changes to XMLs
* Removed redundant code from the extract_assets script
* object_sk2 and object_spot09_obj OK
* object_spot11_obj OK
* object_spot17_obj OK
* Test: One of the gameplay_keep dlists given a proper symbol
* Updated asset symbol names based on new naming scheme
* XMLs use "Offset" instead of "Address" now
* Fixed merge issues, updated ovl_Magic_Dark xml and gfx file
* Updated to use latest build of ZAPD
* Updated ZAPD again
* Updated ZAP to remove assimp dependency
* Jenkins Test: Added .gitkeep file
* Updated ZAP once more
* Updated png file name to comply with new naming scheme.
* Fixed bad include
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
* init, destroy, update, couple of others decomped
* 2 functions remain
* data migrated
* 1 function left
* OK
thanks mostly to Petrie and the permuter,
and no thanks to my find/replace skills
* documented and deleted asm
* updated spec
* delete data
* address review comments
* Apply review suggestions
* getting things started
* all matched, rock solid
* deleted assembly, formatted, and cleaned spec
* yikes, forgot to hit -d on deleting the asm
* Fixed suggestions and some documentation
* fixing a few compiler warnings
* added suggestions
* removing assembly to fix merge issues
* Documented function names
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* small improvement
* also minor
* merge
* matches
* the room?
* woo matches
* spelling fix
* Fix some non matchings in actors and parameter
- `EnTuboTrap_HandleImpact` from `z_en_tubo_trap.c` (fully matching)
- `func_80ADA35C` from `z_en_po_sisters.c` (fully matching)
- `func_80B0B81C` from `z_en_stream.c` (fully matching)
- `Item_Give` from `z_parameter.c` (1 non matching left)
* Rectify bss ordering comment
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* THIS
* PLAYER
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* a few fake syms
* two more
* format
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* now with more symbols
* EnStream_Init OK
* func_80B0B7A0 OK
* EnStream_Destroy OK
* EnStream_Update OK
* Make func_80B0B7A0 take this instead of thisx like other SetupActions
* func_80B0BAC8 OK
* func_80B0B934 OK
* func_80B0B81C not OK, but very close and I give up
* EnStream_Draw OK
* Delete unused ASM and do a little cleanup
* Provide better names for functions
* Make the file buildable when NONMATCHING is used
* Flip comparisons in EnStream_SuckPlayer as per review
* NONMATCHING -> NON_MATCHING
* Remove & for function pointers
* Type D_06000950 and remove the & in Draw
* Remove unnecessary "struct"
* Remove unnecessary forward declaration
* Make func_80B0B81C take Vec3f*, not PosRot*
* Use the generated reloc when NON_MATCHING
* Move func_80B0B81C forward declare to the else block
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* rupees and, for some reason, pots
* and now an even larger man
* now for the gallery
* more progress
* naming continues
* even more docs
* another match
* match, fix, a new enum
* Update src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
* fixes except globalctx
* well one more
* and now globalCtx
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* woo watch out
* data and such
* stuff
* more decomp
* another match
* match and docs
* more docs
* little more cleanup
* SFX macros
* little more
* more attempts to match
* naming things
* I give up on the match
* also spec
* changes
* hex
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* new tool
* python function conventions
* new name
* new error handling
* whoops comments
* Fully decompiles demo_effect actor.
* Formats z_demo_effect.c
* GET_ACTOR_TYPE is renamed to GET_EFFECT_TYPE
* Implements OPEN_DISPS macros for all draw functions.
* Fixes ugly float values
* Removes unnecessary union structs in the DemoEffect actor struct
* Renames DemoEffect SkelAnimeCurve member to skelCurve
* Names initObjectBankIndex DemoEffect struct member
* Renames jewel display list holders
* Renames initialization function pointers to initUpdateFunc and initDrawFunc
* Renames primitive and environment color DemoEffect struct members.
* Fixes a couple missed floats.
* Renames most draw and update functions.
* Finishes naming all update functions.
* Adds additional SFX defines.
* Renames the rest of the functions
* Renames all external object display lists and vertex references
* Renames DemoEffect global data variables
* Renames DemoEffect Medal function to GetItem because it's used by LightArrows too
* Fixes DemoEffect Timewarp_Timeblock documentation.
* DemoEffect_TimewarpTimeblock updates shrink functions to use decimal
* Converts DemoEffect hex to decimal where appopriate
* Names the rest of DemoEffect struct members.
* Names DemoEffect triforceSpot crystalLightOpacity
* Adds DemoEffect enums for light effect color and god lgt types.
* Renames DemoEffect_UpdateBlueOrb to DemoEffect_UpdateBlueOrbGrow
* Fixes compiler warning in DemoEffect_JewelSparkle
* Renames DemoEffect_MedalSparkle argument
* Reformatting DemoEffect struct offset comments.
* Formats z_demo_effect
* Updates DemoEffect oGfxCtx to use the new macros.
* Adds comments detailing what each function in the DemoEffect system does.
* Removes z_demo_effect.data.s
* Renames DemoEffect global variables and sets them to static
* Removes pointer from DemoEffect function references
* Removes unncecessary default: break; statements in DemoEffect
* Converts rotation values to hex in DemoEffect
* DemoEffect effectFlags now uses ~1 rather than 65534
* DemoEffect_DrawGodLgt now uses a cleaner conditional statement
* eventChkInf in DemoEffect now uses 1 << 9 and 1 << 11
* DemoEffect now uses VT macros.
* Converts DemoEffect colors to hex.
* Changes M_PI / 32768.0f to M_PI / 0x8000
* Updates demo_effect enums to be all caps
* ovl_demo_effect reloc info is now included via build process rather than included from original asm
* Adds param packing macro
* DemoEffect struct unions are now typedef'd outside of the main struct
* Reformats DemoEffect sJewelSparkleColors
* Removes an if(globalCtx){} in DemoEffect_Init
* Removes ActorFunc cast in DemoEffect_Wait
* Removes unncessary comment in DemoEffect_MedalSparkle
* Timer check in DemoEffect_UpdateLightRingShrinking now uses <= 255 rather than < 256
* Removes unnecessary comment in DemoEffect_SetJewelColor
* Removes unncessary comment in DemoEffect_MoveJewelActivateDoorOfTime
* Converts an angle to hex in DemoEffect_MoveJewelActivateDoorOfTime
* Converts a while to for loop in DemoEffect_JewelSparkle
* Moves stack variables in DemoEffect_UpdateDust to a new line for each one
* Removes globalCtx2 assignment to the beginning of the function in DemoEffect_DrawJewel
* Removes unnecessary comment in DemoEffect_DrawCrystalLight
* No longer wrapping rotation reset in if(1){} in DemoEffect_DrawGodLgt
* Converts DemoEffect if statements to use != 0 and == 0 when non-boolean ints are checked.
* DemoEffect initDrawFunc now uses type ActorFunc rather than DemoEffectFunc
* review 2
Co-authored-by: fig <fig02srl@gmail.com>
* cleanup
* name camera action functions
* decompile a few small functions, name a few Camera struct members
* decompile camera data, decompile a few camera functions
* Split ASM for code_800BB0A0
* removing code_800BB0A0.s
* PR Requests, Camera WIP
* remove #define NON_MATCHING from db_camera
* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c
* camera wip
* rename some struct memebers, some decomp wip
* pr updates
* camera wip
* name some fields in Camera Struct, being making sense of Camera_Update
* Camera WIP
* wip
* wip
* add z64camera.h header, begin creating CameraSetting macros
* wip
* wip
* wip
* wip
* migrate camera bss to c
* match a couple functions in db_camera
* match some small db_camera functions
* wip
* migrate db_camera rodata, match a few functions
* remote db_camera.rodata.s
* match some of db_camera
* identify types of some unknown data pieces
* some small wip
* Match Camera_Init, some function changes, some struct name changes. Change unk_C0 and unk_CC to floats from Vec3fs
* add naming for a few more Camera struct members
* wip
* match func_80043F94
* Match Camera_Jump1
* document some of Camera_Jump1
* wip
* match Camera_Jump3
* Match Camera_Update, FeelsAmazing
* wip
* wip
* match Camera_SetParam
* minor cleanup
* wip
* wip
* match Camera_KeepOn0
* some documentation, modify some matching functions to match style of others.
* match Camera_Demo1
* match camera_demo9
* document Camera_Demo1 and Camera_Demo9
* wip
* Match camera_battle4
* match camera_unique2
* Match Camera_Unique3
* match camera_special6
* match Camera_Special5
* wip
* document camera_special6
* naming updates
* match camera_Unique1
* match Camera_Unique0
* wip
* Match Camera_CalcUpFromPitchYawRoll
* match func_80045508
* document Camera_Battle4
* document several camera functions, move camera data to separate file
* rename phi/theta to pitch/yaw
* wip
* uniq9 wip
* Camera_Unqiue9 OK
* document Camera_Unique9
* name unk_160 in camera struct
* wip
* wip
* minor updates
* fix conflicts
* wip
* wip
* Olib updates
* wip
* wip
* rename most Math3D functions, few matches, documentation
* wip
* document most of math3d
* wip
* wip
* wip
* pr updates
* Match Camera_Fixed4
* match func_80058E8C
* pr updates
* add missing comment block finalizer
* Merge math3dupdates
* match Camera_ChangeSetting
* Match Camera_ChangeMode
* match func_80058148
* Match Camera_Special9
* decompile the rest of camera data
* match Camera_Demo5
* name a few camera functions in z_play
* match func_80046CB4, some work on other fucntions
* wip
* impove some non matchings
* fix function rename
* match func_800588B4
* match Camera_Subj4
* wip
* Camera_Demo3 matching, Camera_Battle1 big progress
* Camera_Normal2 OK
* wip
* match Camera_Parallel1
* normalize some things across functions
* match Camera_Normal1
* Match Camera_Normal3
* some cleanup
* more cleanup
* more cleanup , match Camera_CalcDefaultPitch
* data formatting
* Match Camera_Jump2
* document Camera_Jump2
* Match Camera_KeepOn3
* document some of Camera_KeepOn3
* improve some non_matchings
* match func_80045C74 and func_800460A8
* code cleanup, documentation
* match Camera_KeepOn1
* Match Camera_Subj3
* Match Camera_Battle1
* remove non_matching from func_80044adc and func_80046e20
* name several members of Battle1
* more documentation on Battle1
* cleanup
* renaming Camera_Vec3fScaleXYZFactor to Camera_Vec3fTranslateByUnitVector
* reorganize update structs, remove final references to params, remove CameraParams union
* implement camera enums into player
* Renaming Camera_GetDir to Camera_GetInputDir, Camera_GetRealDir to Camera_GetCamDir, etc, implement camera enum's into player
* remove non-global camera variables from variables.h
* clean up some variable declarations
* finish pr comment updates
* fix some warnings
* data formatting
* finish commenting on data
* delete unused asm
* remove asm
Co-authored-by: fig <fig02srl@gmail.com>
* All functions decompiled, most named
* asm deleted, spec and undefined_syms included
* missed a static
* Some cleanup on comments and osSyncPrintfs
* asm
Co-authored-by: fig02 <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* I can't wait to bomb some do dodongos
* a whole heap of bombchus
* matched
* more names
* Dodongo dislikes smoke
* i am error
* merge
* fixes
* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* more matchings, some cleanup
* small cleanup
* decomped most functions, 2 left
* all functions decomped except for Init
* just regalloc left in Init(?)
* Init finally matched, translation, some naming
* most other variables named
* Delete asm
* Whoops, actually deleted asm this time
* review
* review 2
Co-authored-by: fig02 <fig02srl@gmail.com>
* Fixed upstream
* Migrate data and Decomp Init
* Decomp a few more functions
* Small change before starting
* Back to this file
* Match action func chains, func_8096DE94, func_8096DF9C, func_8096E0A4
* Match all except 1 function in first back of actionFuncs
* matched a bunch in bank D_8097053C
* Match the first few draw functions
* match a few more draws and start one
* All matched but one. All equivalent
* Name setup funcs
* finish naming functions
* Fix Gfx stuff
* Remove 'expectedc'
* General clean up
* fix
* progress
* cleanup
* remove reloc
* review 2
* fix awful function pointer thing
Co-authored-by: fig <fig02srl@gmail.com>
* starting the decomp for en_kusa -> the bushes
* in the bushes of love
* maybe the init_function is done?
* The functions that call functions never end
* more progress. almost matches init
* fig helped a bunch...ty fig
* moving things along
* yikes
* more things matching
* moar matches! fixed casting issues on some data
* progress
* progress
* One function left to go
* yeah, idk....its close though
* closer
* Ok
* En_Kusa: Ok
* removing the asm files
* fixed suggestions
* small fixes I forgot
* messed things up, had to go back, back to being OK
* named a couple more functions and fixed some logic
* fixing some names I guessed wrong on
* fixed suggested changes
Co-authored-by: fig <fig02srl@gmail.com>
* Poe actors progress
* Some more progress, En_Poh almost matching
* Further progress
* Fix merge
* Decompile data
* Actor struct cleanups
* More functions OK
* Progress
* Last function decompiled, some nonmatchings left
* Few more OK, skelanime_init definition changes
* Progress
* Style improvements, OPEN/CLOSE_DISPS, few more OK
* Few more style improvements, function prototype additions/changes, another function OK
* Remove unused asm, begin documentation
* Use generated reloc
* Cleanup, format
* Remove a few no longer needed comments
* PR suggestions
* DISP macros
* Missed some FrameUpdateMatrix != 0 replacements
* EnPoField_InteractWithSoul -> EnPoField_SoulInteract, eyeImageIdx -> eyeTextureIdx
* Fix merge, reformat
* Review Suggestions
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Further review suggestions
* Ran formatter
* Less DECR usage
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* EnFd OK
* decompile En_Fd_Fire, document some of En_Fd
* fw wip
* match a few more of ovl_en_fw, properly organize data
* Ovl_En_Fw OK
* Documentation, formatting.
* change Color_RGBA8_n to Color_RGBA8
* PR updates
* fix errors with merge
* review
* dunno why jenkins failed
* review
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* new matches
* format
* again
* Update src/overlays/actors/ovl_En_Door/z_en_door.c
* Update src/overlays/actors/ovl_En_Mb/z_en_mb.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Renamed functions based on decomp
* Update function name changes
* Karebaba decomp and documentation with one non-matching function
* Cleaned up some messiness
* Forgot a file
* Addressing code review
* Updated based on code review
* Unnecessary define
* This function is going down
* Removed remaining asm, renamed symbols as recommended, and added comments to give context around the display lists
* Forgot a file
* Fix renamed function
* Addressed issues raised in code review
* Minor cleanup
* Addressed issues identified in code review
* Addressed the issues betterer
* Updated to use poly disp macros
* review 2
Co-authored-by: fig <fig02srl@gmail.com>
* ovl_Obj_Switch OK
* Documentation & Cleanup
* Remove unneeded prototypes, use documentation comments format, add struct offsets
* Got rid of symbols not referenced by code, at the costly price of warnings
* review 2
* remove asm
* review 2
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* Many likes alike
* matched
* merge ZAP
* now with names
* merge and small cleanup
* removed commends
* got formatter to behave
* move static array
* fixed variable names
* fixes
* pedantic comments
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* Is this where I make a Mr Hands joke?
* Manos: the Hands of Fate
* cleanup
* and format
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* eek spiders
* now with names
* fixes and formatting
* expanded enum
* void* limb draw
* started nabooru
* more work on nabooru
* did more
* file name
* almost done with z_en_nb
* did some more
* most of en_nb decomp
* data migrated en_nb
* did more
* almost finished
* started some documentation on ovl_en_nb
* did more documentation on en_nb
* did some more
* one non matching in en_nb
* ran format.sh
* update
* updated undefined_syms
* updated descriptions
* use DISP macros, delete japanese files. NABOORU IS 100% MATCHING POGGERS
* made suggested changes and removed reloc file
* Made some suggetsed changes
* Made some updates
* review 3
Co-authored-by: fig <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* spooky scary skeletons
* there's a skeleton inside of you
* formatting
* types
* a matched function even
* undo change
* lol anime
* ok how did I forget the .s
* array fix
* would you like to ride the bone train?
* stuff
* more renames
* renames and cleanup
* names suck
* idea
* using void** for now
* stuff
* look more type fixes
Co-authored-by: fig <fig02srl@gmail.com>
* merge upstream
* Merge upstream
* Small formatting
* Data section
* MagicDark_Draw
* Gross match of func_80B874E4
* Add func_8005A9CC to functions.h
* Work on func_80B87A18
* func_80B8772C
* Remove comment
* Work on func_80B87A18
* Correct fp constant
* Add regalloc comment ;(
* Move negatives to numbers
* Stupid casts >:(
* Use this->actor when possible
* It's so close
* Use cast + 0xFF
* func_80B87A18
* Delete asm and replace globalCtx2
* Update spec
* static everything
* Name scale
* Use decimal for alpha
* Name some stuff
* Delete reloc
* Name orbOffset
* Name some functions
* Make unused data colors (because it probably is)
* Change >= to >
* Use clamps
* Name MagicDark_DimLighting
* Name gfx
* Rename prototype params
* Cleanup
* Funny cast
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
* Progress
* deleting more function files
* more
* more
* More
* more
* more
* more
* more
* 2 more
* more
* more
* more
* more
* more
* more
* more
* more
* more
* master update
* 4 more
* Merged
* 3 more
* One more done!
* ug
* Ido Recomp test
* try 2
* Recomp by default
* Fix Jenkinsfile
* Fix 2
* Fixing struct
* CFE errors
* CFE fix -O2
* Cleanup
* More progress, almost done...
* Almost..
* Update and some progress
* formatting
* Cleanup
* Major cleanup
* done for now
* PR comments
* PR comments
* merge master and format
* a few things
Co-authored-by: fig <fig02srl@gmail.com>
* En_Dns OK
All functions matching, several named. I left unnamed the really short ones that just do purchase checks, and the string of action functions near the end where the purposes are somewhat opaque.
* Addressed all comments
(with the exception of one that didn't match)
* missed the header
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* else if review comment addressed
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* first match
* more matching
* Fixed upstream
* Migrate .data
* Start functions
* Decomp func_80AB9F24
* Add files via upload
Decomp: func_80ABB228(Draw),EnNiwLady_OverrideLimbDraw,func_80ABB0A0
* Matched a few more
* matched more
* progress
* All matched up. Whole file OK
* Format, use reloc, deletet ASM
* Fixed a fake match and removed padding from struct
* Small cleanup
* Small cleanup
* Cleanup and some name changes
* Small cleanup
* Add POLY_OPA_DISP macro
* Fix issue in Draw
* Fix ZAP. hopefully
* PR fixes
* PR fixes
* PR fixes
Co-authored-by: Louis <5883445+louist103@users.noreply.github.com>
* merge upstream
* Merge upstream
* BgGanonOtyuka_Init
* Migrate data
* Use texture symbol in dlist
* Split gfx into another file
* Cool data stuff
* Cleanup more data
* Name some more stuff
* Add newline
* BgGanonOtyuka_Destroy
* Rename shockwave to flash
* Work on BgGanonOtyuka_Draw
* Work more on draw
* More progress
* More BgGanonOtyuka_Draw
* Stuff
* Terrible match BgGanonOtyuka_Draw
* BgGanonOtyuka_Update
* func_808760DC
* Cleanup BgGanonOtyuka_Draw
* Cleanup
* More cleanup
* Work on func_80875A0C
* Rename to color
* func_80875C88
* func_80875A0C
* Stuff
* Stuff
* Name top and bottom dlists
* Name some verts
* Add back in accidentally removed D_808772E0
* Name side dlist
* Name dlists
* Name flash verts
* Only add unk_198 to BossGanon
* Name drop timer
* Name isFalling
* Name stuff
* Name stuff relating to sides
* Use Side enum
* Use cardinal directions for sides
* More naming / cleanup
* Rename to SIDE_ALL
* Replace enum with defines
* Flash state
* Reorder add
* Rename to flashHeight
* Revert "Rename to flashHeight"
This reverts commit fa1ca87630.
* Correct sides
* Rename to unwalledSides
* Put f32 on 0x8000
* Cleanup
* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Cleanup
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* anohter match
* .s
* comments
* Decompiled en_horse_zelda
* Deleted some asm files I missed
* Replaced approximation with a fraction
* Turns out the f32 cast is unnecessary
* Converted coordinates to decimal, replaced actor struct padding with char arrays
* Properly converted to decimal
* Renamed actionIndex to action, replaced += 1 with ++
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* marginal improvement
* matched functions. Also fixed a serious lack of static
* format
* more static
* fixing a function prototype
* skelanime OK
* forgot .s
* skin matrix matched
* format
* merge upstream
* Merge upstream
* Migrate data
* Progress
* Progress
* Progress
* Cleanup data
* Match EnOkuta_Update
* EnOkuta_Draw
* func_80AC25D8
* Work on func_80AC2350
* Name EnOkuta_OverrideLimbDraw
* More progress
* More progress
* Progress
* Progress
* func_80AC2350
* func_80AC1938
* Use LINK_IS_ADULT
* func_80AC1B80
* Name some stuff
* Update spec and remove asm
* Name EnOkuta_SpawnSplash
* Name more stuff
* Name EnOkuta_Appear
* Name ColliderInits
* Reorder comparison to make more sense
* Name some Octorock related functions
* Name some projectile stuff
* Reorder comparison
* Convert remaining uses of unk_194 to decimal
* Name some more stuff
* Rename some wait functions to have 'to'
* Consolidate timers
* Name some more stuff
* Change EnOkuta_SetupWaitToAppear to take this
* Name jumpHeight
* Name this->scale
* Name shots
* Name _SetupWaitToShoot and _SetupShoot
* Name more stuff (might change)
* Name EnOkuta_ColliderCheck for now
* Replace some floating point constants
* Change name to make a bit more sense
* Rename mouth to snout
* Just rename parameter to scale
* Fun magic number I guess
* Remove several returns
* Cleanup
* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Clang format
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* merge upstream
* Merge upstream
* Progress
* Progress
* Fixes
* Migrate bss for now ig
* func_80A772EC
* Use rom reloc
* Cleanup
* Correct prototype
* Rename to _PlayBGM
* Eh revert to _StartMusic
* Match func_80A74398 more
* Fixes
* Work on func_80A74398
* Work on func_80A74398
* Match func_80A74398
* Use thisx
* Name, static, and move some stuff
* Match some graphics functions
* Rename asm for named functions
* Forgot one
* More graphics stuff
* Progress
* More progress
* Fix jump table
* Figure out types for a lot of data
* Fix data
* Type remaining data
* Work on func_80A7492C
* Ugly match for func_80A7492C
* Fix func_80A7492C
* Match some interesting stuff
* Move and remove forward declarations
* Sort declarations
* Progress
* Use quotes for vt import
* Slightly better diff
* Better diff again
* Fix stack on func_80A74BA4
* match func_80A74BA4
* func_80A74674
* Progress
* Progress
* Progress
* Progress
* Eh early return probably makes more sense here
* Progress
* Progress
* Progress
* Autocomplete sucks
* Name stuff in func_80A76E2C
* Work a bit on func_80A75C38
* Ugly match func_80A75FA0
* Name it prevInvincibilityTimer
* EnIk_PostLimbDraw3
* Use hex for line numbers in EnIk_PostLimbDraw3
* EnIk_PostLimbDraw2
* EnIk_PostLimbDraw1
* Use hex for line numbers in EnIk_PostLimbDraw1
* Use ACTORTYPE_ENEMY
* Progress
* Possible fake match of func_80A75C38
* Update spec and remove asm
* Cleanup forward declarations
* Move data to fun places
* Move data into func_80A76E2C
* Move data into func_80A75A38
* Make D_80A7847C an array
* Remove struct padding
* Revert "Remove struct padding"
This reverts commit 87b0bd73da.
* Name colliders
* Use else
* Name shieldColliderItems
* Use new graphics macros
* Cleanup
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* gate
* done
* done
* now with names
* OK - data transferred and two functions done
* Not OK
* Not OK
* OK - several more functions
* OK - another function
* OK - 2 more functions
* OK - another function
* OK - one function lefet
* Cleaned up file and removed ASM files
* Removed unneeded forward declaration
* Some cleanup
* More cleanup
* Minor cleanup
* Minor cleanup
* Minor cleanup
* Addressed a few issues
* Changed include statement format
* Changed numbers to hex
* Changed another number to hex
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* wonder item and incidental cleanup on wondertalk2
* merge update
* now with function names
* static variables
* the macros will rise again
* better (?) translation
* fix names
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* ZAP2 stuff
* ZAP why
* ZAP again
* match
* new matches
* format
* need to kill the asm, too
* whoops dlists
* one more match
* no more temp
* let's fix Gameplay_ChangeCameraStatus while we're at it
* formatted
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* Leevers and Tektites and Wolfos, ohmy!
* changes and cleanup
* the need for speed
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* long firewall is long
* Fwbig documented, some cleanup on Zl1
* format
* merge and cleanup
* last things
* Decompiled ovl_bg_spot11_oasis
* Forgot to rename the init chain
* Renamed draw function, corrected include statments, corrected the waterbox pointer assignment, removed early return, removed unnecessary cast
* Forgot to add a newline
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* could be useful
* whoops
* matching
* format
* document and format
* .s files
* cleanup and macros in block-related actors
* fixed a few more things, also an error I cso an error I caught in another file.
* Split code_800F7260
* More function splits, migrate rodata
* Initial progress
* Small progress
* More substantial progress, finally figured out structs
* 2 functions left
* Move prototypes to functions.h
* Remove unused asm, move most externs to variables.h
* Fix merge
* Ran formatter
* Brackets to avoid && &
Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
* More variables to variables.h
* Braces around early return
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* ARRAY_COUNT in sBankSizes and remove unnecessary temp vars
Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* merge upstream
* Merge upstream
* Match EnHorseNormal_Init
* Work on EnHorseNormal_Draw (probably finish depending functions first)
* func_80A6CC88
* Work on EnHorseNormal_Draw
* Clang format
* Properly use OPEN_DISPS
* Stop using thisx lol
* Use the funny angle number
* Use &D_04049AD0 because it's not a display list?
* Stop using fun macros to fix stack
* EnHorseNormal_Draw
* EnHorseNormal_Destroy
* EnHorseNormal_Update
* Use disp macros EnHorseNormal_Draw
* Correctly type D_04049AD0
* func_80A6C570
* Name some draw stuff
* Fix names
* Make if condition more readable
* func_80A6B30C and fix incorrect pointer types
* Function prototypes
* func_80A6B250
* Add header comment
* Move skin function to functions.h
* Change to stable
* Cleanup a little
* Match some more
* Work on func_80A6BE6C (won't compile yet)
* Work on func_80A6BE6C again
* Progress
* func_80A6CAFC
* Match all but one :)
* Work on func_80A6BE6C
* Work more on func_80A6BE6C
* Multiply floating point by integer lol
* Reorder assignment to almost match
* func_80A6BE6C
* Fix warning and remove unnecessary forward declarations
* Data section
* Cleanup data a bit
* More cleanup and clang format
* Clang format is a little confused
* More cleanup
* Formatting
* Revert formatting on z_bg_spot01_objects2.c
* Name unk_14C
* Add clone comment
* Name clonePos
* Name and cleanup
* Name some animation related stuff
* Remove unnecessary assignment
* Name cloneRotY
* Use ARRAY_COUNT for sAnimations
* Add more to unknown struct layout
* Use u8 for last struct member
* Use s32 for length
* Add padding disclaimer
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Various suggestions
* Replace 10430.378f
* Remove padding because alignment
* Move function array out of function
* Remove struct name being present twice unecessarily
* Oops forgot the s
* Don't separate static vars from others
* Some cleanup
* Use ARRAY_COUNT(sJntSphItemsInit)
* Minor cleanup
* Rename enum members
* Oops forgot to rename enum
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* merge upstream
* Merge upstream
* Use Petrie's data section
* Move assignment to declaration
* EnIshi_Init without messing with formatting
* EnIshi_Draw
* Update asm
* Remove war of the zeros
* Type function pointers
* Match a few
* Remove extra * in comment
* Progress
* func_80A7E5A8 and add translation
* Cleanup func_80A7E5A8 and work on func_80A7E824
* Work on func_80A7E824
* Cursed asf match for func_80A7E824
* Re-use variable in cursed function to avoid warning
* func_80A7F0A8
* func_80A7F514
* Use C data
* Various fixes
* Move data around
* Clang format and stuff
* Stuff
* Pretty suspicious just saying
* Add janky hack warnings
* Use enum for type
* Cleanup enum a bit
* Use small and large instead of rock and boulder
* Name EnIshi_SetupCollider
* Remove static var space
* Update translation
* Name some stuff
* Name sRockScales
* Use object id defines for func_80029E8C
* Properly type var to s16
* Make match slightly less fake
* Yay no more fake match for func_80A7E824!
* Use thisx all throughout func_80A7E824 for consistency
* Rename to EnIshi_InitCollider
* Remove asm
* Only use thisx where required in func_80A7E824
* Cleanup and naming
* More naming
* Naming
* Finish naming
* Rename sCylinderInit to sCylinderInits
* Actually finish naming
* Minor cleanup
* Header comment
* Format effect function usage properly
* More formatting
* Various changes
* Minor cleanup
* review
Co-authored-by: fig02 <fig02srl@gmail.com>
* Migrate data, fix header, add undefined symbol, decompile Init function
* Decompiled Destroy function
* Decompiled func_808ADEF0 and adjusted struct some
* Decompiled Update function
* Fixed sInitChain stuff
* Preliminary Draw function decompilation
* Replaced code with OPEN_DISPS and CLOSE_DISPS and some hex with decimal
* Working on Draw function still
* More permuter test stuff
* Got Draw matching except for one little TwoTex issue
* Added NON_MATCHING
* Removed false alarm
* Got most of the functions decompiled; 1 non-matching, 1 not started
* Ran format.sh on file
* These two symbols should be arrays
* Got func_808ADAE0 mostly decompiled
* Got func_808ADAE0 fully decompiled!
* Removed necessary files (except _Draw)
* Successfully decompiled Draw function
* Decompiled Draw function
+ Added proper includes to spec
* Removed Draw function assembly
* Moved func_800F46E0 prototype to functions.h
* Renamed unk_174 to bufferIndex
* Replaced state constants with enum
* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha
* Renamed func_808ADAE0 to BgSpot03Taki_ApplyOpeningAlpha
* Made changes as per pull request comments
Co-authored-by: fig02 <fig02srl@gmail.com>
* Approx. half of en_rl matched
* More En_Rl work
* 5 functions left
* One function left
* En_Rl OK and all matching
* Formatted and cleaned up style things.
* Deleted asm and fixed spec
* Forgot to delete the stuff in the data folder again
* Made all requested changes.
* Forgot one requested change
* Implemented dragorn's documentation suggestions
* Implemented dragorn's documentation suggestions
* Made further requested changes
Co-authored-by: fig02 <fig02srl@gmail.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* bonk
* static var cleanup
* one more rename
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* flame circles
* merge and description
* Update src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* formatting and other cleanup
* names
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* and now for poe sister stuff
* more matches
* awful control flow still needed
* complex control is comples
* matched and documented
* also remove .s
* ZAP
* .s files never die
* more cleaning
* a little more cleanup
* data cleanup
* merge and fix
* removing globalCtx2
* dlists
* forgot this
* now with ColHeader
* a little more
* one last name change
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* spinny wall
* cleanup
* wait for mori tex
* merge and better (?) names
* cleanup libultra
* fixes
- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs
* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL
* remove ULTRA_ABS
* fix includes
* update z_player.c/z_lib.c + run format.sh
* merge upstream/master
* fix include in En_Goroiwa
* fix includes
* Decompiled ovl_en_hs2
* Replaced skelAnime pointer with pad, changed some values to hex, replaced early return with else statment, removed unnecessary padding in the header, removed unneeded & on a function pointer
* Replaced a tab with whitespace, removed address operator in front of ActorShadow_DrawFunc_Circle, moved vec3f inside the PostLimbDraw function
* Changed 0xFFFE to ~1
* Decompile most of En_Holl
* Two nonmatchings left
* Rename some variables, use EnHollActionFunc
* Minor cleanups
* Only regalloc issues left
* General cleanups
* 1 nonmatching left
* Delete data.s file
* Added some more documentation
* Improved nonmatching but OK still elusive, some cleanups
* Review changes
* Ran formatter
* More review changes
* Flip conditions that were previously missed
* DISP macros
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* matching
* merge and cleanup
* wait for mori tex
* name
* merge upstream
* Merge upstream
* Add block comment to c
* EnGoroiwa_Init
* Remove casts in EnGoroiwa_Init
* Matched named functions
* Add one prototype
* func_80A4BD04
* func_80A4BCA0
* func_80A4BD70 and fix incompatible pointer
* func_80A4BD8C and func_80A4BE54
* Remove forward declaration
* Order variable by address
* Cleanup warnings
* func_80A4C188
* Remove func_80A4C188 forward declaration
* Progress
* Rename unk_1CE to waypoint
* func_80A4C264
* func_80A4D5E0
* func_80A4C27C
* Separate necessary forward declarations from temporary
* func_80A4BE10
* func_80A4C080
* func_80A4C134 and func_80A4C164
* func_80A4D074
* Work on some (nonmatching)
* func_80A4D944
* func_80A4D9DC
* Progress
* func_80A4DB90 and func_80A4DC00
* func_80A4D8CC
* func_80A4CA50
* func_80A4C6C8
* work on func_80A4CED8
* Work on func_80A4CED8
* func_80A4CED8
* Use temp to avoid unused error
* Clarify comment
* Work on func_80A4C3A4
* func_80A4C3A4
* Clarify comment better
* func_80A4C594
* Angles
* Improve regalloc
* func_80A4BF28
* Cleanup point access
* Work on func_80A4C814
* func_80A4C814
* Use *=
* Work on func_80A4CB78
* Work on func_80A4D0FC
* Work on func_80A4CB78
* More on func_80A4CB78
* Implement dubious permuter suggestion
* Make janky hack less janky
* Update issue comment
* Move ptr func_80A4CB78
* func_80A4CB78
* Cleanup func_80A4CB78
* Various cleanup
* Add undefined sym
* Work on func_80A4D0FC
* Work more on func_80A4D0FC
* Work on func_80A4D624
* func_80A4D0FC
* Work on func_80A4D624
* Fix stack
* Wrap in NON_MATCHING ifdef to remember which function is not done
* Collapse goto
* Use -- for unk_1C4
* Collapse else if
* Add translation for 'Player ぶっ飛ばし'
* func_80A4D624
* Migrate data section
* Clang format
* Actually add unused note
* Name timers accordingly
* Remove & from sInitChain
* Give timer descriptive names
* Rename idleTimer to waitTimer
* Rename to sWaitDurations
* Name effect data
* Add s prefix (oops)
* Move some data into functions
* Rename params for func_80029E8C
* Unify whitespace for bool returns
* Name colliderHeightOffset
* Name duplicate of colliderHeightOffset and clang format everything
* Reorder vector assignments
* Rename params to pathIdx
* Rename temp to yawDiff
* Add 'f's because floating point
* Name a lot of stuff
* Name posDiff
* Nuke the bool
* Remove unnecessary return
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Remove useless forward declarations and use list[0]
* Clang format again
* Use switch statement
* Use hex for normalizing angle
* Use hex because angle
* Small fixes
* Small fixes
* Move function arrays out of function
* Correct colliderItems
* Don't separate static vars from others
* Clang format
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* match and fully document bg_ddan_jd
* fix comment
* implemented suggested changes, minor fixes
* more changes
* implement requested changes, tweak wording on ySpeed comments
* more minor tweaks
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* All but one
* OK
* merge and cleanup
* wait for mori tex
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* mori_bigst matched and documented
* forgot the .s files again
* Update src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* one .s got away
* more cleanup
* one more thing
* wait for mori tex
* cleanup
* Update z_bg_mori_bigst.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* First working function
* Syncing up
* Not OK - something wrong with data elements
* Not OK - syncing files
* OK now. Fixed data issue
* Not OK - data issue
* Not OK - syncing files
* OK - added another function and commented out init for now
* OK - another function
* Not OK - working on function
* OK - Added working functions back
* OK - another function
* Not OK - syncing files
* Not OK - updating undefined syms
* OK - Draw function
* Not OK - slightly closer on 5950
* OK - another function
* OK - another function
* OK - another function
* OK - another function
* OK - finally fixed init
* Lots of cleanup and renaming
* Removed data files
* Minor cleanup
* Removed commented out line
* Minor cleanup
* More minor cleanup
* More minor cleanup
* More cleanup
* Removed unneeded dereferences
* Minor cleanup
* Minor cleanup
* More cleanup
* Update src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* More cleanup
* More cleanup
* Removed structs
* Minor cleanup
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Changed EnBombf to Actor
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Initial progress
* Broken but almost
* Final attempt at the last function
* Fixing struct def
* PR updates
* PR stuff
* baby commit
* PR comments
* Error handling
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* Hashira4 done
* forgot some names
* minor cleanup
* .gitignore reverted
* merge and rename
* merge and cleanup
* needs a description
* dlists
* wait for mori tex
* started
* Decompiled z_en_takara_man, added CHOICE_NO and CHOICE_YES defines
* use generated reloc
* Removed choice index define due to inconsistencies
* Made suggested changes
* Initial work on spot15_rrbox
* Few functions done with OK
* Added destroy function
* Fixed up struct, made actionFunc and completed more functions
* Another function
* Another function
* Another function
* Another function
* Another function
* Another function
* Another function
* Another function
* Another function
* Another function
* Another function
* Another function
* File entirely working
* Replaced padding with better variables
* Replaced more padding
* Ran format script and some other minor layout changes
* Removed assembly files
* Made update function consistent with other base functions
* Renamed variable
* Removed data file
* Updated reloc location in spec
* Removed old reloc file
* Made init chain static
* Minor fixes
* Fixed various minor issues
* More minor cleanup
* Even more minor cleanup
* Minor cleanup
* More minor cleanup
* Minor fix
* Fixed up more variable names
* Apply suggestions from code review
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* More cleanup
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Starting work on Bg_Ice_Shutter, want to commit
before attempting to use the permuter.
* Forgot to use the new UNK_TPYE in DynaPolyInfo_Alloc
* Resolving last asm issues by re-ordering and
updating .c file.
* Attempting to match by reordering things, removing no
longer used .s files from spec file.
* Adding in proper include path for _reloc file
* Removing unneeded parens and casts
* Removing extra space.
* Updated with review fixes
* Another round of review comments.
* Adding description to comment to clarify what these are.
* Adding in newline before draw function
* Setup player decomp
* Decompile z_player.c and z_player_lib.c
* Decompile remaining z_player.c functions
* Various player improvements
* Player progress (some non matchings and .data migrated)
* Player progress (reposition data and fix some non matchings)
* Cleanup, improve and document parts of z_player_lib.c/z_player.c
* Fix player renames in z_en_st.c
* Fix missing open/close disps in z_player.c
* Minor player fixes
* Address player comments
* Decompile PreRender.c
* use NON_EQUIVALENT and run format.sh
* Get rid of some magic values
* rename dList/dListp to dListHead/dList
* make func_800C213C NON_MATCHING
* replace more values with SCREEN_WIDTH/SCREEN_HEIGHT
* dList/dListHead with gfxp/gfx
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* forgot to remove ASM
* Now with better formatting
* removed some stray thisx
* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
* one more cleanup
* cleanup as per discussion
* fancy new names
* sfx
* ZAP
* more cleanup
* more cleanup
* and a little more
* renaming some stuff
* a little more tidying up
* bug comment
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
* decompile and match En_St
* document ovl_En_St
* Implement OPEN_DISPS, and remove useless comments
* styling updates, inline some declarations
* PR suggestions as well as changing the BlureInit colors to u8 arrays over RGBA types
* remove pointer from EnSt_SetupAction
* Fixed upstream
* Migrate data, fix header, and begin Init function
* Lots of progress
* Almost done
* One non matching left
* Decomp EnHeishi4 All OK
* PR fixes
* PR fixes
* rename some structs
* changes
* rename stuff and start a func
* progress
* progress
* progress
* remove unwanted file
* progress
* match last few funcs
* done, i think
* small changes
* match Lights_Draw (thanks krim)
* comments
* cleanup
* most pr suggestions
* name changes
* rename
* Match some and improve nonmatchings
* Remove pads in TransitionFade_Update, no effect towards matching
* Remove pragma comments, ran formatter
* Remove unused asm
* Almost done with en_dy_extra
* All matching other than draw function, which just has some stack issues + possibly a localGfxCtx issue.
* OK, one non-matching.
* z_en_dy_extra OK and matching
* Deleted asm and updated spec
* Changed colors to decimal and got rid of padding in the u8 array
* Ran format script again to clean up after last commit
* All requested fixes
* Made further requested changes
* merge from upstream
* one non-matching in bg_jya_megami
* deleted asm files
* renamed unk_1D0
* some suggested changes
* megami OK, zero non-matchings
* deleted old reloc.s
* using a define rather than ARRAY_COUNT
* suggested changes
* some requested changes
* Setup -> Init
* Initial commit for en_js
* More work on decomping en_js
* More en_js work
* z_en_js OK
* Made requested changes/improvements
* Renamed arg in func_80A88F64
* Fixed undefined_symbols.txt
* Fixed undefined_symbols.txt
* Fixed undefined_symbols.txt
* Initial commit of weather_tag actor decomp
* Formatted source files and updated spec.
* Fixed references to the environment context variable that I changed.
* Deleted the last of the asm (forgot the stuff in the data folder)
* Made all requested changes to z_en_weather_tag
* Forgot to change basereg
* Removed unnecessary field in weather tag struct
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* That field in the header was totally necessary, not sure what I was thinking, sorry for all the commits
* Renamed what I thought was struct padding to more accurately represent the fact that that field is an unused variable.
* Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* matched func_809AD700, ElfMsg2_Init
* func_809AD968 done
* func_809AD978 and func_809AD9F4 done
* func_809ADA28 done
* ElfMsg2_Update Done, ElfMsg2_Draw Started
* whole file decomped
* Matching and all symbols defined
* Formatting changes, not currently building
* run format.sh
* fixed typos in comments
* Changes to reflect comments
* C file matching, polish needed
* making parenthesis usage consistent
* Documenting draw function, Vtx and Gfx arrays
* Added japanese translation comments
* line spacing fix
* renaming stuff
* Early return in Draw
* naming updates
* Cleaning up names, comments and formatting after the merge
* comment cleanup
* more cleanup
* More cleanup
* Adding commas at end of arrays so they look nicer :)
* more cleanup
* removing unnecessary parentheses
* comment and code changes
* Name changes
* Renamings
* Removing documentation at top
* Decomped Yukabyun (flying floor tiles)
* z_en_yukabyun
* Ran the formatting script, plus fixed negative number stuff in the Update function
* Changed unk_152 to unsigned to get rid of cast
* Made all the suggested changes.
* Update undefined_syms.txt
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Fix Repo
* Update z_en_niw.h
* PR fixes
* Update z_en_niw_girl.c
Add all masks to switch at 142
* Added currentMask enum
* Small fixes
* Cleaned up a lot of little things
* PR fixes
* match MagicDark_Init
* update struct fields and add THIS comment thanks to Ethan
* match MagicDark_Destroy
* start on func_80B874E4
* move func_80B874E4 to a comment for now
* match MagicDark_Update (again thanks to Ethan)
* comment out func_80B8772C and use macro for ACTIVE_CAM
* various changes
* implement permuter suggestion
* reorder nayru temps to fix stack
* use LINK_IS_CHILD
* match func_80B874E4 a bit more
* initially store msgMode in temp_t2
* add msgMode temp
* comment out func_80B874E4 because regalloc >:(
* comment out func_80B874E4 again
* add unk_90C to Player
* change unk_14F to an array for more explicit padding
* remove partially completed functions
* remove matched functions from asm
* clang format
* subtract SFX_FLAG
* combine unk_14F and unk_150
* func_800A7BE4 and func_800A7C20 done
- func_800A7BE4 copy of "Math_Vec3f_ToVec3s" in z_lib.c
- func_800A7C20 copy of "Math_Vec3s_ToVec3f" in z_lib.c
* done func_800A7A24
* func_800A76A4 done
* func_800A6E10 done
* func_800A6EF4 done
* func_800A6FA0 done
* func_800A72FC done
* Deleted z_skin_matrix.data.s and updated spec
* func_800A730C done
* func_800A735C done
* func_800A7E70 done, func_800A7C60 matching but I'm not happy with it (weird types in function params)
* Corrections. func_800A7C60 in skin_matrix done, Matrix_MtxFToMtx in sys_matrix done.
* func_800A7EC0 nonmatching
* func_800A8030 nonmatching but VERY close (two registers swapped)
* func_800A8030 done
* updating comments
* func_800A7704 done
* func_800A7894 done
* halfway through deciphering mips_to_c for func_800A73E0
* func_800A73E0 functional but non-matching (saved register differences and probably regalloc)
* Renaming some arguments and rewriting comments
* Renamed files across whole project and deleted asm nonmatchings
* ran format.sh
* fixed function name
* fixing multiplcation order in SkinMatrix_MtxFMtxFMult
* Corrections in SkinMatrix_MtxFMtxFMult
* Formatting changes after review
* Changes as per code review
* fixing rename error
* fixing rename error
* rename fixes
* fixing function rename error
* ran ./format.sh
* last couple of changes as per code review
* renamed SetScaling -> SetScale
* Skin_Matrix_Invert -> SkinMatrix_Invert
* Renaming and fixing debug message print
* Renamed argument "mf" to more specific "clear" in SkinMatrix_GetClear
* renamed again to "mfp"
* snake case to camel case changes
* bg_mori_hineri OK
* added description and removed reloc
* made suggested changes from fig
* made suggested changes
* Named a few functions in ovl_Bg_Mori_Hineri
* Bg_Haka_Tubo OK
* Ran formatter
* Review suggestions
* Fix commented field offsets in header
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Fix other field offset
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Named data and made static
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Split files
* Format rodata
* Some more code rodata migrated
* Some more actor rodata migrated
* Migrate rodata for ovl_Boss_Ganon
* Migrate rodata for code_800EC960
* Remove unused rodata
* x1b occurences all lowercase b
