* 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>
* Added ability to provide ichaindis a symbol and gave it ability to look up actor var names
* Minor fixes
* Fixed bug with output of script
* Refactored the ROM lookup for ichaindis
* Switched ichaindis to use filemap for ROM address lookup
* Removed unused import and constant
* Minor improvements to ichaindis
* Updated help text
* ichaindis will now only calculate Actor vars if needed
* Changed no-names switch to names switch
* 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>
