* 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>
* 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
* 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>
* 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>
* Initial progress
* Broken but almost
* Final attempt at the last function
* Fixing struct def
* PR updates
* PR stuff
* baby commit
* PR comments
* Error handling
* 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>
* 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
* 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
* 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
* 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
* 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>
* 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>
* Add cutscene disassembler script
* Add more debug info
* Use addresses instead of already disassembled data, emit array declaration
* Disassemble more cutscene data, fix csdis bug where BGM commands would output too many args
* Fix similar bug for LIGHTING command, fix line ending from previous commit
* Remove CS_PAD
* Update ZAP2
* Disassemble ovl_Demo_Sa cutscene data
* 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
* 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>
* 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 init chains, colchkinfo, colider inits, damage tables
* actor cleanups
* fix collider init script names
* small fixes
* ichain arg name
* change dynapoly types and names
* revert enru1 data name
* and the type
* pr suggestions
* 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
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)
* Auto stash before rebase of "upstream/master"
* A large number of scenes have been decompiled.
* Fixed makefile
* Decompiled around 40 scenes.
* Removed old file
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
