* 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
* 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
* Start decompiling bugs
* Decomp func_80A7BFA0
* Match 4 functions
* Match a few functions, really close on another
* Consolidate if statements
* Progress on func_80A7C86C
* Decompile a few small functions
* func_80A7CEC0 still needs stack and regalloc work
* Finish up func_80A7CEC0, do a couple functions
* Start on func_80A7D460
* func_80A7D460 is mostly down to regalloc
* Match update and draw, more work on func_80A7D460
* func_80A7D460 is really close to matching
* func_80A7D460 matches
* Cleanup
* Run formatter
* Missed reversing a couple flout comparisons
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* PR Comments
* PR Comments #2
* Missed one
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* match ShotSun_Init
* match ShotSun_Destroy
* match func_80BADDCC
* break up unk_19C to add spawnTimer
* ShotSun_Update
* func_80BADE74
* work on func_80BAE05C
* make func_80BAE05C closer
* use proper macros for osSyncPrintf
* format if statement better and add temp player pointer func_80BAE05C
* Reorder spawnPos to match stack args later
* match func_80BAE05C
* almost match func_80BADF0C
* Remove temporary and add parenthesis
* change part of comment and move last unk_1A4 assignment to be similar to decompiler
* Change do while(false) to if (1)
* func_80BADF0C
* change comment
* update spec
* fix vt macro
* cleanup and name
* remove asm
* remove data
* remove extern
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
* remove & for function pointers
* rename and retype D_02007020
* format
* remove tiny whitespace
* reorder if statement
* finish renaming
* replace cast with bitwise operation
* move globally used functions to functions.h
* reorder description
* move headers for EnItem00 and EnAObj to z64actor.h
* retype Item_DropCollectible and Item_DropCollectible2 to return EnItem00*
* rename ShotSun_StartFairyCountdown to ShotSun_TriggerFairy
* rename ShotSun_FairyCountdown to ShotSun_SpawnFairy
* add unk_E3EC field to MessageContext
* rename to ShotSun_UpdateHyliaSun for now
* remove != 0 on flag check
* remove unsigned suffix and use enum constant for Item_DropCollectible call
* add unk_95C field to Player
* add ub comment
* retype unk_1A4 and remove explicit struct padding
* Update src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* progress
* init ok and merge master
* enheishi1 and srchball OK
* cleanup
* cleanup
* cleanup
* more cleanup
* done
* more comments
* add file headers
* some review comments
* move vectors
* more review comments
* angle in decimal
* add prototype
* semicolon would be good
* fix
* make unset actor ids 0
* reword comment
* no &
* osPfsIsPlug.c and osContSetCh.c OK
* update
* __osPfsGetStatus.c OK
* removed unused asm
* Updated all libultra controller files to use new structs instead of the temporary structs. Added os_pfs.h
* controller updates
* fixed header guard
* Made suggested changes
* guLookAt.c OK
* commit
* __osPfsSelectBank.c OK
* osPfsDeleteFile.c OK
* pfsreadwritefile.c OK
* osPfsFreeBlocks.c OK
* cleaned up ospfsfreeblocks
* started pfsinitpak.c
* pfsallocatefile.c OK
* contpfs.c decompiled with 1 non matching
* osPfsFindFile.c OK
* pfsinitpak.c decompiled. one non-matching
* Actually fixed merge conflict
* sins.c OK
* cosf.c sinf.c and sins.c OK
* moved osAfterPreNMI to its own file. Renamed code_801031F0 to contquery.c
* pfschecker.c OK
* final update and rename
* Removed makefile testing thing that i accidentally added
* Made suggested changes
* Re upload
* Decomp BgJyaLift
* Fixed issues
Fixed issues from review
* Edits after review
* Review Fixes
Made some fixes and also changed an unknown variable name
* Fixes to file
Fixed some styling things and renamed the last function
* Added fixes
Added roman's fixes
* Delete filemap.pyc
* Fixes
Removed ctx.c and replaced tabs with spaces spec.
* Decompile jpegdecoder.c, padsetup.c and code_800C3C20.c
* change func_800C3C20's prototype and rename some fields in jpeg related structs
* Fix comment in Jpeg_GetU16 and change func_800C3C20
* use a switch in padsetup.c
* osPfsIsPlug.c and osContSetCh.c OK
* update
* __osPfsGetStatus.c OK
* removed unused asm
* Updated all libultra controller files to use new structs instead of the temporary structs. Added os_pfs.h
* controller updates
* fixed header guard
* Made suggested changes
* Decompile z_bg_haka_trap.c
* Update spec
delete old .reloc.s file
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
* Deleted reloc.s and made style changes to function pointers and local vars
* Renamed timer field, added more useful temp names
* Implemented Roman's suggestions, including moving enum to header file, moving some static variables inside functions, removing unnecessary casts, removing unnecessary temps, and fixing a few style issues
* Commented dual purpose of unk_16A and formatted file again
Co-authored-by: Random <28494085+Random06457@users.noreply.github.com>
* fix hard-coded pointers in code_800DACC0.data.s
* fix hard coded pointer in code_800E11F0.data.s
* fix hard coded pointers in code_800EC960.data.s
* remove fixed pointers in code_800F7260.data.s
* fix hard coded pointers in code_800F9280.data.s
* remove accidental comment
* fix hard coded jump table in Camera_Unique9.s
* 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
* Some progress
* progs
* More
* 1 more
* Init
* Slightly better score on one function
* 1 down!
* some progress
* Prep for PR
* PR suggestions
* OK!
* Formatting
* formatting again
* PR comments
* updating ZAP2
* One non matching left in ovl_End_Title
* ovl_End_Title OK
* formatting
* removed unused asm files
* changed 0xFF to 255
* updated dlist
* made suggested changes
* Scene Header Command 0x0B is now OK
* Delete func_8009899C.s
* Updates assert check on func_8009899C
Per Roman's suggestion of placing the __assert outside of the if (1)
* Updates func_8009899C to have array access rather than pointer math
* Removes deprecated comment in func_8009899C
Known files left with pointers in .data after this (possibly the only ones since I checked roughly everything):
- flg_set.c
- z_camera.c
- db_camera.c
- code_800D7CD0.c (ucode_disas.c)
- audio (not sure which ones, see the structure sheet)
* Start work on ovl_En_Guest
* Match func_80A5046C and func_80A50518
* Everything but func_80A509D4 matches
* Match last function, cleanup, rename stuff
* Run formatter
* Temp didn't need to be used
* I should have ran the formatter again
* Use tcrf translation for debug string
* Apply suggestions from code review
Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
* Rename references to function and fix semicolon
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
* PR Suggestions
* More comments
Co-authored-by: krimtonz <33664508+krimtonz@users.noreply.github.com>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
* Progress on z_player_lib, Named fields in Player struct
* More functions decompiled
* Matched another function
* A few more functions
* Ran formatter
* Rename some variables and add comments where appropriate, change types of unknowns
* Create PlayerActionFunc type
* Fix uncaught syntax error and issues from effects merge
* Rename invincible to invincibilityTimer, refactor long comments in Player struct
* Properly rename all occurences of invincibilityTimer
* decompile z_fcurve_skelanime and code_8006C510
* format
* Decomp Magic_Wind
* PR Updates
* add space between ActorFunc and MagicWindFunc
* missing pr updates
- `z_effect`: Matched and essentially all documented.
- `z_eff_spark.c`: Decompiled (1 non matching left) and mostly documented.
- `z_eff_shield_particle.c`: Matched and mostly documented.
- `z_eff_blure.c`: Decompiled (5 non matchings left) and partially documented.
- `z_effect_soft_sprite.c`: Matched and mostly documented.
- `z_eff_ss_dead.c`: Matched but not documented.
- `z_effect_soft_sprite_dlftbls.c`: "Matched" (only data, contains the effect ss overlay table).
- `z_effect_soft_sprite_old_init.c`: Not decompiled, but functions are categorized by effect ss overlay. And they should be decompiled at the same time as their corresponding effect ss in the future.
Other changes:
- Added a lot of types/enums to `z64effect.h`and moved+renamed some structs from `z64.h` to this header
- Added effect ss overlay segments to `segment_symbols.h` and effect ss init vars to `initvars.h`
- Added a macro called `VTX_T` to generate a `Vtx_t` in the same style as `VTX`
- Fixed `flg_set.c` .bss to be in the right file
- Removed `tools/overlayhelpers/batchdisasm` since it's no longer relevant
- Removed unused leftover asm from recent PRs
