mirror of
https://github.com/zeldaret/oot
synced 2026-05-23 06:54:24 -04:00
097db907cafe58b3b3b7a121de9d7eec85e003cd
557 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 Anghelo Carvajal
|
3d9db8d34d |
Setup rom decompression and compression (#1614)
* decompress baserom * cleanup * specific hash check * rename baserom * git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "5da313260" upstream: origin: "git@github.com:z64tools/z64compress.git" branch: "5da3132606e4fd427a8d72b8428e4f921cd6e56f" commit: "5da313260" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * setup compression * Add all compressed segments to the spec * Update md5 files * readme instructions * cleanup * Setup python dependencies on Jenkinsfile * Update Makefile Co-authored-by: cadmic <cadmic24@gmail.com> * review * . .venv/bin/activate * update readme * whoops * Yeet other versions from decompress_baserom.py * my bad * Move everything to baseroms/VERSION/ * Active venv on each command * jenkinsfile: use multiline syntax * Put the correct path on the jenkinsfile * Forgot to call per_version_fixes * CC0 * Update readme * Change where baserom segments are put into * Update Makefile Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update crunch64 * Label compressed instead of uncompressed * Update README.md Co-authored-by: fig02 <fig02srl@gmail.com> * Fix * `make rom` * baserom-uncompressed * Update README.md Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update README.md Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update README.md Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update README.md Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update README.md Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * review * baserom-decompressed.z64 * ignore baseroms * rm -rf tools/z64compress * wip crunch64-based compress.py * OK compress * use ipl3checksum sum directly for cic update on compressed rom * multithreading * "docs" * fix MT: move set_sigint_ignored to global level for pickling * license compress.py * rm junk * Fix (or at least sort out) compress_ranges.txt dependencies * Update tools/overlayhelpers/damage_table.py Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> --------- Co-authored-by: cadmic <cadmic24@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> |
||
|
Tharo
|
e77b83cf1b |
Import fault bss under NON_MATCHING (#1484)
* Import fault bss under NON_MATCHING * Fix comments in data files * Fix variable name |
||
|
Dragorn421
|
2f5eac6b76 | Move fault_drawer bss to data/ asm because -g3 bss is fun (#1335) | ||
|
Tharo
|
765cfd63e9 |
Name rsp ucodes and surrounding cleanup (#1166)
* Name rsp ucodes and surrounding cleanup * Fix comments alignment and remove unnecessary & in sys_ucode * Change capitalization of sys_ucode variables * Remove unnecessary externs for aspMain * Improvements to Jpeg_ScheduleDecoderTask * Split unknown rsp code into a separate file, spacing |
||
|
Tharo
|
362bc5e613 | Name fmodf (#1162) | ||
|
Tharo
|
c8f4d66b00 |
Documentation for fault.c and fault_drawer.c (#1106)
* Mostly document fault and fault_drawer * FaultDrawer printf functions return s32 * Review Suggestions for comments Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Some further review suggestions * Further changes from suggestions * Fix Fault_AddClient doc comment * Bug comment for memdump overrun, add more to Fault_PadCallback bug comment * mb -> MB, comment about bss above externs * Fix color codes Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> |
||
|
engineer124
|
d3a8ade6ba |
Migrate Remaining Audio Data & Cleanup some Audio Data externs (#1097)
* Import code_800F7260.bss.s * Import code_800F9280.data.s * format * cleanup externs * Move bss to next file * Move struct_8016E320 (BgmRequests) back to file * Move data to init_params, remove data pad (can't remove bss pad), ReverbSettings * remove extra spacing * Remove data/bss comments |
||
|
fig02
|
4390dd74b6 |
boss_ganon (Ganondorf) OK (#1037)
* data migrated and OK * some functions ported * everything ported and updated * merge message * plenty of functions matched * remove unwanted file * 5 more, progress on update * update matched * fix proto * fix * func_808E06FC * asm * 2 left * 1 more * last function inital decomp * Dbg MQ OK * docs progress * revert limb stuff * some more docs * docs progress * more docs * done with docs for now i think * revert unwanted change * some symbols * anime2 * format * small changes * some more changes * merge master and fix matrices * reviews 1 and 2 * remove continue * review 3 and 4 * un-name bodyPartsPos for now |
||
|
Tharo
|
f1d183d6fe |
libultra files and directories restructure (#1038)
* Restructure files, begin header restructure * Format * us2dex * Fix parallel spelling Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> * Use OS_K0_TO_PHYSICAL in place of VIRTUAL_TO_PHYSICAL in osAiSetNextBuffer * Uppercase hex, exception vector address defines * Interrupt flags 1 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Interrupt flags 2 Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: JoshDuMan <40190173+JoshDuMan@users.noreply.github.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> |
||
|
Roman971
|
0f58b15b27 |
Minor data/ cleanups (#1025)
* Moved code_800D2E30's data to C * Moved some audio data from asm to C * Made separate data files for unknown pointer arrays * Fixed a few missing balign directives |
||
|
Tharo
|
a497f33bda |
z_message_PAL, message_data_static and surrounding doc (#996)
* Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com> |
||
|
fig02
|
a3b4dcf388 |
File Select (z_file_choose) OK (#1012)
* matching split * migrate progress * split done and rodata migrated * all data migrated to c * start init * progress * progress * progress * progress * progress * progress * copy done * progress * erase and settings done * progress * progress * progress * start keyboard * progress * progress * progress * progress * Minor progress * fix z_magic_dark issue * func_80806F34 decomp'd * verified equivalence * one fix * format * merge petries work * reorganizing * lots of reorganizing and wraning fixing * rename file * remove language enum * unwanted changes * some symbol replacement, organization, and some names * all symbols replaced, some organization * some more cleanup * continue docs * Match the remaining functions in file_choose * merge master * select mode documented, all functions in file_choose.c named * nameset functions named, some other cleaning * some more general cleanup * stub comments for cm, name a few things * fix data and sizeof * copy/erase functions and modes named * rename assets, format * change some struct members * fixes * review1 * fix maching error * extract VTX data * re add werror to ZAPD * review 2 * fix * remove file boundary padding * remove zeroes * review3 * change skybox stuff * changes to vs etc Co-authored-by: KrimtonZ <krimtonz@gmail.com> Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com> Co-authored-by: Louis <louist103@gmail.com> |
||
|
engineer124
|
80edcc3801 |
Import Audio Synthesis Data (#1010)
* Import audio synth data, OK * Cleanup data * Merge data into 1 file * naming * format * Fix data * Separate audio_data into it's own file * CleanUp, more PR suggestions * Fix audio_effects.data.s * Format audio_data * rm asm, always gets me |
||
|
zelda2774
|
5ad7cf9dbb |
Document parts of audio (#1000)
* Minor labelling * progress * play percentage -> delay * duration -> gatetime * more * more * more * seqIdx -> playerIdx * more * more * more * more * format * fix comment * filters * more * media * confusion * Sync load is actually slow load * AudioHeap prefix * more * more * reformat * more * more * AudioLoad * more * more * seq banks * more consistent * more * name last function in audio_load * More audio_synthesis * clean up audio tables * minor * slow/fast load ramAddr * format * remove unused * Remove union * remove padding * audio bank -> sound font * seqLayer -> layer * stuff * seqChannel -> channel * ChannelLayer -> Layer * remove define, add bug comment * format * more * cache enum * more * AudioSeq function prefix * naming * bankIdx -> bankId * more * format * review * more * fixes * avoid hardcoded sfxid's * SE -> Sfx Co-authored-by: zelda2774 <zelda2774@invalid> |
||
|
EllipticEllipsis
|
823a3c0754 |
EnZf OK and partially documented (#988)
* Match Destroy * Matched Init * 3 more matched * 15 functions matched, data imported * 16 matched * 17 matched * 18 matched * formatting * 19 matched * Fix unk_404 * Draw matched, 20 in total * 21 matched * 22 matched * 23 matched * 24 matched * 25 matched * 26 matched * 27 matched * 28 matched * 29 matched * 30 matched * 31 matched * 33 matched * 34 matched * 35 matched * 36 matched * 17 left * 16 left * 15 left * 14 left * 13 left * 12 left * 11 left * 10 left * spec * bss * 9 left * 8 left * 7 left * 6 left * 5 left * 4 left * 1 up to regalloc, 3 left * 2 left (+ 1 regalloc) * More naming * 1 + regalloc left * Some naming * matches but for 2 words of stack in func_80B45748 * Delete some padding in header * Merge remote-tracking branch 'upstream/master' into Zf * func_8003426C rename * more failed matching attempts * Update to new function names * OK at last * Actually OK this time, removed pragmas, spec * Begin documentation * Few more names * Some more naming, added description to z_en_geldb.c * Confirm platform categories * (Badly) named floor check functions * Make fighter actors playSpeed animation frame checks consistent (up to names) * Action enum, lot of work on the skeleton stuff in the object * Lot of function and animation naming * More naming, last of the hardcoded symbols * Some name cleanup * Remove asm * Format * Bit more cleanup * Dragorn review I * undefined syms * Correct limb names * Non-control flow review suggestions * Easy review stuff * Some more review |
||
|
Dragorn421
|
fa7007d73b |
Document z_moji.c (#926)
* Document `z_moji.c` * Run formatter * Use `CHAR_HEIGHT` instead of `CHAR_WIDTH` for y pos * `> X - 1` -> `>= X` * `const char*` for string argument * Type palettes and textures with `u64` * Remove unused variable * Use `CHAR_WIDTH` and `CHAR_HEIGHT` more * Explicit documentation on `gMojiFontTex` |
||
|
Roman971
|
bf0f26db9b |
Match the remaining functions in Boss_Ganon2 (#1015)
* Match the remaining functions in Boss_Ganon2 * Add empty lines after declarations |
||
|
Roman971
|
ceb571423d |
Match BgMizuMovebg_Init (#1003)
* Match BgMizuMovebg_Init * Re-add missing break |
||
|
Synray
|
52f93d135f |
Decompile Object Kankyo (#960)
* Decompile Object Kankyo * Remove asm, format * Start documenting object kankyo * Document object kankyo * Remove reloc * Review changes and formatted again :( * WIP * Review changes |
||
|
EllipticEllipsis
|
16471bb68d |
EnWf OK and documented (#967)
* a ton of progress, 14 functions remain * cleanup * a few more functions done, 11 remain * finally all updated * another function matched * another action finished * damage table * death action done * started very large action func * more progress on long action funcs * large action func matched * 5 functions remain * another large action finished * start another action, doesn't match yet * a few new functions, neither match * done working on this for now * Correct one nonmatching, fix compiler warnings * Two functions left * one left * remove remaining gotos * OK * Delete outdated comment * namefixer * Flag macros * audio, dmgeff, some colour * Import symbols from object, reloc, name a few things * Rest of object done * Named a few more things, add action enum * Name body parts and another couple of actions * Last few names * Delete asm * Format * undefined_syms, mods where possible * Correct parent to EnEncount1 * Review * Last newline * louis and Dragorn's reviews * Format * More review * Put back to isInvisible and or, as in EnGeldB * Remove if (0)s in func_8009728C and change pointer arithmetic cast * More review * Unname headRot, make "fallthrough" case clearer, other review * Format * Even more review * Rephrase Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> |
||
|
petrie911
|
8e318d257e |
Decomp BgHidanSekizou (#970)
* mostly matching * OK! * relocs * I fix * fix some floats * fixes * array counts Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> |
||
|
Synray
|
3b7ed8d943 |
Match Environment_Update and EnMThunder_Draw (#982)
* Match Environment_Update * Match EnMThunder_Draw * Format * Capitalize hex |
||
|
petrie911
|
b18227e6ad |
Decomp the remaining functions in vr_box and import its data (#917)
* stuff * not quite there * data imported * fixed some things and adjusted sSetupDLs * remove setup dls * remove alloc casts * format * palette swap * Update src/code/z_vr_box_draw.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * improved loop matches * fixed some comments * format and adjustments * palettes Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> |
||
|
Synray
|
1c0503cd3b | Match func_80B42F74 in Yabusame Mark (#976) | ||
|
engineer124
|
bf53f2c95e |
Match EnTorch2_Update (#975)
* score = 965 * score = 305 * Clean-Up * More clean-up * Down to `sp30` <--> `sp34` swap, and extra `.data + 0x18` at the top? * clean-up * EnTorch2 OK, but does not reloc properly * final cleanup * Remove comments about non-matching * Fix reloc non-matching * Delete reloc * Better solution * PR Suggestions |
||
|
Synray
|
ac8dd91626 |
Match remaining function in Bg_Jya_Cobra (#969)
* Match remaining function in Bg_Jya_Cobra * Format |
||
|
Synray
|
4ecd175bd1 |
Match KaleidoScope_DrawQuestStatus (#974)
* Match KaleidoScope_DrawQuestStatus * Add back the parens |
||
|
petrie911
|
e51f50f0ff |
Decompile z_kankyo (#956)
* working * start color switch * progress * progress * progress on bgm func * progress * game over matched (except the rodata meme) * start update * progress * lightning docs done * progress * progress * progress * progress * progress * can compile at least * suns state, progress on kankyo_update * some new names * progress * progress * progress * new functions * cleanup * more matches * another match * now functional * format * better match * hugely improved update * cleanup/review * remove old changes * review2 * review3 * missed one * review4 * change asm filenames * update doorwarp1 * review5 * Kankyo_ -> Environment_ * format * merge master and format functions.h Co-authored-by: Jacob Young <jacobly0@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> |
||
|
louist103
|
b3814ddc1b |
Fix ganon organ reloc data and extract its assets (#965)
* fix ganon organ reloc data and extract its assets * Named all textures * RangeEnd * static * Remove D_ comments from XML * Rename pad to sForceAlignment Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> |
||
|
EllipticEllipsis
|
fbc4071cc8 |
Match last function in EnTp (#968)
* Data imported, 8 easy functions matched * Init only remaining nonmatching, data in * some renaming & fiddling with Init, still nonmatching * fix colours * Init still not matching * Decompile object_tp * renames * Rename func_80B20DE0 * Horrible new idea * Known equivalent, docs next * Another attempt * Finished naming in object_tp * Named functions, more enums * DrawBridge -> Drawbridge * skulltulla -> Skulltula * Name almost all struct variables * Named most of the temps * delete asm * spec * Missed data file, whoops * Review * More review changes * Match EnTp_Init * spec * Delete asm |
||
|
Tharo
|
eccfd2efbf |
Decompile ovl_Door_Warp1 (#949)
* Initial progress on Door_Warp1 * Fix merge * More work on Door_Warp1 * Decompile most of Door_Warp1 * 2 more functions OK * All decompiled, 3 nonmatching * Tiny improvements, fix several warnings * Remove commented GLOBAL_ASM lines * Fix * Fix merge * Two more matches * Some docs * More docs * Use generated reloc under NON_MATCHING * Fix accesses in ru1 * Add break and add limbs and dlists for the skeleton to the object xml * Comment values for enums Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * boolean returns for flag checking functions Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> * Named more loop variables i and named DoorWarp1_FloatPlayer * Last function matched thanks to Roman * Some further suggestions * Fix Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com> |
||
|
zelda2774
|
9b840ad842 |
code_800EC960 OK + data migrated (#937)
* Match AudioDebug_ProcessInput_SEFlagSwap * Data migration * Migrate in-function statics for func_800EE824 * More data migration * Migrate in-function static for func_800F510C * Last bit of migration * formatting * naming fix * Prune variables.h Co-authored-by: zelda2774 <zelda2774@invalid> |
||
|
Roman971
|
ead672acc8 | Match the remaining function in Boss_Tw (#930) | ||
|
Tharo
|
3c2b198130 |
Decompile ovl_En_Ganon_Mant (#912)
* Initial progress * Improve the last NON_EQUIVALENT to NON_MATCHING * 2 functions down to stack, migrate data * 2 more matches, some other improvements * Use Vtx over Vtx_tn * Begin documenting * Some names * More docs * Finish docs * Remove VTX_TN * Review suggestions * Single line comments Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> * en_ganon_mant fully matched thanks to Roman Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com> |
||
|
zelda2774
|
a75c70358c |
Match func_800EEA50 + some surrounding doc (#916)
* Match func_800EEA50 * Document some audio debug stuff * more doc * more doc * formatting * Fix enums, and some more bits of doc * review * LIM -> MAX * missed review suggestion... * more review * ganon comments * more review * 🐍☠️ * more review * Update functions.h * quotes * review Co-authored-by: zelda2774 <zelda2774@invalid> |
||
|
zelda2774
|
a0d2cceeca |
Match some audio functions (#896)
* cleanups * Improve Audio_SequencePlayerProcessSequence * cleanup * labeling * progress on func_800E5000 * func_800F6268 * func_800ECDF8 * Improve func_800F2464 * reorder variables * labelling * non-equivalent func_800EEA50 * minor doc * func_800E6590 * minor doc * Reformat abi.h * Very slight improvements * func_800DC384 * func_800E1618 * formatting Co-authored-by: zelda2774 <zelda2774@invalid> |
||
|
Stardust Sauce
|
70ec8c42fc |
ObJ_Lift OK (#883)
* ObJ_Lift decompiled and matching. * Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Implemented suggestions * Decorrected mask in z_obj_lift per suggestion * Update src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c * review * unused asm * review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> |
||
|
Roman971
|
d17f9f14c5 | Match the remaining function in En_Holl (#895) | ||
|
petrie911
|
6ce382bc8d |
Morpha (ovl_Boss_Mo) (#438)
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* give this a shot
* fix conflict
* one more try
* it begins
* more functions
* another match
* starting documentation
* the big function works. also two more matches
* small fix
* data cleanup
* removed .s
* match with player
* inching closer to matching
* two more matches. almost there
* OH MY GOD IT MATCHES
* cleanup: part 1 of infinity
* named a bunch of stuff
* Naming particle fields
* terminal commas
* terminal commas
* small enum fix
* added description of droplet widths
* merge
* updating
* Gfx
* vt
* xml
* bgcheck
* more on objects
* unused stuff
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "44f5d7cb9"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "44f5d7cb9"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* object names
* fixes
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* ZAPD works
* .s
* merge
* starting work
* more stuff
* builds OK
* first pass
* PR fixes (Louis)
* Bg_toki_hikari all functions matching (#781)
* starting toki_hikari
* func_808BA018 matched and some work on other func
* init and draw matched, one to go
* matched final function, removed ASM, updated spec
* adding suggested changes
* Volvagia (ovl_Boss_Fd) and related actors (#352)
* Darkmeiro decompilation
Bg_Gnd_Darkmeiro decompiled, matched, and documented.
* Lots of functions matched. Some big ones are close.
* Five left unmatched, one close.
* Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched.
* Three unmatched, one essentially matched, the rest matched.
* More fixes.
* Documented more of the structure and cleaned up a bit.
* BossFd2, BgVbSima, and EnVbBall matched and documented
* Also removed unneeded .s files
* And need to name EnVbBall's functions
* give this a shot
* fix conflict
* one more try
* removing darkmeiro changes
* and again
* now OK from make clean
* minor cleanup
* One more matching function for BossFd
* which means it doesn't need its .s
* splitting
* splitting
* splitting
* forgot some .s
* fancy new names
* fancy new names
* trying again
* sneaky .s files
* sound effects and some hex to decimal conversions
* Sound effects and static variable cleanup
* format.sh and clean up static variables
* sfx and formatting
* ZAP and cleanup
* small cleanup
* cleanup and ZAP
* ZAP
* looking at the giant function again
* looking at the giant function again
* Only the big function left.
* Those .s files aren't mine, officer
* float literals might be fixed. regalloc still a nightmare
* almost done with the big function
* should make now
* not much of a change
* all functions match. rodata somehow doesn't.
* forgot some things
* lots of cleanup
* and a little more
* small error
* large cleanup. Also BossFd has function names and inlined variable declarations
* still more cleanup
* the quest for 0.1f continues
* forgot to put NON_MATCHING back in
* Data structures fully documented. Still more cleanup.
* DECR now works with BossFd2
* should match now
* cleanup
* small cleanup
* cleanup and names
* tiny thing
* particles and headers and stuff
* now with more enums
* merge
* test
* end test
* update
* cleanup
* object 2
* object 1
* doc object_fd2
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "6f874af4a"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "6f874af4a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* formatting
* .s
* merge actor
* vertex arrays
* a little more
* formatting
* merge opd
* fixed damage check
* cleanup
* fixes
* effect struct
* review
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
* fix mistake in z_bg_hidan_hamstep (#771)
if you're just going to close this pr just wait a week and review it then.
* ovl_En_River_Sound 1 non-matching (#786)
* ovl_En_River_Sound
* Implement review suggestions, run through clang-format
* Responding to PR comments
* Use CHECK_QUEST_ITEM, run through clang-tidy.
* EnTp, 1 nonmatching, and object_tp (#782)
* Data imported, 8 easy functions matched
* Init only remaining nonmatching, data in
* some renaming & fiddling with Init, still nonmatching
* fix colours
* Init still not matching
* Decompile object_tp
* renames
* Rename func_80B20DE0
* Horrible new idea
* Known equivalent, docs next
* Another attempt
* Finished naming in object_tp
* Named functions, more enums
* DrawBridge -> Drawbridge
* skulltulla -> Skulltula
* Name almost all struct variables
* Named most of the temps
* delete asm
* spec
* Missed data file, whoops
* Review
* More review changes
* cleanup en_dha (#787)
* Set __FILE__ in asm_processor (#793)
* Set __FILE__ in asm_processor
* bss fix
* Update to upstream version
Co-authored-by: zelda2774 <zelda2774@invalid>
* ovl_Efc_Erupc OK (#773)
* a few good dead Gfx_TwoTexScrolls
* EfcErupc OK, mostly documented
* review
* remove fake match
Co-authored-by: Fig02 <fig02srl@gmail.com>
* z_bg_mizu_movebg and object_mizu_objects (#747)
* OK a few functions
* BgMizuMovebg_Draw OK, make tweaks to bg_mizu_bwall
* migrate data
* create mizu_objects, defines for water temple water level
* clean up some code
* implement most suggestions
* review
* review2
* formatting
Co-authored-by: Fig02 <fig02srl@gmail.com>
* Document BodyBreak (en_part, body part spawner) (#797)
* done
* status defines
* whoops
* comment wording
* size calc change
* elseif
* Improve the format in z_map_mark_data.c and cleanup mapmark.py (#798)
* Cleanup mapmark.py script
* Rename map mark defines
* Remove unused entries from map_mark_data
* `assert` macro OK (#755)
* create assert macro and replace a bunch of __assert
Signed-off-by: angie <angheloalf95@gmail.com>
* Another bunch of assert
Signed-off-by: angie <angheloalf95@gmail.com>
* more assert
Signed-off-by: angie <angheloalf95@gmail.com>
* assert(false)
Signed-off-by: angie <angheloalf95@gmail.com>
* last assert used in matching code
Signed-off-by: angie <angheloalf95@gmail.com>
* the non-matchings
Signed-off-by: angie <angheloalf95@gmail.com>
* typo
Signed-off-by: angie <angheloalf95@gmail.com>
* format
Signed-off-by: angie <angheloalf95@gmail.com>
* change macro to uppercase
Signed-off-by: angie <angheloalf95@gmail.com>
* Apply suggestions from code review
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* Change ASSERT(false) to ASSERT(0)
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
* General object cleanup (#799)
* Object cleanup
* Fix running man
* fix mm symbols
* Updated to use latest version of ZAPD (#777)
* Updated config file
* Added missing files
* Temporarily removed asm_processor changes.
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "96ffc1e62"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "96ffc1e62"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "179af7d11"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "179af7d11"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Cleanup and fixes.
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "50ad2fe78"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "50ad2fe78"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
* Makefile fix
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b9120803e"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "b9120803e"
git-subrepo:
version: "0.4.3"
origin: "???"
commit: "???"
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
* Decompile `object_zo` 🐬 (#794)
* Initial xml
* most of in-code references
* Add limbs and evrything else
* Functions used by EnRiverSound
* Fix forearm and use void* for textures
* Run formatter
* Change Hints in scene's XMLs (#800)
* Remove blobhint
* Add segments and offsets, and remove most hints
* Change PathHint to Path
* Add missing final new lines in scenes xmls
* finished object_skb (#790)
* finished object_skb
* neglected the limbs and dlists, so I added them
* adding the textures
* fixing some names
* ....forgot to change the c file....
* hopefully fixed formatting issue
* EnFish, OK and documented (#795)
* Matching
* Some naming
* spec
* Name another function
* Name animations, clarify use of GI_MAX and GI_NONE
* Documented bottle range functions
* Simplify squared distance function in EnIceHono, actor descriptions
* Functions for dropped fish
* More naming
* Change 65535.5f to (0xFFFF + 0.5f)
* Change 65535.5f to (0xFFFF + 0.5f)
* name phases
* Named other types, Docile functions
* Naming complete
* delete asm
* format, remove outdated comment
* Fix a few DrawFlexOpa arguments
* Review changes
* Change back to original playSound
* Function comments per review
* Update asm-processor and add make dependencies for global asm and early includes (#801)
* Update asm-processor to latest master
* Add make dependencies for global asm and early includes
* Update asm-processor to latest master
* Decompile the pause menu aka. ovl_kaleido_scope (+ minor changes) (#803)
* Decompile ovl_kaleido_scope + minor cleanups
* Add a common header for ovl_kaleido_scope
* Start cleaning up and documenting kaleido_scope (+ some interface docs)
* Improve and fix some kaleido_scope non matchings
* Match KaleidoSetup_Init
* Extract icon_item_fra/ger_static files
* Add more documentation and matches to kaleido_scope
* Improve the z_kaleido_collect.c non matching
* Rename z_kaleido_8081EFF0.c to z_kaleido_prompt.c
* Update most kaleido variables to be static
* Improve GS flag macros
* Improve z_lmap_mark.c and extract z_lmap_mark_data.c with a script
* Various minor fixes and improvements
* Minor fixes and review changes
* Review changes part 2
* Rename gSetTileCustom to gDPSetTileCustom
* Review changes part 3
* Delete `-j` from `make setup` and document use of `-jN` and `-j` in readme (#804)
* Add nproc to make setup
* Add cross-platform nproc equivalents
* Scrap that, just ditch -j in makefile altogether
* Clarified thread advice
* ViMode progress (#802)
* ViMode OK
* Fix variable name in regconvert tool
* ViMode: fix formatting
* Add nonmatching impl for ViMode_Configure, respond to PR
- Fixed struct field naming (unkXX -> unk_XX)
- ViMode_Configure args are not flags for top/left etc; seem to be for
video mode
- Used @Random06457's implementation of `ViMode_LogPrint`
* Use plain LOG_ADDRESS in ViMode_LogPrint
* Incorporate PR feedback from Roman971
* Add scene macros (#792)
* add scene macros
* SCENECMD -> SCENE_CMD
* light renaming
* SCENE_CMD_ROOM_BEHAVIOR
* update params names
* Remove extra spaces
* More review changes by fig
* remove MM cmd ids
* more review changes
* last minute edit
* I keep confusing both lights commands
* Review changes
* Yet another cutscene change
* Unused02 is unused
* Add UNK_09 macro and other minor fixes (#813)
(cherry picked from commit
|
||
|
petrie911
|
65f65870a1 |
Barinade (Boss_Va) (#529)
* Darkmeiro decompilation Bg_Gnd_Darkmeiro decompiled, matched, and documented. * give this a shot * fix conflict * one more try * could be useful * whoops * ZAP2 stuff * ZAP why * ZAP again * When life gives you Bari, make Barinade * Now with more names * merge * enums everywhere * just one left * OK * more docs * a little more * I don't even remember what I changed * small cleanup * maybe it's time * weird * not sure what's up with sys_matrix * camera functions * it's no object * unused * back to being unused * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * hope this works * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "6f874af4a" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "6f874af4a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * object fix * stuff * test merge * merge colchk * merge colchk * one more thing * naming things * naming things * implement most suggestions, and format * fixes * format * more fixes * more fixes and format * body -> get_body Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com> |
||
|
Sirius902
|
bc9ca97086 |
ovl_Boss_Ganon2 (2 nonmatching) (#874)
* Match a few * Remove cast * BossGanon2_Destroy * Some struct layout * Missed one * Work on BossGanon2_Update * Oops missed another * Work on update more * Get it to compile * Work a bit on update * func_808FD27C * Cleanup a bit * Fix incompatible pointer type * Work more on update * Multiply * Fix janky cast regalloc * Remove some casts * Move switch case to right spot * Tiny regalloc * Fix stack * Try to fix jump table * Migrate bss * Make data match * Fix minor formatting * Another minor formatting * Replace hex with symbols * Do display lists * Vertices * jnt items init * Split gfx into separate file * func_808FCF40 * func_808FCF5C * func_808FD080 * func_808FD4D4 * func_808FF898 * func_808FFA24 * func_808FFAC8 * func_808FFBBC * func_808FFC84 * use unk_313 as a bool * func_808FFCFC * func_808FFDB0 * Add commented static * func_808FFEBC * func_808FFFE0 * func_809000A0 * Remove useless cast in func_809000A0 * Remove useless temp * Fix wrong branch * BossGanon2_Update * Fix implicit function declarations * Type D_8090EB2C to zelda pointer * Reorder include because why not * Deduplicate undefined syms * Add more to struct * Work on func_808FD5F4 * Major work on func_808FD5F4 * Get func_808FD5F4 to compile * Make unk_398 unsigned * Work on func_808FD5F4 * Progress * func_808FD210 * BossGanon2_Draw * Make it compile * Fix compiler warnings * Fix branches func_808FD5F4 * re-nonmatching func_808FD5F4 * stuff * fix math functions * clang format * more progress * Replace bit stuff with type * Merge master * Add possibly janky things and fix while loop * Why does this help * Chained assignment * Remove dubious thing * Reorder thing * Add possibly fake notices * Use true and false * Make func_808FD5F4 equivalent * Massage stack a little * func_80906AB0 * Correct texture params * Whitespace is good * Use decimal line numbers * func_809069F8 * Work on func_809060E8 * Make funny loop less funny * Float stuff * Remove useless cast * Merge upstream * Fix compiler error in nonmatchings * func_809060E8 * Change tex alloc to be full integer * Add unk_234 * Correct size of unk_2F4 * Make textures u64[] * Type textures to u64[] * func_80905DA8 * func_80905674 * Replace some pi * BossGanon2_PostLimbDraw2 * func_8090523C * func_80904FC8 * func_80904D88 * BossGanon2_PostLimbDraw * BossGanon2_OverrideLimbDraw * func_8090464C * func_80903F38 * Match func_80900890 * Move func_80906538 prototype * Work on func_80902348 * Match func_80902348 * Add fake warning to array thing * Work on func_8090120C * Remove useless var from func_8090120C * Work more on func_8090120C * Move case probably into place func_8090120C * Work on func_8090120C until 4914 * Add break to switch * Pass player to startPlayerCutscene * Work more on func_8090120C * Work on func_80902524 * Move function prototype * Match func_80902524 * Clean up sfx ids in func_808FD5F4 * Correct SFX_FLAG in func_8090120C * Match func_8090120C * Match func_80904340 * Change tex to u8[] * Cleanup func_808FD5F4 a bit * Clean up another inequality func_808FD5F4 * Match func_80904108 * Cleanup for PR * Cleanup for PR part 2 * Cleanup data a bit and start on func_80906538 * Basically match func_80906538 * Match func_80906538 * Rename tex to shadowTexture * Work on func_809034E4 a bit * replace 255 with 0xFF for texture * Correct NON_MATCHING guard * Make func_809034E4 equivalent and not ugly! * Reuse i in func_809034E4 * Minor cleanup in func_809034E4 * Remove unused asm * Static all the data * Switch to using assets xml for overlay graphics :) * Remove now unused undefined syms * Rename pad to D_809071FC * Some cleanup * Cleanup and name more stuff * Name BossGanon2_DrawShadowTexture * Rename to sZelda * Correct array in func_809034E4.s * Start using proper symbols for assets * Add morre undefined syms comments * Cleanup a bit * Cleanup a bit more * Use THIS in limb functions * Update comments * Use define for actor id * Remove unnecessary padding in struct * Rename rand_float to randFloat * Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Various minor suggestions * Replace shadowTexture with void* wherever possible * Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Do multiply * Name some variables from debug prints * Update src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Use ARRAY_COUNT(sParticles) everywhere * Put data and bss in _data.c * Remove unecessary @bug s * Minor suggestions * Why are there so many timers Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> |
||
|
Lucas Shaw
|
0f644b7545 |
Decompiled A LOT of objects (#815)
* . * remove tools/ZAP2 from origin master * object_spot04_objects * remove accidentally added xml * object_spot00_objects * object_bombf ok * object_dy_obj * object_masterzoora * object_mastergolon and object_masterkokirihead * object_aob * object_gt * object_gt * object_geff * object_mag kinda * object_gjyo_objects OK * object_ani OK * object_door_gerudo * object_md and object_trap * object_js OK * object_goroiwa * object_gs * object_nwc * object_niw * object_ane * object_os_anime OK * object_d_hsblock OK * object_fz OK * object_ru2 OK * fixed object_mag * object_cow OK * object_spot01_objects OK * object_spot15_obj * object_umajump OK * object_spot18_obj * object_spot12_obj * fix symbols in z_item_b_heart * object_bdan_objects & object_bowl * object_ddan_objects * object_owl OK * object_spot01_matoyab.xml OK * object_haka OK * object_heavy_object * object_ingate and objet_menkuri_objects * objet_spot00_break & object_relay_objects OK * object_spot01_matoya OK * object_spot06_objects OK * undefined_syms * object_spot08_obj OK * object_efc_doughnut & object_zg * object_ik OK * object_vm * object_ei OK * object_ds OK * updated spec * map_48x85_static OK * object_zl1 & object_peehat ok * some z_parameter naming and other undefined symbol stuff, object_yukabyun OK * object_bubble & object_fw ok * object_shopnuts * restore delete file * object_timeblock OK * object_d_lift OK * object_kibako2 OK * object_mamenoki OK * matches * remove unused asm * object_mag ok now * fixed object_ani * done for now, im tired * object_bdan_objects fixed up * fix bdan * object_bombf fixed * object_bowl fixed up * object_cow fixed * did more, im tired * fixed some stuff in object_ddan_objects * fix object_ddan_object * object_door_gerudo fixed * object_ds fix * object_dy progress * fixed great fairy * some more * more * object_haka fix * progress * ingo_gate fixed * object_js * forgot collision * object_relay_objects fixed * object_kibako2 * object_mag fixed * u64* to void* * more u64* to void* * object_mamenoki fix * object_mastergolon & object_masterkokirihead fix * mido is weird * fixed build * fix object_menkuri_objects * add missing textures in object_menkuri_objects * object_ms * fixed object_peehat * some cleanup stuff * object_zg fix * object_spot00_break fix * object_niw fix * object_nwc fixed * object_ru2 object_rr and some of object_owl fix * object_spot15_obj fix * business scrub * object_spot01_matoya fixed * object_spot18_obj fix * object_spot01_objects fix * object_spot04_objects fix * object_spot04_objects actually fixed * object_spot12_obj fix * object_timeblock fix * object_spot06_objects fixed * object_spot08_obj fix * spot01_matoyab fix * object_trap fix * object_umajump fix * object_vm fix * z_en_niw_lady fix * object_yukabyun fix * object_zl1 fixed * added offsets to object_os_anime * object_md fix * object_ane fix * object_aob fix * add palette comment * object_spot00_objects fix * spot00 fix * remove unused asm * updates * Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815 * Updated object_bdan_objects, ran format.sh * Change rgb5a1 to rgba16 in my object xmls * Addressed Anghelo's comments * review Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> Co-authored-by: Fig02 <fig02srl@gmail.com> |
||
|
krimtonz
|
ee44798310 |
Decompile Twinrova (#837)
* start bosstw * wip * wip * wip * wip * wip * wip * wip * wip * wip * some wip * wip * wip * match some functions * match func_80948668 * match func_809477e0 * wip * format * migrate bss * reorganizing, fix warnings * BossTw_Init OK * match BossTw_ShootBeam * and then there were 2 * wip, start docs * more docs * wip * wip * format * PLEASE WORK GIT * spaces * review done * add dragorns matching suggestion * reloc * roman review * petrie review * dragorn review * dargorn2 Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> |
||
|
Roman971
|
ba4d5013a6 | Match the 2 remaining functions in Obj_Bean (#886) | ||
|
louist103
|
75b72af8de |
Item00 BSS OK (#881)
* bss OK * Small fix * Pr fixes (Dragorn) and some named symbols * added the comment Fig requested * rip jenkins box * Update src/code/z_en_item00.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Change combined if to 2 ifs * GI enum Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> |
||
|
fig02
|
d816ac6122 |
Stalfos (en_test) OK and object_sk2 documented (#868)
* fix colliderinit typo * migrate data * init has 1 problem * progress * progress * builds now * progress * progress * lots of funcs matched * many functions, fix warnings * 1 left * done * docs progress * remove graphovl * missed some * change some funcs * some more * another * format * more docs * cleanups1 * limbs, DLs, textures * limbs named (thanks elliptic) * more docs * Name animations, import symbols * Named sections of xml * more docs * rename limbs and use flag macros * name * review1 and use limb enum * review2 * agro -> aggro * review3 * review4 * review5 Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> |
||
|
mzxrules
|
a209195183 |
z_obj_mure OK (#875)
* almost matching init, matching data * more matchings, some non-matching progress * finishing up SpawnActor, fixing .data types * first decompile pass done, few non matchings * cleanup/update matchings and remove asm * format code * pick up some OKs * 1 non_matching left, some documentation * z_obj_mure OK... but at what cost? * implement suggested changes, some more documentation * Implement Fig's suggestions * review Co-authored-by: Sam Lyon <sam.c.lyon@gmail.com> Co-authored-by: fig02 <fig02srl@gmail.com> |
||
|
mzxrules
|
e8f93099d1 |
z_en_bigokuta OK (#878)
* start * Did some more * Progress * More * IDK * Chip away a little * im done * func_809BEBBC OK! * get rid of graphovl * revert random changes * Big Okuta OK! * more clean-ups * implement dragorn's suggestions * implement fig and louist's suggestions Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> |
||
|
mzxrules
|
df5e1c63c0 |
z_en_ko OK (#869)
* .data OK * Progress * push some old stuff * Finish a chain * Progress * Progress * Run mathfixer.py * Progress * match one more * Up to date * Match func_80A97610 * func_80A96FD0 * most of the way through the mega switch * small formatting thing. still stuck on the switch * start a big switch function * a little closer * done with matching for now starting objects * func_80A97738 OK! * func_80A995CC OK! * func_80A99864 OK! * en_ko OK! * Code clean-up pass * more EnKo cleanups, object_fa and object_kw1 textures documented * complete object_km1, more EnKo documentation * More documentation * delete asm * Clean-up rebase issues * bleh * Implement Dragorn's suggestions * fix spec, implement fig's suggestions * whoops (ill leave it for the docs tho lol) * whoops again * i made an ouchie * smile * last one for real Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: fig02 <fig02srl@gmail.com> |
||
|
Aly Cerruti
|
6f7312a348 |
Dancing Couple (ovl_En_Tg) (#866)
* Match EnTg_Destroy * Match EnTg_Init * Matching EnTg_Update * Match func_80B18360 Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match. * Probably equivalent, non-matching func_80B183F8 * Matching EnTg_Draw * Matching update function * Matching func_80B18778 * All functions decompiled * Move data to C code * All functions matched excepted weird switch/case * Last matching function * Remove unused ASM * Name obvious symbols * Clang format * Name text-related functions and variables * Describe actor as Dancing Couple See https://github.com/zeldaret/oot/pull/866#discussion_r664726581 * Use named constants * Name drawing constants * Use THIS macro for void* * Name the function that sets environment color * Add comments to parts of code that aren't clear * Rename timesSpokenTo to nextDialogue, treat isTalking as boolean |