From fa240048cfe2ccf5e1de51cbec9b2e3771f1f795 Mon Sep 17 00:00:00 2001 From: Tom Overton Date: Tue, 10 Dec 2024 18:06:55 -0800 Subject: Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753) * more matches * more functions * merge, I hope * wrath done-ish * 5 nonmatchings * more matchings * more improvements * more stuff * stuff * docs part 1 / infinity * more docs * . * more adjustments * linked assets * Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!) * more stuff * play part 2 * lol merge * update * unk types * SWEET GOOGLY MOOGLY IT MATCHES * cam fixes * adjust damage stuff * if? * stuff * signs * macro stuff. clean up later * names * Some small cleanup * cleanup and docs * more cleanup * Wrath shadow docs * Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging * Update functions.txt * Types cleanup * Some low hanging fruit * Undefined_syms.txt * More static -> battle handler * Lots of naming cleanup * Remove z_boss_07_dmgtbl.inc The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things. * Get most of the limb stuff named (and actually update the spec) * Some minor cleanup * Updating the repo with what we talked about in discord * Some syncing with Odolwa and other misc name stuff * Some Odolwa/Bio Baba sync * Another bit of Odolwa/Bio Baba sync * Name a lot of incarnation limb variables * Finalize the incarnation intro variable stuff * Fix a goof * `incarnationWrathTransition` variables * `generalCollider` and always use "tentacle" * Completely remove "shot," always use "projectile" * Clean up `Boss07_Mask_Draw` * Name `maskShakeTimer` * Give better names to a few more things * Some beam-related struct vars * undefined_syms * More beam names * More beam stuff * Beam, pt 100000 * Some intro struct members * Some timers * More non-beam stuff, back to beam * Done with beam finally * All but one of the subcam variables, some other stuff * Some variable names and cleanup * More cleanup * jumpSfxTimer -> landSfxTimer * actionState -> subAction and a little bit of syncing with Odolwa * A couple more variables sync * Buncha variables * Lots of non-whip variables * Commit what I have before starting on some of the grab stuff * All but one struct var done * Lots of header cleanup * Finish the header file * Fix build after merging main * Damage effect enums * Update damage effect enums for Incarnation and Wrath * Update damage effect enums for Mask and Remains * First pass at top damage effects * Do a few sub action enums so I have something to show * Fix the damage effect enums, clean up a lot of subaction enums * All remaining sub action enums, cleanup damage effect enums, other misc cleanup * Finish enums * Finish data * Push up what I have * Consistency * scroll -> texScroll * low hanging fruit * PR + small fix * Happy with >20% of functions * Happy with >40% of functions * Happy with >60% of functions * Happy with >75% of functions * Happy with >90% of functions * Happy with >95% of functions * Happy with `Boss07_Wrath_DeathCutscene` * Happy with `Boss07_Mask_FireBeam` * Happy with `Boss07_Wrath_CheckWhipCollisions` * Happy with everything but `Boss07_Mask_Draw` * Happy with all functions I think? * Clean up forward declarations * Write a half-decent file header * Fix after merging * Fix some minor stuff here and there * Minor fix in the file header because I forgot I renamed this * Respond to engineer's review * Respond to Anghelo's review * Replace as many actor lookups with for-loops as I can in Odolwa/Majora * Change the comment about the hookshot from a `@note` to a `@bug` * `drag` -> `deceleration` * Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam` * Use decimal numbers in the various `FillShadowTex` functions --------- Co-authored-by: petrie911 Co-authored-by: petrie911 Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: petrie911 Co-authored-by: petrie911 Co-authored-by: Derek Hensley Co-authored-by: engineer124 --- linker_scripts/final/undefined_syms.ld | 74 ---------------------------------- 1 file changed, 74 deletions(-) (limited to 'linker_scripts') diff --git a/linker_scripts/final/undefined_syms.ld b/linker_scripts/final/undefined_syms.ld index 80e2ce2d0..de8f5fe59 100644 --- a/linker_scripts/final/undefined_syms.ld +++ b/linker_scripts/final/undefined_syms.ld @@ -21,84 +21,10 @@ D_01000000 = 0x01000000; // segment 0x04 -D_04023348 = 0x04023348; -D_040233B8 = 0x040233B8; -D_04023428 = 0x04023428; -D_0406AB30 = 0x0406AB30; - // segment 0x05 // segment 0x06 -// ovl_Boss_07 - -D_06000194 = 0x06000194; -D_06000428 = 0x06000428; -D_06000D0C = 0x06000D0C; -D_06002C40 = 0x06002C40; -D_06002D84 = 0x06002D84; -D_060031E4 = 0x060031E4; -D_06003854 = 0x06003854; -D_06003A64 = 0x06003A64; -D_060099A0 = 0x060099A0; -D_06009C7C = 0x06009C7C; -D_06009EA8 = 0x06009EA8; -D_0600A194 = 0x0600A194; -D_0600A400 = 0x0600A400; -D_0600A6AC = 0x0600A6AC; -D_0600AE40 = 0x0600AE40; -D_0600AFB0 = 0x0600AFB0; -D_0600B020 = 0x0600B020; -D_0600C7D8 = 0x0600C7D8; -D_0600CEE8 = 0x0600CEE8; -D_060149A0 = 0x060149A0; -D_06016090 = 0x06016090; -D_06017DE0 = 0x06017DE0; -D_06019328 = 0x06019328; -D_06019C58 = 0x06019C58; -D_06019E48 = 0x06019E48; -D_0601DEB4 = 0x0601DEB4; -D_06022BB4 = 0x06022BB4; -D_06023DAC = 0x06023DAC; -D_06025018 = 0x06025018; -D_06025878 = 0x06025878; -D_06026204 = 0x06026204; -D_060269EC = 0x060269EC; -D_06026EA0 = 0x06026EA0; -D_06027270 = 0x06027270; -D_0602EE50 = 0x0602EE50; -D_0602EEC8 = 0x0602EEC8; -D_0602EEF8 = 0x0602EEF8; -D_0602EF68 = 0x0602EF68; -D_0602EF88 = 0x0602EF88; -D_0602EFE8 = 0x0602EFE8; -D_0602F640 = 0x0602F640; -D_0602F840 = 0x0602F840; -D_06030C40 = 0x06030C40; -D_06032040 = 0x06032040; -D_060335F0 = 0x060335F0; -D_06033F80 = 0x06033F80; -D_06034E64 = 0x06034E64; -D_060358C4 = 0x060358C4; -D_06036A7C = 0x06036A7C; -D_06037ADC = 0x06037ADC; -D_0603918C = 0x0603918C; -D_0603B330 = 0x0603B330; -D_0603C4E0 = 0x0603C4E0; -D_0603CBD0 = 0x0603CBD0; -D_0603D224 = 0x0603D224; -D_0603D7F0 = 0x0603D7F0; -D_0603DD1C = 0x0603DD1C; -D_0603DD30 = 0x0603DD30; -D_0603ED30 = 0x0603ED30; -D_0603F130 = 0x0603F130; -D_06040130 = 0x06040130; -D_06040930 = 0x06040930; -D_06040B30 = 0x06040B30; -D_06041B30 = 0x06041B30; -D_06042330 = 0x06042330; -D_06043330 = 0x06043330; - // segment 0x07 // segment 0x08 -- cgit v1.2.3