* Data migrated and ObjKibako2_Init OK
* ObjKibako2_Destroy OK
* func_8098EC68 OK
* Commit what I have on Update as I figure it out
* Name skulltulaNoiseTimer and get a little closer to matching Update
* Wrap Update in NON_MATCHING for now
* Get this ready to push up
* func_8098ED20 OK (but it's not an actionFunc???)
* ObjKibako2_Draw OK
* func_8098E9C4 OK
* Turns out globalCtx *is* needed
* func_8098E8A8 OK
* Save my progress on func_8098E5C0 for now
* func_8098E900 OK
* func_8098EB78 OK
* Clean up some if-conditionals
* Delete pointless forward declaration
* ObjKibako2_Break OK
* Update names to match OoT equivalent
* func_8098E5C0 OK (though a little weird)
* ObjKibako2_Update OK
* Clean, document, and name ObjKibako2_ShouldBreak
* Clean and name ObjKibako2_ContainsSkulltula
* Some more cleanup
* Why did I mix snake case with camel case lol
* Update spec now that everything matches
* Actually rename the data
* sn/cs -> sin/cos
* Use true/false in ObjKibako2_ShouldBreak
* Use the AC_HIT macro and don't use the temp where it isn't needed
* Use macro and enum for contents
* Get rid of fake temp in Init
* Macros for collectible ID/Flag
* 0xFFFD -> ~AC_HIT
* In macros, x -> this
* Just kidding, use thisx for macros
* Add description to the top of C file
* Run ./format.sh after installing clang-format-11
* char -> UNK_TYPE1
* Remove unnecessary struct padding
* Initialize thisPos at the same time it's declared
* Clean up parentheses for bitwise operations to make it clearer what they do
* Clean up control flow in ObjKibako2_Idle
* Remove extraneous parentheses
* Move instantialization up in ObjKibako2_ContainsSkulltula
* Move tempRand instantiation up in ObjKibako2_Break
* Move collectible instantiation up in ObjKibako2_SpawnCollectible
* Remove extra brackets
* Remove extra brackets (again)
* Move contents instantiation up in ObjKibako2_Init
* Import bss to boot_main and idle, match last function in idle
* Some pointer cleanup in idle, spec
* Clean up idle, add build.c, add bss to CIC6105
* Import rand bss
* sptask bss and a macro
* sptask updated to use libultra macros
* siacs.c bss
* Macros in CIC and idle
* controller bss
* seteventmesg bss
* spec
* pimgr and piacs bss
* initialize OK, threadsave, initialize, pimgr bss
* Match DmaMgr_Start
* Fix bss reorder using separate file
* Small cleanup of hex/dec in buffer sizes
* Add comment, remove unused bss from spec
* Merge remote-tracking branch 'upstream/master' into boot_bss
* Format
* Delete files
* remove commented-out structs
* Bit more cleanup
* Addressed reviews
* Format
* z_lifemeter done.
* fix new warning I didn't saw. add variables.txt
* suggested changes
* add new texture ptrs to undefined_sym, changed heartTex & temp to TexturePtr in LifeMeter_Draw
* change hex literal to decimal and other small suggestions
* change bool to u32; change hexa literal to decimal in LifeMeter_IsCritical; renamed undefined sym to their D_02 addresses
* re-applied format.sh on z_lifemeter
* coding style fixes
* fix typo in undefined_sym
* named func and vars.
* changed modulo check
* add extra line after var declaration in LifeMeter_Draw
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* changed unkTimer to camelCase; timer constant as decimal; flip some comparison in LifeMeter_Draw
* uncomment & rename func_ in functions.h
* Update include/functions.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* match function and split data
* import data
* Rename function and variable
* format data
* Fix data
* { 0 }
* Update src/code/z_face_reaction.c
Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com>
* Rename return variable in en_ossan
* textId
* Rylie's review
* Try to format this properly
* Format again
Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com>
* Fix actor_symbols.py
* Temporary fix to rename_sym.sh
* Fix the few Type1 cylinders
* Rename main -> Main
* chmod rename_global_asm, fix asm in rename_syms
* Format
* EnBji01_Init OK and Partially Documented.
* EnBji01_Destroy OK and Fully Documented.
* func_809CCE98 OK and partially documented.
* Removed goto in func_809CCE98().
* func_809CD6C0 matching and partly documented.
* Pasted raw mips_to_c into EnBji01_Update().
* EnBji01_Update() matching and partially documented.
* EnBji01_Update() matching and partially documented.
* func_809CDA4C() matching and partially documented.
* func_809CDA4C actually matching this time, and partially documented.
* func_809CDB04() matching and partially documented.
* func_809CD028() matching and mostly documented.
* func_809CD6B0() matching.
* func_809CD328() matching and partially documented.
* func_809CCDE0() matching and partially documented, func_8013E950()
prototyped.
* func_809CD634() and func_809CD70C() matching and partially documented.
func_801A5BD0() prototyped.
* func_809CD77C() matching and mostly documented. All functions now
matching.
* Imported data from ovl_En_Bji_01_data.asm to z_en_bji_01.c. Updated
object_script.txt and code_script.txt. Ran format.sh. Builds OK.
* Documented all of the unks in Shikashi's struct. Build still OK.
* Fixed new warning in Bg_Haka_Tomb resulting from my new prototype of
func_8013E3B8().
* Renamed remaining instances of unk160 to cutscenes.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Remove unnecessary comment about compiler padding.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Correct stack declaration spacing.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Update src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.h
Remove unnecessary comment about compiler alignment padding.
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c
Remove unnecessary padding comment.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Apply suggestions from code review
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Batch commit for comments during code review.
* Apply suggestions from code review (trailing Us)
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Deleted exteraneous space at the bottom of En_Bji_01 struct in the
header file.
* Used params enum for switch cases.
* Update src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.h
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
* Apply suggestions from code review
replacing magic numbers with limb enums
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
* Renamed func_809CD328 to EnBji01_DialogueHandler per code review.
* ObjWarpstone_Init() matching and mostly documented.
* ObjWarpstone_Destroy() matching and fully documented.
* ObjWarpstone_Update() matching and partially documented.
* ObjWarpstone_Draw() matching and partially documented.
* func_80B92B10() matching and partially documented.
* func_80B92C00() matching and mostly documented.
* func_80B92C48() matching and mostly documented.
* func_80B92CD0() matching and partially documented.
* func_80B92DC4() matching and fully documented.
* Obj_Warpstone OK.
* Obj_Warpstone OK and mostly documented.
* Changed "actionFunc" return values from 0/1 to false/true.
* Apply suggestions from code review
Change colors to decimal, and use matrix defines/enums instead of magic numbers.
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
* Convert more colors to decimal and replace more magic nums with mtx
defines/enums.
* Ran format.sh after adding (wordy) mtx defines.
* Ran format.sh which updated ginko_man.
* Update src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c
Switch to line comments.
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Changed floating point constants in ObjWarpstone_Draw to hex per code review.
* Rename timer and timer enums.
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Parker Burnett <burnettparker@gmail.com>
Co-authored-by: kyleburnette <kyle@kyleburnette.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* wip
* fix
* add disassembler
* Disasm builds OK
* Variable addends
* More wip
* Rodata migration implemented
* Cleanup old tools
* Try fix submodule -> subrepo merge
* git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "602e609"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "602e609"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Builds again but assets are totally broken
* git subrepo pull --force tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "1ffdb08a"
upstream:
origin: "https://github.com/simonlindholm/asm-processor.git"
branch: "master"
commit: "1ffdb08a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables
* rm z64compress in preparation for subrepo
* git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "eb11085c"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "eb11085c"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Fix asset extraction
* Fix diff-init make rule
* Split code bss
* Split assumed linker bug padding from assembly files
* add filelists for mm.us.rev1
* Maybe working, but I'm not sure
* add overlays to spec
* Add rodata to actos
* Everything compiles
* Make a lot of C files for code
* Add almost every file in code to spec
* whoops
* 3 code files left
* add scenes to spec
* More progress on progress.py
* Fix skelanime in spec
* audio files!
* Fix merge issues
* Fix some C files in code
* Fix remaining code files
* Use existing O1 C files in spec
* reorder boot order in spec
* update spec
* fault.c
* Convert relocs on completed actors, fixbaserom uses current rom name
* more boot files
* Add VT macros and script
* finish already existing boot files
* most of libultra
* fix 64bits libultra files
* Use C files for libultra, wrap some functions in NON_MATCHING
* Remove duplicate of OS_CLOCK_RATE from fault.c
* C files for fbdemos
* delete dumb files
* bootstrap C files, still need to add them to the spec
* update fixbaserom
* boot OK?
* I forgot to commit the spec
* C for gamestates
* C for kaleido
* Change all includes to ""
* copy actor sizes script from oot
* I forgot to delete those files
* Basic C files for effects
* Add effects initvars names
* Remove mislabelled boot functions from header/txt
* Begin porting bootstrap_fx, some sizes
* Fix <>
* Fix enum
* Fix diff.py
* fix libultra stuff
* update regconvert
* update setup warnings
* add some missing ;
* Fix some makefile stuff and other fixes on some non_matching functions
* add executable flag in extract_baserom and fixbaserom
* fix relative path
* copy assist from oot
* fix map path
* another assist path fix
* Delete C files for handwritten files
* add code_801A51F0 to spec
* add gfxbuffers to spec
* Move rodata to top of each file when possible
* UNK_TYPEs for func_801A51F0
* Remove kaleido rodata from spec
* Update spec and undefined_syms for recent merge
* GCC warnings and fix errors in nonmatchings,
* round percentage numbers
* progress script: format changes
* progress: error on non-existing files
* fix warning in z_scene_table
* Match 2 nonmatchings in z_actor
* Warnings in lightswitch and invadepoh
* Fix warning in z_actor_dlftbls
* I though I fixed this one
* whoops
* Comment out CC_CHECK
* Removed redundant ultra64.h includes
* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms
* Completed gamestates bootstrap
* Split kaleido_scope
* Remove section.h and segment.h, move keep object externs to a common location in variables.h
* Completed effects bootstrap
* Segmented address externs for effects, fbdemos, gamestates and kaleido
* Move actor data externs out of the if 0
* Segmented address externs for actors
* Prepare actionfunc detection
* fix script, how did it even work before
* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler
* Automated actionFunc detection in actors
* Segmented addresses from player .text
* rm old segment addrs script and fix build
* Move sizes folder to tools
* Make build.py executable
* New Jenkinsfile Prayge
* Remove numpy dependencies
* Add warnings_disasm_current.txt
* my bad
* Update spec and undefined_syms
* Add z_eff_ss_hahen to pametfrog
* git subrepo pull (merge) --force tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "163ca2af"
upstream:
origin: "https://github.com/z64me/z64compress.git"
branch: "main"
commit: "163ca2af"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2f68596"
* Make z64compress print to stdout
* sneeky commit to update warnings tooling
* test
* Another test
* Mark fixing overlay reloc generating as a TODO
* Update warnings stuff
* Communicate the return code from running z64compress back to the Makefile through the wrapper
* Run formatter, remove extra commented copy of function
* Re-fix some includes
* Convert atan to hex to conform to decided style
* Some tidying up, remove c for fp and the other two handwritten code files
* BSS in z_collision_check & z_scene_proc
* add static back in
* Fix timerintr bss, add file to spec, some cleanup
* Remove externs
* Newline
* Readd enums
* Typo
* Colours
* Comments for hitmark enum values
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Improvements and suggestions
* Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Player C file
* Fix rodata issue in player and remove some actors that doesn't have rodata issues from the list
* Check every asm with rodata issues
* Add fishing relocs and change clang-format version to a generic one
* undo clang-format version
* Improve match in EnFirefly_Draw
* Vestigial fishing files, add enums
* Improve scripts, add ColChkInfo one
* Some minor actor cleanup (static etc)
* C file for Fishing, remove some local vars from variables.h
* Remove comma and format
* Newline
* Review suggestions
* Fix colchkinfoinit, add damage_table
* DMG macros, format existing DamageTables
* Convert preset damage tables to new format
* Minor tweak to colchkinfoinit output
* Manually add Fishing data and Syokudai struct vars
* Automatically import data
* Fix to use #if 0
* Format
* Name cylinders in obj_syokudai.h
* correct some ichains
* Fix top-of-file comments
* Redo files to include externs
* Fix Fishing
* #if(0) -> #if 0
* Fix mysteriously wiped actors (I blame VSCode)
* merge main
* Match Init
* Clear_Tag OK
* Full documentation
* More docs
* Fix function
* Fix MakeFile for assets and Fix texture swapped names
* Fix name
* Improve name and remove pad
* Can't stop the minor tweeks
* Adding potential Makefile fixes
* Minor name change
* Another name fix... and format
* PR Suggestion & Add Overlay File Description
* Re-documentation to match OoT WIP (more to come)
* Finish docs from OoT
* Fix merge and format
* Minor touch-ups
* Cleaner conditional
* Improve match in EnFirefly_Draw
* Vestigial fishing files, add enums
* Improve scripts, add ColChkInfo one
* Some minor actor cleanup (static etc)
* C file for Fishing, remove some local vars from variables.h
* Remove comma and format
* Newline
* Review suggestions
* Fix colchkinfoinit, add damage_table
* DMG macros, format existing DamageTables
* Convert preset damage tables to new format
* Applied changes to master on new branch
* some docs
* minor change
* Slight improvement to last draw func
* Got rid of all warnings
* Removed extra text file
* Readded warnings text file
* Fixed warnings text file
* Some cleanup, added engineer's new matched functions!
* Marked non-equivalent functions as such
* Improved last draw func (still non-equivalent)
* Made most of anghelo's suggested changes
* Slightly better code for func_80B4A350, though it's not matching still
* Engineer matched 2 funcs so I'm pushing those
* Added a function from engineer and one of my own
* Fixed warning
* Slightly better code for func_80B44C80
* Slightly better code for func_80B44C80
* Matched func_80B44C80
* Pushing engineer's matched draw func. All rodata funcs matched!
* Build NOT OK - rodata. Pushing anyway because I did a lot of work and it's close
* Build NOT OK (see previous commit) - func_80B440B8 matched
* Build NOT OK (see previous commit) - func_80B43BC8 matched
* All funcs matched! Build not OK still though
* almost ok
* OK now
* Fixed some warnings
* Fixed more warnings
* More warnings work
* Fixed all warnings (I think)
* Fixed all warnings (I think)
* Moderate amount of cleanup
* More cleanup
* More cleanup and some slight documentation
* Decent amount of documentation
* More documentation
* Fixed build (forgot to replace one struct member)
* More documentation and cleanup
* Fixed merge conflict, added binang_sub macro usages, and otherwise added most of the suggested changes f
git commit
* Organized things a bit, added a few more CLOCKTIME macros
* Added extra output to timeconvert.py
* Formatting
* Made all suggested changes
* 'Downgraded' timeconv script to version without seconds
* Added a macro for part of the params usages plus an enum
* Actually fixed header file (didn't save before)
* Renamed milk get item in enum
* Fixed GI enum update
Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
Co-authored-by: Zelllll <elilee968@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
* Improve match in EnFirefly_Draw
* Vestigial fishing files, add enums
* Improve scripts, add ColChkInfo one
* Some minor actor cleanup (static etc)
* C file for Fishing, remove some local vars from variables.h
* Remove comma and format
* Newline
* Review suggestions
* Added data_parser.py to assist in moving data over to c files more easily.
* Update data_parser.py
Added UNK_TYPE to extern
Added newline at end of file
* 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
* 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
* Small env fixes: for git submodules & python3
Using `/usr/bin/env python3` is preferred over `/usr/bin/python3`
because it is compatible with virtualenvs, etc. It picks the version of
`python3` currently on the `PATH`, rather than the system-wide default.
For the git submodules, I had two issues:
The ZAPD repo is currently pointing at a commit not on the master
branch, which has to be specifically fetched. Adding `--remote` to the
update command fixes this.
The decomp-permuter has primary branch `main` not `master` like this
repo, so this has to be specified in `.gitmodules` when using `--remote`.
* Rework `git submodule update...` part of Makefile
* 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
* 1 scene done, Z2_SOUGEN OK
* All scenes OK
* Makefile improvements
* Use WIP ZAPD branch as submodule
* Add spawn rotation flag macro
* Fix bad merge
* Move scenes to be in their own subfolders
* Rename and restructure extracted baserom files
* Progress tracking for assets
* Add asset progress to csv
* Use master ZAPD
* Use distclean like in OOT
* Fix up a few things with the makefile
* Fix scenes not being dumped from ELF
Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
* z_en_item00 WIP 17/21 match, rest close to matching
* Split .rodata for z_en_item00
* Item00 documentation, some misc cleanup
* Minor cleanup
* Fixup for z_collision_check
* Address feedback
* Delete old file
* Fix bad merge
* Progress on various files
* gfxprint stuff
* split some rodata, add iconv for rodata string parsing
* z_std_dma rodata
* 2 nonmatchings in gfxprint
* mtxuty-cvt ok
* more
* match a function in idle.c
* progress
* Cleanup
* Rename BgPolygon to CollisionPoly
* progress
* some effect stuff
* more effect progress
* updates
* made suggested changes
* z_effect_soft_sprite_old_init mostly ok
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
Tom Overton