summaryrefslogtreecommitdiff
path: root/linker_scripts
AgeCommit message (Collapse)Author
2021-06-29Obj_mu_pict OK (#189)Parker Burnett
* inital commit * FeelsRegAllocMan * obj_mu_pict OK * fixing small things * fixing pr suggestions
2021-06-28En_sb Documented and OK (#192)Parker Burnett
* en_sb OK * fixing pr suggestions * naming final struct members * undoing a name, leaving it unknown
2021-06-28BgIcicle OK and mostly documented (#180)EllipticEllipsis
* remove ZAPD submodule * git subrepo clone https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "ca229f19" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "ca229f19" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone https://github.com/simonlindholm/decomp-permuter.git tools/decomp-permuter subrepo: subdir: "tools/decomp-permuter" merged: "1e4b85a7" upstream: origin: "https://github.com/simonlindholm/decomp-permuter.git" branch: "main" commit: "1e4b85a7" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Remove asm-differ * git subrepo clone https://github.com/simonlindholm/asm-differ.git tools/asm-differ subrepo: subdir: "tools/asm-differ" merged: "eaf72269" upstream: origin: "https://github.com/simonlindholm/asm-differ.git" branch: "master" commit: "eaf72269" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove asm-processor * git subrepo clone https://github.com/simonlindholm/asm-processor.git tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "85288fcd" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "85288fcd" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * remove .gitmodules file * Update REAMDE * OK * Import data * Begin naming * Delete asm references * Main type enum * Rename in functions.txt * Review changes Co-authored-by: angie <angheloalf95@gmail.com>
2021-06-26obj_hgdoor OK and partially documented (#190)kyleburnette
* obj_hgdoor OK and partially documented * Made unused variables static and ran formatter * Made all suggested changes * Made all suggested changes
2021-06-18bg_haka_tomb OK (#188)kyleburnette
* Formats files and updates functions.h * Made all suggested changes * Fixed new warning
2021-06-15ovl_Obj_Hsstump NON_MATCHING matched (#185)Derek Hensley
* Everything matches but func_80BDABCC * Better names, still stuck on func_80BDABCC * Some cleanup * Add param macros and document not matching * format * PR suggestions * Bring over data to c file * Retry Jenkins * Retry Jenkins take 2 * PR suggestions for comments * PR comments * Matched ObjHsStump_Appear
2021-06-15bg_iknin_susceil OK (#186)kyleburnette
* 6 functions left * All but one function matched * all functions decomped * Formatted files * Added switch flag define * Made all suggested changes
2021-06-15iknv_obj ok (#183)kyleburnette
* iknv_obj ok * Documented a few more functions and updated type enum * Added engineer's changes * Changed negations at engineer's request (casts required) * Changed negations at engineer's request (casts required) * Got rid of extra parentheses Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-15ovl_En_GirlA OK and documented (#182)Derek Hensley
* EnGirlA Matches * Convert func to boolean * Cleanup * missed a little cleanup * Update with new MACRO * revert z_en_item00.c macro, and add one more macro * Documented * Format macros.h * Fix VTX format * rename isBought to isOutOfStock * PR suggestions * Document a bug * PR comments
2021-06-11z_bg_tobira01 OK (#168)Zelllll
* data merge * two funcs * one left * actor OK * file done * fix warnings with jenkins * Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update z_bg_tobira01.c * Update z_en_encount2.h * Update z_obj_bell.c * Update z_en_pametfrog.c * Update z_en_minifrog.c * Update include/functions.h Co-authored-by: Zach Banks <zjbanks@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Zach Banks <zjbanks@gmail.com>
2021-06-11En_Weather_Tag (#178)Isghj
* EnWeatherTag: Start * EnWeatherTag: matching function, but suspicious * EnWeatherTag: two non-matching functions, rest match * EnWeatherTag: cleaning and docs * EnWeatherTag: more docs * WeatherTag: more docs * WeatherTag: cleaning * WeatherTag: pad renamed to unk to match * Update include/z64save.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update include/z64.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * WeatherTag: requested changes Co-authored-by: isghj8 <isghj8@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2021-06-10ovl_en_in OK (#173)Derek Hensley
* First pass, 5 still non matching * data * cleanup * Progress on func_808F33B8 * func_808F33B8 is ugly but it matches * func_808F5728 ugly but matches * cleanup * More cleanup/doc a possible inifite loop bug * Cleanup of the switch * Readd functions returns * More progress on THE switch * Everything matches but the MACROS * OK * Add new global Animaion struct * fix arg name * PR suggestions pt 1 * PR suggestions pt 2 * Fix up a few things * Add comment about walking flag * update functions.txt * Update 7 to more explicit bits * More PR cleanup
2021-06-10Ovl_En_Pametfrog OK with partial documentation (#165)engineer124
* Init, 14 of 70 decompiled * En_Pametfrog 26/70 functions decompiled * 35/70 funcs * Fully Matching! * Documentation * Fix merge from master * PR suggestions * minor improvements * Fix functions.h * Oopsie * Oopsie Part 2 * Remove Pametfrog from split_asm.py rodata_excluded * Better use of MACROS + animation docs Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-06-10Match z_effect.c (#176)engineer124
2021-06-10Obj_ghaka OK (#171)Parker Burnett
* getting ghaka started * two more matching funcs * functions all match, but no OK...yet.... * some clean up stuff * uhhh lets try this? * fixing save context stuff * z_obj_ghaka OK * fixing small changes * adding in new suggestions * fixing error
2021-06-09Ovl_En_Minifrog OK with partial documentation (#166)engineer124
* En_Minifrog first few funcs decompiled * more matching * En_Minifrog 3 non_matching functions left * two functions left * Start Documentation * Fully Matching! * Documentation * Fix merge with master * minor pr changes * Minor improvements * PR Suggestions + Minor docs * Fix bool * PR suggestions Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-06-09Obj_Kibako OK (#169)Nick
* Clean dist. * ovl_Obj_Kibako OK * Run clang-format * Suggested changes. * Suggested Changes * Consistency change. * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * PLAYER macro * Suggested Changes * Suggested Changes Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-09ovl_dm_char07 OK (#172)Derek Hensley
* Dm_Char07 Ok * Cleanup * Documented * Add small documentation to en_toto and run format * Better documenting of spotlight flags * PR suggestions
2021-06-09Match Remaining EnGinkoMan Functions (EnGinkoMan OK) (#175)engineer124
* EnGinkoMan OK * Cleanup * Minor PR suggestion
2021-06-09`ovl_En_Ma_Yts` OK and partially documented (#164)Anghelo Carvajal
* destroy * moar * limbdraw * some setups identified * func_80B8D6F8 * func_80B8E0BC * fix unmatching * func_80B8D12C * func_80B8D1E8 * func_80B8DBB8 * some renaiming * some renaimings * symbols * small renaming and a few functions * Almost every function done * lots of renames * Fix merge conflicts * misc notes * struct_800BD888_arg1 * some renamings and enum * func_80B8D2D8 * func_80B8DA28 * import data and cleanup * format * minor changes * Documentation pass * update enum name * Remove object XML * run format * Move EN_MA_YTS_PARSE_TYPE to header * fix conflicts * Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com> * Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * move struct to z64animation * Change PARSE_TYPE macro to accept actor param * format Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-06-02Z_obj_bell Matching (#167)Parker Burnett
* ringing in the bell * another matching func * stuck on func_80A357A8, needs a z_actor func... * no luck on a fix, but got further... * matched func_80A357A8, one left * might be on the right track? saving progress... * getting closer * pushing up matching, it has warnign regarding Vecs * all functions matching * obj_bell OK, time for bed * prepping for PR * fixing suggestions
2021-06-02Ovl_Obj_HsStump Ok but one function does not match (#156)Derek Hensley
* Everything matches but func_80BDABCC * Better names, still stuck on func_80BDABCC * Some cleanup * Add param macros and document not matching * format * PR suggestions * Bring over data to c file * Retry Jenkins * Retry Jenkins take 2 * PR suggestions for comments * PR comments
2021-06-02Ovl_En_Toto OK (#163)Derek Hensley
* Lots of progress * OK * Removed casts * Run format.sh * cleanup * More cleanup * Minor Doc * More cleanup * Format * Add header description * PR comments * Convert raw pointers * Update to new gSaveContext * PR suggestions
2021-06-02Ovl_Dm_Nb OK (#162)Derek Hensley
* match but func_80C1DF18 * Everything matches * Add comment about unknown pointer * Rename vars * Update comment * format * Added header description * Remove raw pointer * Remove unnecessary foward declarations * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-05-25ovl_Obj_Milk_Bin OK (#161)Anghelo Carvajal
* First pass * second pass * Everything matches now * Fix ori * final pass * Add description * Fix warnings (I hope) * move dlist to top of the file * Fix conflicts
2021-05-25partially finish `code_0x8012EC80`, document all of gSaveContext (#138)Zelllll
* not ok, why? * OK! * fix data * finish data etc * work on save context * save finished * first func done * roomInf * done for now * add missing file * add most og names for struct members * fix accidental change * Update z_en_ginko_man.c * Update z_scene.c * maybe fix stuff hopefully * proto * sasa * Update include/z64save.h Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * Update z64save.h Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-22Ovl_En_Fg OK (#133)engineer124
* En_Fg Frogs 9/18 decompiled * En_Fg Frogs One Non-Matching * documentation and cleanup * final matched function * code_script * whitespace * Fixed some mistakes, EnFg_UpdateDust no longer matches? * fixed nonmatching * Minor fixes and documentation * PR suggestions * Fixed genericHeader rename to common * Fix Warnings * PR Good Documentation Suggestions * update names * more pr suggestions Co-authored-by: Jared Collette <jcollette@4000v-udp25-l.eng.unimelb.edu.au> Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-05-20ovl_Bg_Ladder: OK (Wooden Ladder) (#135)Zach Banks
* ovl_Bg_Ladder: OK (Wooden Ladder) * Change sLadderDLists type; add comment about thisx * Add macros for BgLadder params; rename object symbols
2021-05-20Obj_moon_stone Matching (#154)Parker Burnett
* most all matching, just one func left * forgot about the object script * Moon's Tear OK * fixing suggestions * fixing actor pointers
2021-05-20Ovl_Bg_Ctower_Rot Ok (#149)Derek Hensley
* Ovl_Bg_Ctower_Rot Ok * Move enum to h file * Rename D_808E2564 to bgCtowerRotDlists * Rename D_808E2564 to bgCtowerRotDlists take 2
2021-05-19ovl_En_Torch2 OK (Elegy of Emptiness Shell) (#130)Zach Banks
* ovl_En_Torch2 OK (Elegy of Emptiness Statue) * Identify dlists; address PR comments * Rename object segment symbols
2021-05-19Ovl_Obj_Tokei_Step OK (#122)Derek Hensley
* Everything matches but func_80AD6508 * Changed func_80AD6508 to non_matching * Some cleanup * Everything matches * Finished cleanup and documentation * Updated BgMeshHeader to Collision Header * Add newline * Update functions.txt * Better function names * format * Better naming
2021-05-18`ovl_Eff_Dust` OK (#136)Anghelo Carvajal
* some easy functions Signed-off-by: Angie <angheloalf95@gmail.com> * init is cursed Signed-off-by: Angie <angheloalf95@gmail.com> * func_80919230 is weird Signed-off-by: Angie <angheloalf95@gmail.com> * I'm dumb Signed-off-by: Angie <angheloalf95@gmail.com> * func_80919768 nonmatching Signed-off-by: Angie <angheloalf95@gmail.com> * everything is wrong Signed-off-by: Angie <angheloalf95@gmail.com> * This thing still doesn't want to match Signed-off-by: Angie <angheloalf95@gmail.com> * improved a bit Signed-off-by: Angie <angheloalf95@gmail.com> * a bit of renaming, but it still doesn't work Signed-off-by: Angie <angheloalf95@gmail.com> * almost matching * func_80919768 ok * func_809199FC ok * init was dumb * add enum and other minor changes * run format
2021-05-18code_0x8017FEB0 OK (#137)Anghelo Carvajal
* almost every function * atans ok * import data and rodata * format `atan_first_8th_array` * fix signature and rodata * rename to angle * Rename the functions to match their OoT counterparts * rename code_0x8017FEB0 to sys_math_atan
2021-05-18Split code BSS segment by file (#140)Zach Banks
Discussed on Discord: https://discord.com/channels/688807550715560050/688851976746041391/843916746989633547
2021-05-13Ovl Bg_Ctower_Gear OK (#123)Derek Hensley
* BgCtowerGear OK * Added description header * Updated functions.txt * Added MACRO to get type * Renamed init chains to match tyype * Added one more use of Macro, and addressed PR comment * Fixed data copy error and better naming
2021-05-13Extract assets in `make setup`, don't extract them to `assets/src/` and ↵Anghelo Carvajal
build them in `make` (#132) * extract assets in setup and build them in make * Add assetclean
2021-05-10Use decompiled overlays when building ROM (#121)Zach Banks
* Restore padding in ObjVisiblock struct * Copy overlays out of compiled `code.elf` to put into the ROM This is just a "tempory fix" It seems like the built code/assets in `code.elf` should not be copied into `build/baserom/...` (over the original ROM's files) but instead into a `build/decomp/...` tree or similar. `dmadata_table.txt` would also need to be updated to read from the correct location. * Use dmadata_table.txt to generate build rules `makerom_files.txt` & `makerom_uncompressed_files.txt` contained a lot of the same data in `dmadata_table.txt`, so I added a small python script to generate this information into `build/` Segments are no longer dumped out of `code.elf` into `build/baserom/``, instead they are put in `build/binary/`. `linker_scripts/dmadata_script.txt` was checked in, but generated by `dmadata.py`. I deleted it / moved it to `build/dmadata_script.txt.pre`. I also introduced some sentinel files (`dep`). I ended up needing these to make incremental builds work smoothly? (Without them, there were a lot of steps that were getting re-triggered on every build.) If this style isn't welcome, I can try to fiddle with the Makefile more to try to avoid having them? * Restore padding in BgLbfshot struct * Touch sentinel file before command; rm on failure * Restore padding in ObjKepnKoya struct * Ensure asm/ directories exist before disasm steps * Clean up Makefile rules * Set default goal; silent objcopy; fix code_script path * Fix ovl_En_Ginko_Man, ovl_Obj_Lightswitch merge ovl_En_Encount2 still needs work to bring back to matching * Fix ovl_En_Encount2 merge
2021-05-09EnEncount2 (Majora Baloon in Bomber's Hideout) (#108)Isghj
* EnEncount2: start * EnEncount2: got some easy functions down, but now I have a really weird unk struct * EnEncount2: draw function nowhere close * EnEncount2: cleaning/docs * EnEncount2: removed bad function attempt * EnEncount2: function name change to match mster changes * EnEncount2: corrected old BgMeshheader to CollisionHeader * EnEncount2: requested changes * EnEncount2: forgot to add these requested changes * EnEncount2: requested changes Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09En_Ginko_Man (Bank Teller) (#118)Isghj
* EnGinkoMan: init * EnGinkoMan: more matches * EnGinkoMan: that's closer at least * EnGinkoMan: better control flow at least... * EnGinkoMan: docs * EnGinkoMan: more docs * EnGinkoMan: more docs 2 * EnGinkoMan: cleaning * EnGinkoMan: missed something in savecontext * EnGinko: requested changes and further docs Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09Obj_Lightswitch (Sunswitch and Stonetower Temple flip switch) (#107)Isghj
* ObjLightswitch: fast * ObjLightswitch: data migrated, except collider init is broke * ObjLightswitch: nvm, collider documented * ObjLightswitch: OK with 3 non-equiv, docs starting * ObjLightswitch: more docs * ObjLightswitch: some requested changes * ObjLightswitch: requested changes Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09Scene Changes (#114)Zelllll
* match function * major cleanups * rename switch functions * use graph_alloc to fix fake matches * more documentation * more matches, lots of changes * lots more work * format * Update z_scene_proc.c * very hard lagrange interpolation function OK! * remove any remaining * documentation done, only two functions left * a few more things * one function left! * document another oot leftover * last function decompiled, not matched yet * scene_proc complete * start work on z_scene * done with z_scene * remove unessecary typedefs * fix some things to remove warnings * Add z_scene_table and decomp data * Delete ctx.c * add draw cfg enum * cleanup * most scene table functions done * done for now * all scene files done * Update include/z64scene.h Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl> * add missing macros * fix some renames * scene texture file rename * added temporary structs so it still builds * more structs * even more old structs * fix boyo * should fix compile error * lets hope nothing broke * ub comment back Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-04Ovl en nutsball OK (#115)Derek Hensley
* EnNutsball Match but one function with sp issues * Updated ActorPlayer * Renamed unk144 to timer and added data as comment * Got update matched but stack issues with two vars * add back new line * Fixed stack issue based on PR comments. Added data * more descriptive variable names * Use OPEN_DISPS/CLOSE_DISPS macros in draw * Address PR comments
2021-05-04 ovl_Dm_Ravine (Link Riding Through Lost Woods Cutscene - Tree Trunk) (#120)Zach Banks
* ovl_Dm_Ravine OK (Link Riding Through Lost Woods Cutscene - Tree Trunk) * ovl_Dm_Ravine: respond to PR comments * Rename/retype DmRavine_Action -> DmRavine_DoNothing * ovl_Dm_Ravine: incorporate PR feedback from kyleburnette * ovl_Dm_Ravine: rename fields; use enum for state
2021-05-04En_jc_mato matching (#119)Parker Burnett
* starting actor * close to being done * updating txt files * z_en_jc_mato OK * Merge branch 'master' into en_jc_mato * fixing some suggestions * adding names * changing name to movement
2021-05-04z_en_warp_uzu OK (#113)Parker Burnett
* matched all functions * Jk I figured it out....forgot to add static... * Fixing name suggestion
2021-05-04Ovl_En_Cha OK (#116)Derek Hensley
* EnCha OK * pr comments, else if branches, file header comment * Better function names
2021-05-04obj_funen OK (#91)kyleburnette
* initial funen work * obj_funen OK * ran format script
2021-05-04kepn_koya OK (#97)kyleburnette
* kepn_koya OK * actually commited change to header
2021-05-04bg_lbfshot OK (#92)kyleburnette
* bg_lbfshot OK * formatted source files * Update z_bg_lbfshot.c * Update z_bg_lbfshot.h
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 13:33:21 +0000