From b0d65852c2d9a00aab25b9ffd61b1575f2db7e6f Mon Sep 17 00:00:00 2001 From: Mario <21146795-mariob92@users.noreply.gitlab.com> Date: Sat, 18 Jul 2026 20:51:43 +0000 Subject: [PATCH] Pal matching 2 --- decompressed.pal.yaml | 1235 ++++++++++++++-------------- manual_syms.pal.txt | 1396 +++++++++----------------------- src/BGS/ch/croctus.c | 6 +- src/BGS/ch/frogminigame.c | 8 +- src/BGS/ch/tanktup.c | 8 +- src/BGS/ch/tiptup.c | 42 +- src/BGS/crc.c | 6 +- src/BGS/mrvileminigame.c | 70 +- src/CCW/ccwspawnqueue.c | 20 +- src/CCW/ch/seasonswitchdoors.c | 12 +- src/FP/ch/bearcub.c | 12 +- src/FP/ch/boggy1.c | 8 +- src/FP/ch/boggy2.c | 32 +- src/FP/ch/boggy3.c | 6 +- src/FP/ch/cavewozza.c | 4 +- src/FP/ch/twinkly.c | 4 +- src/FP/ch/twinklybox.c | 4 +- src/FP/ch/twinklymuncher.c | 4 +- src/FP/ch/wozza.c | 10 +- src/FP/ch/xmastree.c | 4 +- src/FP/ma/slalom.c | 24 +- src/GV/ch/ancientone.c | 8 +- src/GV/ch/gobi1.c | 4 +- src/GV/ch/gobi2.c | 4 +- src/GV/ch/gobi3.c | 2 +- src/GV/ch/grabba.c | 6 +- src/GV/ch/mazectrl.c | 8 +- src/GV/ch/trunker.c | 2 +- src/GV/code_3630.c | 6 +- src/GV/code_7060.c | 4 +- src/GV/crc.c | 6 +- src/GV/gvspawnqueue.c | 2 +- src/GV/matchinggame.c | 4 +- src/MM/ch/conga.c | 14 +- src/MM/ch/juju.c | 2 +- src/MM/ch/orange.c | 2 +- src/MM/ch/orangepad.c | 4 +- src/MM/crc.c | 6 +- src/RBB/ch/anchorctrl.c | 2 +- src/RBB/ch/bossboombox.c | 4 +- src/RBB/ch/dolphin.c | 2 +- src/RBB/code_CA0.c | 2 +- src/RBB/propellorctrl.c | 4 +- src/SM/ch/jumptutorial.c | 6 +- src/SM/code_46C0.c | 143 ++-- src/SM/smspawnqueue.c | 6 +- src/TTC/ch/blubber.c | 8 +- src/TTC/ch/clam.c | 6 +- src/TTC/ch/leaky.c | 4 +- src/TTC/ch/lockup.c | 2 +- src/TTC/ch/nipper.c | 8 +- src/TTC/ch/treasure.c | 2 +- src/TTC/ch/treasurehunt.c | 6 +- src/TTC/code_3040.c | 6 +- src/TTC/ma/castle.c | 10 +- src/core2/ch/beehive.c | 6 +- src/core2/ch/beeswarm.c | 2 +- src/core2/ch/bottlesbonus.c | 14 +- src/core2/ch/collectible.c | 6 +- src/core2/ch/crab.c | 10 +- src/core2/ch/gloop.c | 2 +- src/core2/ch/jinjo.c | 10 +- src/core2/ch/mole.c | 40 +- src/core2/ch/mumbo.c | 48 +- src/core2/ch/snacker.c | 2 +- src/core2/ch/trainers.c | 2 +- src/core2/ch/wadingboots.c | 2 +- src/core2/code_53A10.c | 6 +- src/core2/code_5C870.c | 2 +- src/core2/code_A5BC0.c | 2 +- src/core2/code_B3A80.c | 5 + src/core2/levelcollectible.c | 6 +- 72 files changed, 1415 insertions(+), 1970 deletions(-) diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index de3c606f..cbe5519f 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -624,7 +624,7 @@ segments: - [0xFAD530, c, code_34310] - [0xFAD9B0, c, code_34790] - [0xFAE740, c, code_35520] - - [0xFAE8D0, textbin, nc/dynamicCamera_untouched] #DONE + - [0xFAE8D0, textbin, nc/dynamicCamera_untouched] # PAL change - [0xFB0BE0, c, code_379B0] #DONE - [0xFB0F00, c, nc/randomCamera] #DONE - [0xFB1080, c, code_37E50] #DONE @@ -645,74 +645,74 @@ segments: - [0xFB4040, c, nc/dynamicCamA] #DONE - [0xFB44F0, c, code_3B2C0] #DONE - [0xFB4700, c, nc/dynamicCamF] #DONE - - [0xFB47F0, textbin, nc/ba/1p_untouched] #DONE - #- [0xFB4DB0, c, spawnqueue] #DONE - # - [0xF92D30, c, ch/gameSelect] #DONE - # - [0xF94430, c, fx/shoesparkle] #DONE - # - [0xF94590, c, ch/explosionripple] #DONE - # - [0xF94640, c, ch/bubble] #DONE - # - [0xF94850, c, ch/bigbutt] #DONE - # - [0xF95A50, c, code_400F0] #DONE - # - [0xF96400, c, ch/jiggy] #DONE - # - [0xF96A90, c, ch/jigsawdance] #DONE - # - [0xF96DC0, c, code_41460] #DONE - # - [0xF97890, c, code_41F30] #DONE - # - [0xF97910, c, code_41FB0] #DONE - # - [0xF98600, c, ch/musicnote] #DONE - # - [0xF98610, c, code_42CB0] #DONE - # - [0xF98BB0, c, code_43250] #DONE - # - [0xF98CF0, c, ch/trainers] #DONE - # - [0xF99160, c, code_43800] #DONE - # - [0xF993A0, c, code_43A40] #DONE - # - [0xFBD240, textbin, mapspecificflags_untouched] #DONE - # - [FBD620??, c, ch/crab] #DONE - # - [0xF9AC70, c, code_45310] #DONE - # - [0xF9C240, c, ch/code_468E0] #DONE - # - [0xF9C520, c, ch/jinjo] #DONE - # - [0xF9D1B0, c, ch/beehive] #DONE - # - [0xF9D530, c, ch/beeswarm] #DONE - # - [0xF9EED0, c, ch/soundsource] #DONE - # - [0xF9F3D0, c, ch/shrapnel] #DONE - # - [0xF9FD80, c, ch/gloop] #DONE - # - [0xFA0050, c, ch/mumbo] #DONE - # - [0xFA16D0, c, mumbosign] #DONE - # - [0xFA1770, c, code_4BE10] #DONE - # - [0xFA1980, c, code_4C020] #DONE - # - [0xFA54E0, c, ch/wadingboots] #DONE - # - [0xFA5870, c, ch/badShad] #DONE - # - [0xFA5DF0, c, code_50490] #DONE - # - [0xFA60B0, c, ch/climbBase] #DONE - # - [0xFA6330, c, levelcollectible] #DONE - # - [0xFA7100, c, ch/piranhaWaterParticles] #DONE - # - [0xFA72B0, c, code_51950] #DONE - # - [0xFA75F0, c, ch/collectible] #DONE - # - [0xFA7BF0, c, ch/mole] #DONE - # - [0xFA8F30, c, ch/molehill] #DONE - # - [0xFA9370, c, code_53A10] #DONE - # - [0xFA9570, c, code_53C10] #DONE - # - [0xFAA6B0, c, code_54D50] #DONE - # - [0xFAAAE0, c, code_55180] #DONE - # - [0xFAACF0, c, gc/gameoversign] #DONE - # - [0xFAB020, c, gc/theendsign] #DONE - # - [0xFAB1B0, c, gc/banjokazooiesign] #DONE - # - [0xFAB3F0, c, ch/overlaycopyright] #DONE - # - [0xFAB520, c, ch/overlaypressstart] #DONE - # - [0xFAB780, c, ch/overlaynocontroller] #DONE - # - [0xFABA50, c, ch/bottlesbonus] #DONE - # - [0xFAD5D0, c, ch/mumboshandwithpicture] #DONE - # - [0xFADB30, c, code_581D0] #DONE - # - [0xFADE30, c, ch/bottlesbonuscursor] #DONE - # - [0xFAF0E0, c, code_59780] #DONE - # - [0xFAF340, c, code_599E0] #DONE - # - [0xFAF3E0, c, ch/mumbotoken] #DONE - # - [0xFAF6A0, c, ch/snacker] #DONE - # - [0xFB0490, c, ch/snowman] #DONE - # - [0xFB1000, c, ch/snowball] #DONE - # - [0xFB16F0, c, ch/snowmanhat] #DONE - # - [0xFD5440, c, mapsavestate] - # - [0xFD57D0, c, code_5C240] #DONE - # - [0xFD5E00, c, code_5C870] #DONE - # - [0xFD7150, c, code_5DBC0] #DONE + - [0xFB47F0, c, nc/ba/1p] #DONE + - [0xFB4DB0, c, spawnqueue] + - [0xFB6600, textbin, ch/gameSelect_untouched] # PAL change + - [0xFB7F70, c, fx/shoesparkle] #DONE + - [0xFB80D0, c, ch/explosionripple] #DONE + - [0xFB8180, c, ch/bubble] #DONE + - [0xFB8390, c, ch/bigbutt] #DONE + - [0xFB9590, c, code_400F0] #DONE + - [0xFB9F40, textbin, ch/jiggy_untouched] # PAL change + - [0xFBA6A0, c, ch/jigsawdance] #DONE + - [0xFBA9D0, c, code_41460] #DONE + - [0xFBB4A0, c, code_41F30] #DONE + - [0xFBB520, c, code_41FB0] #DONE + - [0xFBC210, c, ch/musicnote] #DONE + - [0xFBC220, c, code_42CB0] #DONE + - [0xFBC7C0, c, code_43250] #DONE + - [0xFBC900, c, ch/trainers] #DONE + - [0xFBCD70, c, code_43800] #DONE + - [0xFBCFB0, c, code_43A40] #DONE + - [0xFBD240, c, mapspecificflags] #DONE + - [0xFBD620, c, ch/crab] #DONE + - [0xFBE880, c, code_45310] #DONE + - [0xFBFE50, c, ch/code_468E0] #DONE + - [0xFC0130, c, ch/jinjo] #DONE + - [0xFC0DC0, c, ch/beehive] #DONE + - [0xFC1140, c, ch/beeswarm] #DONE + - [0xFC2AE0, c, ch/soundsource] #DONE + - [0xFC2FE0, c, ch/shrapnel] #DONE + - [0xFC3990, c, ch/gloop] #DONE + - [0xFC3C60, c, ch/mumbo] #DONE + - [0xFC52E0, c, mumbosign] #DONE + - [0xFC5380, c, code_4BE10] #DONE + - [0xFC5590, textbin, code_4C020_untouched] # PAL change + - [0xFC9110, c, ch/wadingboots] #DONE + - [0xFC94A0, c, ch/badShad] #DONE + - [0xFC9A20, c, code_50490] #DONE + - [0xFC9CE0, c, ch/climbBase] #DONE + - [0xFC9F60, c, levelcollectible] #DONE + - [0xFCAD30, c, ch/piranhaWaterParticles] #DONE + - [0xFCAEE0, c, code_51950] #DONE + - [0xFCB220, c, ch/collectible] #DONE + - [0xFCB820, c, ch/mole] #DONE + - [0xFCCB60, c, ch/molehill] #DONE + - [0xFCCFA0, c, code_53A10] #DONE + - [0xFCD1A0, c, code_53C10] #DONE + - [0xFCE2E0, c, code_54D50] #DONE + - [0xFCE710, c, code_55180] #DONE + - [0xFCE920, c, gc/gameoversign] #DONE + - [0xFCEC50, c, gc/theendsign] #DONE + - [0xFCEDE0, c, gc/banjokazooiesign] #DONE + - [0xFCF020, c, ch/overlaycopyright] #DONE + - [0xFCF150, c, ch/overlaypressstart] #DONE + - [0xFCF400, c, ch/overlaynocontroller] #DONE + - [0xFCF680, textbin, ch/bottlesbonus_untouched] # PAL change + - [0xFD1210, textbin, ch/mumboshandwithpicture_untouched] + - [0xFD1770, c, code_581D0] #DONE + - [0xFD1A70, textbin, ch/bottlesbonuscursor_untouched] #DONE + - [0xFD2D20, c, code_59780] #DONE + - [0xFD2F80, c, code_599E0] #DONE + - [0xFD3020, c, ch/mumbotoken] #DONE + - [0xFD32E0, c, ch/snacker] #DONE + - [0xFD40D0, c, ch/snowman] #DONE + - [0xFD4C40, c, ch/snowball] #DONE + - [0xFD5330, c, ch/snowmanhat] #DONE + - [0xFD5450, c, mapsavestate] + - [0xFD57E0, c, code_5C240] #DONE + - [0xFD5E10, c, code_5C870] #DONE + - [0xFD7160, textbin, code_5DBC0_untouched] # PAL change - [0xFD9090, c, code_5FB00] #DONE - [0xFD9310, c, code_5FD80] #DONE - [0xFD9320, c, code_5FD90] #DONE @@ -747,15 +747,15 @@ segments: - [0xFEADB0, c, code_71820] #DONE - [0xFEB5F0, c, code_72060] #DONE - [0xFEC0A0, c, code_72B10] #DONE - - [0xFECBD0, textbin, code_73640_untouched] #DONE - - [0xFED620, textbin, code_74090_untouched] #DONE - - [0xFED820, textbin, code_74290_untouched] #DONE - - [0xFED9B0, textbin, code_74420_untouched] #DONE - - [0xFEDEA0, textbin, code_74910_untouched] #DONE - - [0xFEE460, textbin, code_74ED0_untouched] #DONE - - [0xFEEA10, textbin, code_75480_untouched] #DONE - - [0xFEEEC0, textbin, code_75930_untouched] #DONE - - [0xFEF420, textbin, code_75E90_untouched] #DONE + - [0xFECBD0, c, code_73640] #DONE + - [0xFED620, c, code_74090] #DONE + - [0xFED820, c, code_74290] #DONE + - [0xFED9B0, c, code_74420] #DONE + - [0xFEDEA0, c, code_74910] #DONE + - [0xFEE460, c, code_74ED0] #DONE + - [0xFEEA10, c, code_75480] #DONE + - [0xFEEEC0, c, code_75930] #DONE + - [0xFEF420, c, code_75E90] #DONE - [0xFEF920, c, fx/common1score] #DONE - [0xFEF960, c, fx/common2score] #DONE - [0xFF0320, c, fx/honeycarrierscore] #DONE @@ -764,9 +764,9 @@ segments: - [0xFF23E0, c, fx/lifescore] #DONE - [0xFF2DC0, c, fx/common3score] #DONE - [0xFF3210, c, fx/healthscore] #DONE - - [0xFF3CF0, textbin, fx/airscore_untouched] # PAL change?? - - [0xFF44D0, textbin, gccube_untouched] # address is correct!! - - [0xFFB550, textbin, mapModel_untouched] # address is correct!! + - [0xFF3CF0, textbin, fx/airscore_untouched] # PAL change + - [0xFF44D0, c, gccube] + - [0xFFB550, textbin, mapModel_untouched] # matches, but different data - [0xFFC890, c, propModelList] #DONE - [0xFFD2C0, c, gc/section] #DONE - [0xFFD620, c, gc/sky] #DONE @@ -774,13 +774,13 @@ segments: - [0xFFE720, c, code_851D0] #DONE - [0xFFED00, c, code_857B0] #DONE - [0xFFED50, c, code_85800] #DONE - - [0x1001380, textbin, gc/dialog_untouched] - # - [??100 3EB0, c, gc/pauseMenu] #DONE - # - [??100 7320, c, code_8DC20] #DONE - # - [??1007970, c, gc/zoombox] #DONE - #- [0x100B570, c, code_91E10] #DONE - #- [0x100CD50, textbin, minigame_untouched] # PAL change - #- [0x100D3A0, textbin, gc/parade_untouched] # PAL change + - [0x1001380, textbin, gc/dialog_untouched] # PAL change + - [0x1003DB0, textbin, gc/pauseMenu_untouched] # PAL change + - [0x1007320, c, code_8DC20] #DONE + - [0x1007970, textbin, gc/zoombox_untouched] # PAL change + - [0x100B570, textbin, code_91E10_untouched] # probably matches, but unresolved symbols + - [0x100CD50, textbin, minigame_untouched] # PAL change + - [0x100D3A0, textbin, gc/parade_untouched] # PAL change - [0x100DDB0, c, code_94620] #DONE - [0x100DF10, c, code_94780] #DONE - [0x100E1B0, c, code_94A20] #DONE @@ -794,26 +794,26 @@ segments: - [0x1013EE0, c, code_9A740] #DONE - [0x1014170, c, code_9A9D0] #DONE - [0x10144A0, c, levelspecificflags] #DONE - - [0x1014920, textbin, code_9B180_untouched] #DONE - # - [??, c, code_9B650] #DONE - - [0x1015190, textbin, code_9B990_untouched] #DONE + - [0x1014920, textbin, code_9B180_untouched] # PAL change + - [0x1014E00, c, code_9B650] #DONE + - [0x1015140, textbin, code_9B990_untouched] # PAL change - [0x1015970, c, code_9C170] #DONE - [0x1016E40, c, code_9D640] #DONE - [0x1016F60, c, code_9D760] #DONE - [0x1017060, c, timedfuncqueue] #DONE - - [0x1017B70, textbin, code_9E370_untouched] - - [0x101E500, textbin, code_A4D00_untouched] #DONE - - [0x101F3C0, textbin, code_A5BC0_untouched] - - [0x1025400, textbin, code_ABC00_untouched] #DONE + - [0x1017B70, textbin, code_9E370_untouched] # PAL change + - [0x101E500, c, code_A4D00] #DONE + - [0x101F3C0, c, code_A5BC0] + - [0x1025400, c, code_ABC00] #DONE - [0x1025D20, c, gclights] #DONE - - [0x1026910, textbin, code_AD110_untouched] #DONE - - [0x1026DB0, textbin, gsworld_untouched] #DONE + - [0x1026910, textbin, code_AD110_untouched] # contains external symbols (level overlays) + - [0x1026DB0, textbin, gsworld_untouched] # contains external symbols - [0x1027A90, c, code_AE290] #DONE - [0x1027DD0, c, skeletalanim] #DONE - [0x10285A0, c, code_AEDA0] - - [0x102AC00, textbin, modelRender_untouched] + - [0x102AC00, textbin, modelRender_untouched] # PAL change - [0x102CD80, c, code_B3580] #DONE - - [0x102D280, textbin, code_B3A80_untouched] #DONE + - [0x102D280, c, code_B3A80] #DONE - [0x102E840, c, code_B5040] #DONE - [0x102F600, c, code_B5E00] #DONE - [0x102FAB0, c, code_B62B0] #DONE @@ -821,7 +821,7 @@ segments: - [0x102FED0, c, string] - [0x1030460, c, code_B6C60] #DONE - [0x10304E0, c, time] #DONE - - [0x10306A0, textbin, commonParticle_untouched] # PAL change + - [0x10306A0, c, commonParticle] - [0x1031320, c, coords] #DONE - [0x1031740, c, code_B7F40] #DONE - [0x1031820, c, code_B8020] #DONE @@ -866,30 +866,30 @@ segments: - [0x10450B0, c, commonParticleTypeMap] #DONE - [0x1045400, c, code_CBBF0] #DONE - [0x1045520, c, code_CBD10] #DONE - - [0x10459F0, textbin, code_CC1E0_untouched] #DONE + - [0x10459F0, c, code_CC1E0] #DONE - [0x10468B0, c, code_CD0A0] #DONE - [0x1046C00, c, code_CD3F0] #DONE - [0x1046EF0, c, code_CD6E0] #DONE - [0x10484E0, c, code_CECD0] #DONE - [0x10488A0, c, code_CF090] #DONE - [0x1048BF0, c, progressDialog] #DONE - - [0x1048E00, textbin, code_CF5F0_untouched_untouched] #DONE - - [0x1048FF0, textbin, ch/clankerwhipcrack_untouched] #DONE - - [0x1049270, textbin, ch/grillechompa_untouched] #DONE - - [0x10499D0, textbin, ch/clucker_untouched] #DONE - - [0x104A4B0, textbin, ch/scarabbeetle_untouched] #DONE - - [0x104B990, textbin, code_D2180_untouched] #DONE - - [0x104BD10, textbin, ch/firefx_untouched] #DONE - - [0x104C2C0, textbin, ch/drips_untouched] #DONE - - [0x104C620, textbin, ch/icecube_untouched] #DONE - - [0x104D860, textbin, ch/ghost_untouched] #DONE - - [0x104E900, textbin, ch/flotsam_untouched] #DONE - - [0x104F520, textbin, ch/skeleton_untouched] #DONE - - [0x104F7E0, textbin, ch/seamangrublin_untouched] # PAL change - - [0x104F9A0, textbin, ch/mummum_untouched] #DONE - - [0x104FE10, textbin, ch/chumpfish_untouched] #DONE - - [0x1050860, textbin, ch/termite_untouched] #DONE - - [0x1051530, textbin, ch/gravestone_untouched] #DONE + - [0x1048E00, c, code_CF5F0] #DONE + - [0x1048FF0, c, ch/clankerwhipcrack] #DONE + - [0x1049270, c, ch/grillechompa] #DONE + - [0x10499D0, c, ch/clucker] #DONE + - [0x104A4B0, c, ch/scarabbeetle] #DONE + - [0x104B990, c, code_D2180] #DONE + - [0x104BD10, c, ch/firefx] #DONE + - [0x104C2C0, c, ch/drips] #DONE + - [0x104C620, c, ch/icecube] #DONE + - [0x104D860, c, ch/ghost] #DONE + - [0x104E900, textbin, ch/flotsam_untouched] # PAL change + - [0x104F530, c, ch/skeleton] #DONE + - [0x104F7F0, c, ch/seamangrublin] #DONE + - [0x104F9A0, c, ch/mummum] #DONE + - [0x104FE20, c, ch/chumpfish] #DONE + - [0x1050860, c, ch/termite] #DONE + - [0x1051530, c, ch/gravestone] #DONE - [0x1052200, c, ch/bat] - [0x10535C0, c, ch/whipcrack] #DONE - [0x1053BC0, c, ch/betavent] #DONE @@ -946,67 +946,67 @@ segments: - [0x1058630, .data, nc/dynamicCamA] - [0x1058650, .data, spawnqueue] - [0x1058660, databin, ch/gameSelect_untouched_data] - - [0x10587D0, databin, fx/shoesparkle_untouched_data] - - [0x1058850, databin, ch/explosionripple_untouched_data] - - [0x1058880, databin, ch/bubble_untouched_data] - - [0x10588B0, databin, ch/bigbutt_untouched_data] - - [0x1058990, databin, code_400F0_untouched_data] - - [0x1058B30, databin, ch/jiggy_untouched_data] - - [0x1058B70, databin, ch/jigsawdance_untouched_data] - - [0x1058BD0, databin, code_41460_untouched_data] - - [0x1058CD0, databin, code_41F30_untouched_data] - - [0x1058D00, databin, code_41FB0_untouched_data] - - [0x10594F0, databin, ch/musicnote_untouched_data] - - [0x1059520, databin, code_42CB0_untouched_data] - - [0x1059570, databin, code_43250_untouched_data] - - [0x1059740, databin, ch/trainers_untouched_data] - - [0x1059790, databin, code_43800_untouched_data] - - [0x10597C0, databin, code_43A40_untouched_data] - - [0x10598A0, databin, mapspecificflags_untouched_data] - - [0x10598B0, databin, ch/crab_untouched_data] - - [0x10599D0, databin, code_45310_untouched_data] - - [0x1059A00, databin, ch/code_468E0_untouched_data] - - [0x1059A50, databin, ch/jinjo_untouched_data] - - [0x1059B60, databin, ch/beehive_untouched_data] - - [0x1059BB0, databin, ch/beeswarm_untouched_data] - - [0x1059BE0, databin, ch/soundsource_untouched_data] - - [0x1059C60, databin, ch/shrapnel_untouched_data] - - [0x1059CD0, databin, ch/gloop_untouched_data] - - [0x1059D30, databin, ch/mumbo_untouched_data] - - [0x1059DD0, databin, mumbosign_untouched_data] - - [0x1059E90, databin, code_4BE10_untouched_data] - - [0x1059F20, databin, code_4C020_untouched_data] - - [0x105A2A0, databin, ch/wadingboots_untouched_data] - - [0x105A2F0, databin, ch/badShad_untouched_data] - - [0x105A320, databin, code_50490_untouched_data] - - [0x105A3C0, databin, ch/climbBase_untouched_data] - - [0x105A3F0, databin, levelcollectible_untouched_data_untouched_data] - - [0x105A500, databin, ch/piranhaWaterParticles_untouched_data] - - [0x105A530, databin, code_51950_untouched_data] - - [0x105A5A0, databin, ch/collectible_untouched_data] - - [0x105A610, databin, ch/mole_untouched_data] - - [0x105A6A0, databin, ch/molehill_untouched_data] - - [0x105A710, databin, code_53A10_untouched_data] - - [0x105A740, databin, code_53C10_untouched_data] - - [0x105A7D0, databin, code_54D50_untouched_data] - - [0x105A880, databin, code_55180_untouched_data] - - [0x105A8E0, databin, gc/gameoversign_untouched_data] - - [0x105A910, databin, gc/theendsign_untouched_data] - - [0x105A940, databin, gc/banjokazooiesign_untouched_data] - - [0x105A970, databin, ch/overlaycopyright_untouched_data] - - [0x105A9A0, databin, ch/overlaypressstart_untouched_data] - - [0x105A9F0, databin, ch/overlaynocontroller_untouched_data] - - [0x105AA40, databin, ch/bottlesbonus_untouched_data] - - [0x105ABA0, databin, ch/mumboshandwithpicture_untouched_data] - - [0x105AC00, databin, code_581D0_untouched_data] - - [0x105AC50, databin, ch/bottlesbonuscursor_untouched_data] - - [0x105ACE0, databin, code_59780_untouched_data] - - [0x105AE40, databin, ch/mumbotoken_untouched_data] - - [0x105AE70, databin, ch/snacker_untouched_data] - - [0x105AEF0, databin, ch/snowman_untouched_data] - - [0x105AFB0, databin, ch/snowball_untouched_data] - - [0x105B060, databin, ch/snowmanhat_untouched_data] - - [0x105B090, databin, code_5C870_untouched_data] + - [0x10587D0, .data, fx/shoesparkle] + - [0x1058850, .data, ch/explosionripple] + - [0x1058880, .data, ch/bubble] + - [0x10588B0, .data, ch/bigbutt] + - [0x1058990, .data, code_400F0] + - [0x1058B30, .data, ch/jiggy] + - [0x1058B70, .data, ch/jigsawdance] + - [0x1058BD0, .data, code_41460] + - [0x1058CD0, .data, code_41F30] + - [0x1058D00, .data, code_41FB0] + - [0x10594F0, .data, ch/musicnote] + - [0x1059520, .data, code_42CB0] + - [0x1059570, .data, code_43250] + - [0x1059740, .data, ch/trainers] + - [0x1059790, .data, code_43800] + - [0x10597C0, .data, code_43A40] + - [0x10598A0, .data, mapspecificflags] + - [0x10598B0, .data, ch/crab] + - [0x10599D0, .data, code_45310] + - [0x1059A00, .data, ch/code_468E0] + - [0x1059A50, .data, ch/jinjo] + - [0x1059B60, .data, ch/beehive] + - [0x1059BB0, .data, ch/beeswarm] + - [0x1059BE0, .data, ch/soundsource] + - [0x1059C60, .data, ch/shrapnel] + - [0x1059CD0, .data, ch/gloop] + - [0x1059D30, .data, ch/mumbo] + - [0x1059DD0, .data, mumbosign] + - [0x1059E90, .data, code_4BE10] + - [0x1059F20, .data, code_4C020] + - [0x105A2A0, .data, ch/wadingboots] + - [0x105A2F0, .data, ch/badShad] + - [0x105A320, .data, code_50490] + - [0x105A3C0, .data, ch/climbBase] + - [0x105A3F0, .data, levelcollectible] + - [0x105A500, .data, ch/piranhaWaterParticles] + - [0x105A530, .data, code_51950] + - [0x105A5A0, .data, ch/collectible] + - [0x105A610, .data, ch/mole] + - [0x105A6A0, .data, ch/molehill] + - [0x105A710, .data, code_53A10] + - [0x105A740, .data, code_53C10] + - [0x105A7D0, .data, code_54D50] + - [0x105A880, .data, code_55180] + - [0x105A8E0, .data, gc/gameoversign] + - [0x105A910, .data, gc/theendsign] + - [0x105A940, .data, gc/banjokazooiesign] + - [0x105A970, .data, ch/overlaycopyright] + - [0x105A9A0, .data, ch/overlaypressstart] + - [0x105A9F0, .data, ch/overlaynocontroller] + - [0x105AA40, .data, ch/bottlesbonus] + - [0x105ABA0, .data, ch/mumboshandwithpicture] + - [0x105AC00, .data, code_581D0] + - [0x105AC50, .data, ch/bottlesbonuscursor] + - [0x105ACE0, .data, code_59780] + - [0x105AE40, .data, ch/mumbotoken] + - [0x105AE70, .data, ch/snacker] + - [0x105AEF0, .data, ch/snowman] + - [0x105AFB0, .data, ch/snowball] + - [0x105B060, .data, ch/snowmanhat] + - [0x105B090, .data, code_5C870] - [0x105B0D0, .data, code_5DBC0] - [0x105B0F0, .data, code_66D90] - [0x105B100, .data, code_66FB0] @@ -1025,7 +1025,7 @@ segments: - [0x105B8A0, .data, print] - [0x105BB20, .data, code_72060] - [0x105BB80, .data, code_73640] - - [0x105BFC0, databin, code_74090_untouched] + - [0x105BFC0, .data, code_74090] - [0x105C070, .data, code_74290] - [0x105C0A0, .data, code_74420] - [0x105C0D0, .data, code_74910] @@ -1062,11 +1062,11 @@ segments: - [0x1060C60, databin, code_9B990_untouched] - [0x1060DC0, .data, code_9D640] - [0x1060F00, .data, code_9E370] - - [0x1060F70, databin, code_A4D00_untouched] + - [0x1060F70, .data, code_A4D00] - [0x1061150, .data, code_A5BC0] - - [0x10611D0, databin, code_ABC00_untouched] + - [0x10611D0, .data, code_ABC00] - [0x1062310, .data, gclights] - - [0x1062320, databin, code_AD110_untouched] + - [0x1062320, databin, code_AD110_untouched] # lots of references to level overlays - [0x1062BF0, .data, gsworld] - [0x1062C00, .data, code_AEDA0] - [0x1062CE0, .data, modelRender] @@ -1211,41 +1211,40 @@ segments: - [0x10688B0, .rodata, nc/ba/fly] - [0x10688C0, .rodata, nc/dynamicCamC] - [0x10688D0, .rodata, code_F8EAF0] -# - [???, .rodata, nc/dynamicCamB] - [0x10688F0, .rodata, nc/dynamicCam13] - [0x1068900, .rodata, nc/dynamicCam9] - [0x1068920, .rodata, nc/dynamicCam12] - [0x1068950, .rodata, nc/dynamicCam3] - [0x1068960, .rodata, nc/dynamicCamA] - - [0x1068970, rodatabin, spawnqueue_untouched] + - [0x1068970, .rodata, spawnqueue] - [0x10689C0, rodatabin, ch/gameSelect_untouched2] - [0x1068D00, .rodata, ch/bubble] - - [0x1068D10, rodatabin, ch/bigbutt_untouched] - - [0x1068DF0, rodatabin, code_400F0_untouched] + - [0x1068D10, .rodata, ch/bigbutt] + - [0x1068DF0, .rodata, code_400F0] - [0x1068E50, rodatabin, ch/jiggy_untouched] - - [0x1068ED0, rodatabin, ch/jigsawdance_untouched] - - [0x1068F40, rodatabin, code_41460_untouched] + - [0x1068ED0, .rodata, ch/jigsawdance] + - [0x1068F40, .rodata, code_41460] - [0x1068F70, .rodata, code_41FB0] - [0x1068FB0, .rodata, ch/musicnote] - [0x1068FC0, .rodata, code_42CB0] - [0x1068FD0, .rodata, ch/trainers] - [0x1068FE0, .rodata, code_43800] - - [0x1068FF0, rodatabin, ch/crab_untouched] + - [0x1068FF0, .rodata, ch/crab] - [0x1069040, .rodata, code_45310] - - [0x10690C0, rodatabin, ch/jinjo_untouched] + - [0x10690C0, .rodata, ch/jinjo] - [0x1069130, .rodata, ch/beehive] - - [0x1069140, rodatabin, ch/beeswarm_untouched] + - [0x1069140, .rodata, ch/beeswarm] - [0x10691A0, .rodata, ch/shrapnel] - [0x10691C0, .rodata, ch/gloop] - - [0x10691D0, rodatabin, ch/mumbo_untouched] + - [0x10691D0, .rodata, ch/mumbo] - [0x1069280, rodatabin, code_4C020_untouched] - [0x10698A0, .rodata, ch/badShad] - [0x10698B0, .rodata, code_50490] - - [0x10698C0, rodatabin, levelcollectible_untouched] + - [0x10698C0, .rodata, levelcollectible] - [0x1069900, .rodata, ch/piranhaWaterParticles] - [0x1069910, .rodata, code_51950] - - [0x1069920, rodatabin, ch/mole_untouched] - - [0x10699C0, rodatabin, code_53C10_untouched] + - [0x1069920, .rodata, ch/mole] + - [0x10699C0, .rodata, code_53C10] - [0x1069A30, .rodata, code_54D50] - [0x1069A50, .rodata, code_55180] - [0x1069A60, .rodata, gc/gameoversign] @@ -1257,11 +1256,11 @@ segments: - [0x1069B30, rodatabin, ch/bottlesbonuscursor_untouched] - [0x1069B90, .rodata, code_599E0] - [0x1069BA0, .rodata, ch/mumbotoken] - - [0x1069BB0, rodatabin, ch/snacker_untouched] + - [0x1069BB0, .rodata, ch/snacker] - [0x1069C00, .rodata, ch/snowman] - [0x1069C30, .rodata, ch/snowball] - [0x1069C60, .rodata, code_5C240] - - [0x1069C70, rodatabin, code_5C870_untouched] + - [0x1069C70, .rodata, code_5C870] - [0x1069CE0, .rodata, code_5FD90] - [0x1069CF0, .rodata, code_66FB0] - [0x1069D00, .rodata, dustemitter] @@ -1276,15 +1275,15 @@ segments: - [0x1069E20, .rodata, code_70F20] - [0x1069E80, .rodata, code_71820] - [0x1069EA0, .rodata, code_72060] - - [0x1069EC0, rodatabin, code_73640_untouched] - - [0x1069EF0, rodatabin, code_74420_untouched] + - [0x1069EC0, .rodata, code_73640] + - [0x1069EF0, .rodata, code_74420] - [0x1069F00, .rodata, fx/common2score] - [0x1069F10, .rodata, fx/honeycarrierscore] - [0x1069F60, .rodata, fx/jinjoscore] - [0x1069FC0, .rodata, fx/common3score] - [0x1069FE0, .rodata, fx/healthscore] - [0x1069FF0, rodatabin, fx/airscore_untouched] - - [0x106A010, rodatabin, gccube_untouched] + - [0x106A010, .rodata, gccube] - [0x106A0D0, rodatabin, mapModel_untouched] - [0x106A290, .rodata, propModelList] - [0x106A2A0, .rodata, gc/section] @@ -1352,14 +1351,14 @@ segments: - [0x0106C470, .rodata, code_D2180] - [0x0106C480, .rodata, ch/firefx] - [0x0106C4C0, .rodata, ch/drips] - - [0x0106C4E0, rodatabin, ch/icecube_untouched] - - [0x0106C590, rodatabin, ch/ghost_untouched] + - [0x0106C4E0, .rodata, ch/icecube] + - [0x0106C590, .rodata, ch/ghost] - [0x0106C600, .rodata, ch/flotsam] - [0x0106C640, .rodata, ch/skeleton] - [0x0106C650, .rodata, ch/mummum] - - [0x0106C660, rodatabin, ch/chumpfish_untouched] + - [0x0106C660, .rodata, ch/chumpfish] - [0x0106C6A0, .rodata, ch/termite] - - [0x0106C710, rodatabin, ch/gravestone] + - [0x0106C710, .rodata, ch/gravestone] - [0x0106C7B0, .rodata, ch/bat] - [0x0106C850, .rodata, ch/whipcrack] - [0x0106C870, .rodata, ch/betavent] @@ -1561,11 +1560,11 @@ segments: - [0x0106C980, .bss, code_85800] - [0x0106C980, .bss, gc/dialog] - [0x0106C980, .bss, gc/pauseMenu] + - [0x0106C980, .bss, bss_pad_pal] # needs to be moved - [0x0106C980, .bss, code_8DC20] - [0x0106C980, .bss, gc/zoombox] - [0x0106C980, .bss, code_91E10] - [0x0106C980, .bss, gc/parade] - - [0x0106C980, .bss, bss_pad_pal] # needs to be moved - [0x0106C980, .bss, code_94620] - [0x0106C980, .bss, code_94780] - [0x0106C980, .bss, code_956B0] @@ -1659,107 +1658,107 @@ segments: - [0x01070500, .bss, ma/clanker] - name: GV dir: GV - type: bin + type: code start: 0x01070500 vram: 0x80386DD0 # follows_vram: core2 exclusive_ram_id: overlay - # subsegments: - # - [0x104C0E0, c, ch/toots] #DONE - # - [0x104C310, c, ch/ancientone] #DONE - # - [0x104CE40, c, ch/gobi1] #DONE - # - [0x104D650, c, ch/gobi2] #DONE - # - [0x104DF60, c, ch/gobi3] #DONE - # - [0x104E5B0, c, ch/gobirope] #DONE - # - [0x104E810, c, ch/gobirock] #DONE - # - [0x104EC60, c, ch/trunker] #DONE - # - [0x104EFC0, c, magiccarpetshadow] #DONE - # - [0x104F1A0, c, ch/sarcophagus] #DONE - # - [0x104F710, c, code_3630] #DONE - # - [0x104FB80, c, ch/eggpot] #DONE - # - [0x104FBF0, c, crc] #DONE - # - [0x104FC90, c, code_3BB0] #DONE - # - [0x104FE70, c, magiccarpet2] #DONE - # - [0x1050490, c, code_43B0] #DONE - # - [0x1050820, c, ch/slappa] #DONE - # - [0x1051650, c, ch/grabba] #DONE - # - [0x10522C0, c, code_61E0] #DONE - # - [0x1052450, c, code_6370] #DONE - # - [0x1053060, c, sandybutteggtoll] #DONE - # - [0x1053140, c, code_7060] #DONE - # - [0x1053610, c, ch/histup] #DONE - # - [0x1053E30, c, code_7D50] #DONE - # - [0x1053E90, c, code_7DB0] #DONE - # - [0x10540A0, c, code_7FC0] #DONE - # - [0x10540D0, c, gvspawnqueue] #DONE - # - [0x1055210, c, ch/mazectrl] #DONE - # - [0x1055940, c, ch/buriedpyramid] #DONE - # - [0x1055C50, c, code_9B70] #DONE - # - [0x1055CF0, c, code_9C10] #DONE - # - [0x1055E90, c, matchinggame] #DONE - # - [0x1056570, c, waterctrl] #DONE - # - [0x10568C0, .data, ch/toots] - # - [0x1056910, .data, ch/ancientone] - # - [0x1056970, .data, ch/gobi1] - # - [0x10569A0, .data, ch/gobi2] - # - [0x10569F0, .data, ch/gobi3] - # - [0x1056A20, .data, ch/gobirope] - # - [0x1056A50, .data, ch/gobirock] - # - [0x1056A80, .data, ch/trunker] - # - [0x1056AB0, .data, magiccarpetshadow] - # - [0x1056AF0, .data, ch/sarcophagus] - # - [0x1056B90, .data, code_3630] - # - [0x1056BF0, .data, ch/eggpot] - # - [0x1056C20, .data, crc] - # - [0x1056C30, .data, code_3BB0] - # - [0x1056C90, .data, magiccarpet2] - # - [0x1056CF0, .data, code_43B0] - # - [0x1056D30, .data, ch/slappa] - # - [0x1056E10, .data, ch/grabba] - # - [0x1056E80, .data, code_61E0] - # - [0x1056EE0, .data, code_6370] - # - [0x1056F50, .data, sandybutteggtoll] - # - [0x1056F80, .data, code_7060] - # - [0x1056FD0, .data, ch/histup] - # - [0x1057030, .data, code_7DB0] - # - [0x1057070, .data, code_7FC0] - # - [0x10570D0, .data, gvspawnqueue] - # - [0x10572B0, .data, ch/mazectrl] - # - [0x1057310, .data, ch/buriedpyramid] - # - [0x1057340, .data, matchinggame] - # - [0x10573E0, .rodata, ch/ancientone] - # - [0x1057400, .rodata, ch/gobi1] - # - [0x1057410, .rodata, ch/gobi2] - # - [0x1057430, .rodata, ch/gobi3] - # - [0x1057470, .rodata, ch/gobirock] - # - [0x1057480, .rodata, ch/sarcophagus] - # - [0x1057490, .rodata, code_3BB0] - # - [0x10574A0, .rodata, magiccarpet2] - # - [0x10574B0, .rodata, code_43B0] - # - [0x10574C0, .rodata, ch/slappa] - # - [0x1057530, .rodata, ch/grabba] - # - [0x1057580, .rodata, code_6370] - # - [0x10575E0, .rodata, code_7060] - # - [0x1057600, .rodata, ch/histup] - # - [0x1057630, .rodata, gvspawnqueue] - # - [0x1057690, .rodata, ch/mazectrl] - # - [0x10576B0, .rodata, ch/buriedpyramid] - # - [0x10576F0, .rodata, matchinggame] - # - [0x1057700, .rodata, waterctrl] - # - [0x1057710, .bss, checksums] - # - [0x1057710, .bss, ch/toots] - # - [0x1057710, .bss, ch/gobi1] - # - [0x1057710, .bss, ch/gobi2] - # - [0x1057710, .bss, ch/gobirock] - # - [0x1057710, .bss, ch/slappa] - # - [0x1057710, .bss, ch/grabba] - # - [0x1057710, .bss, code_61E0] - # - [0x1057710, .bss, sandybutteggtoll] - # - [0x1057710, .bss, code_7D50] - # - [0x1057710, .bss, gvspawnqueue] - # - [0x1057710, .bss, code_9C10] - # - [0x1057710, .bss, matchinggame] - # - [0x1057710, .bss, waterctrl] + subsegments: + - [0x01070500, c, ch/toots] #DONE + - [0x01070500, c, ch/ancientone] #DONE + - [0x01070500, c, ch/gobi1] #DONE + - [0x01070500, c, ch/gobi2] #DONE + - [0x01070500, c, ch/gobi3] #DONE + - [0x01070500, c, ch/gobirope] #DONE + - [0x01070500, c, ch/gobirock] #DONE + - [0x01070500, c, ch/trunker] #DONE + - [0x01070500, c, magiccarpetshadow] #DONE + - [0x01070500, c, ch/sarcophagus] #DONE + - [0x01070500, c, code_3630] #DONE + - [0x01070500, c, ch/eggpot] #DONE + - [0x01070500, c, crc] #DONE + - [0x01070500, c, code_3BB0] #DONE + - [0x01070500, c, magiccarpet2] #DONE + - [0x01070500, c, code_43B0] #DONE + - [0x01070500, c, ch/slappa] #DONE + - [0x01070500, c, ch/grabba] #DONE + - [0x01070500, c, code_61E0] #DONE + - [0x01070500, c, code_6370] #DONE + - [0x01070500, c, sandybutteggtoll] #DONE + - [0x01070500, c, code_7060] #DONE + - [0x01070500, c, ch/histup] #DONE + - [0x01070500, c, code_7D50] #DONE + - [0x01070500, c, code_7DB0] #DONE + - [0x01070500, c, code_7FC0] #DONE + - [0x01070500, c, gvspawnqueue] #DONE + - [0x01070500, c, ch/mazectrl] #DONE + - [0x01070500, c, ch/buriedpyramid] #DONE + - [0x01070500, c, code_9B70] #DONE + - [0x01070500, c, code_9C10] #DONE + - [0x01070500, c, matchinggame] #DONE + - [0x01070500, c, waterctrl] #DONE + - [0x01070500, .data, ch/toots] + - [0x01070500, .data, ch/ancientone] + - [0x01070500, .data, ch/gobi1] + - [0x01070500, .data, ch/gobi2] + - [0x01070500, .data, ch/gobi3] + - [0x01070500, .data, ch/gobirope] + - [0x01070500, .data, ch/gobirock] + - [0x01070500, .data, ch/trunker] + - [0x01070500, .data, magiccarpetshadow] + - [0x01070500, .data, ch/sarcophagus] + - [0x01070500, .data, code_3630] + - [0x01070500, .data, ch/eggpot] + - [0x01070500, .data, crc] + - [0x01070500, .data, code_3BB0] + - [0x01070500, .data, magiccarpet2] + - [0x01070500, .data, code_43B0] + - [0x01070500, .data, ch/slappa] + - [0x01070500, .data, ch/grabba] + - [0x01070500, .data, code_61E0] + - [0x01070500, .data, code_6370] + - [0x01070500, .data, sandybutteggtoll] + - [0x01070500, .data, code_7060] + - [0x01070500, .data, ch/histup] + - [0x01070500, .data, code_7DB0] + - [0x01070500, .data, code_7FC0] + - [0x01070500, .data, gvspawnqueue] + - [0x01070500, .data, ch/mazectrl] + - [0x01070500, .data, ch/buriedpyramid] + - [0x01070500, .data, matchinggame] + - [0x01070500, .rodata, ch/ancientone] + - [0x01070500, .rodata, ch/gobi1] + - [0x01070500, .rodata, ch/gobi2] + - [0x01070500, .rodata, ch/gobi3] + - [0x01070500, .rodata, ch/gobirock] + - [0x01070500, .rodata, ch/sarcophagus] + - [0x01070500, .rodata, code_3BB0] + - [0x01070500, .rodata, magiccarpet2] + - [0x01070500, .rodata, code_43B0] + - [0x01070500, .rodata, ch/slappa] + - [0x01070500, .rodata, ch/grabba] + - [0x01070500, .rodata, code_6370] + - [0x01070500, .rodata, code_7060] + - [0x01070500, .rodata, ch/histup] + - [0x01070500, .rodata, gvspawnqueue] + - [0x01070500, .rodata, ch/mazectrl] + - [0x01070500, .rodata, ch/buriedpyramid] + - [0x01070500, .rodata, matchinggame] + - [0x01070500, .rodata, waterctrl] + - [0x01070500, .bss, checksums] + - [0x01070500, .bss, ch/toots] + - [0x01070500, .bss, ch/gobi1] + - [0x01070500, .bss, ch/gobi2] + - [0x01070500, .bss, ch/gobirock] + - [0x01070500, .bss, ch/slappa] + - [0x01070500, .bss, ch/grabba] + - [0x01070500, .bss, code_61E0] + - [0x01070500, .bss, sandybutteggtoll] + - [0x01070500, .bss, code_7D50] + - [0x01070500, .bss, gvspawnqueue] + - [0x01070500, .bss, code_9C10] + - [0x01070500, .bss, matchinggame] + - [0x01070500, .bss, waterctrl] - name: MMM dir: MMM type: code @@ -1809,352 +1808,354 @@ segments: - [0x0107bb30, .bss, code_3D50] - name: TTC dir: TTC - type: bin + type: code start: 0x01081c00 vram: 0x80386DD0 # follows_vram: core2 exclusive_ram_id: overlay - # subsegments: - # - [0x105D7E0, c, ch/clam] #DONE - # - [0x105E880, c, ch/blubber] #DONE - # - [0x105F1B0, c, ch/nipper] #DONE - # - [0x105FEB0, c, code_26D0] #DONE - # - [0x1060360, c, ch/leaky] #DONE - # - [0x1060820, c, code_3040] #DONE - # - [0x10608B0, c, ch/lockup] #DONE - # - [0x1060DB0, c, ch/treasurehunt] #DONE - # - [0x1061610, c, ma/castle] #DONE - # - [0x10633B0, c, ch/treasure] #DONE - # - [0x10637A0, .data, ch/clam] - # - [0x10638D0, .data, ch/blubber] - # - [0x1063930, .data, ch/nipper] - # - [0x10639D0, .data, code_26D0] - # - [0x1063AF0, .data, ch/leaky] - # - [0x1063B40, .data, code_3040] - # - [0x1063B50, .data, ch/lockup] - # - [0x1063C10, .data, ch/treasurehunt] - # - [0x1063D70, .data, ma/castle] - # - [0x1064080, .data, ch/treasure] - # - [0x10640D0, .rodata, ch/clam] - # - [0x1064130, .rodata, ch/blubber] - # - [0x1064160, .rodata, ch/nipper] - # - [0x1064180, .rodata, code_26D0] - # - [0x10641C0, .rodata, ch/leaky] - # - [0x10641E0, .rodata, ch/lockup] - # - [0x1064210, .rodata, ch/treasurehunt] - # - [0x1064240, .rodata, ma/castle] - # - [0x1064A90, .rodata, ch/treasure] - # - [0x1064AE0, .bss, checksums] - # - [0x1064AE0, .bss, code_3040] - # - [0x1064AE0, .bss, ch/treasurehunt] - # - [0x1064AE0, .bss, ma/castle] + subsegments: + - [0x01081c00, c, ch/clam] #DONE + - [0x01081c00, c, ch/blubber] #DONE + - [0x01081c00, c, ch/nipper] #DONE + - [0x01081c00, c, code_26D0] #DONE + - [0x01081c00, c, ch/leaky] #DONE + - [0x01081c00, c, code_3040] #DONE + - [0x01081c00, c, ch/lockup] #DONE + - [0x01081c00, c, ch/treasurehunt] #DONE + - [0x01081c00, c, ma/castle] #DONE + - [0x01081c00, c, ch/treasure] #DONE + - [0x01081c00, .data, ch/clam] + - [0x01081c00, .data, ch/blubber] + - [0x01081c00, .data, ch/nipper] + - [0x01081c00, .data, code_26D0] + - [0x01081c00, .data, ch/leaky] + - [0x01081c00, .data, code_3040] + - [0x01081c00, .data, ch/lockup] + - [0x01081c00, .data, ch/treasurehunt] + - [0x01081c00, .data, ma/castle] + - [0x01081c00, .data, ch/treasure] + - [0x01081c00, .rodata, ch/clam] + - [0x01081c00, .rodata, ch/blubber] + - [0x01081c00, .rodata, ch/nipper] + - [0x01081c00, .rodata, code_26D0] + - [0x01081c00, .rodata, ch/leaky] + - [0x01081c00, .rodata, ch/lockup] + - [0x01081c00, .rodata, ch/treasurehunt] + - [0x01081c00, .rodata, ma/castle] + - [0x01081c00, .rodata, ch/treasure] + - [0x01081c00, .bss, checksums] + - [0x01081c00, .bss, code_3040] + - [0x01081c00, .bss, ch/treasurehunt] + - [0x01081c00, .bss, ma/castle] - name: MM dir: MM - type: bin + type: code start: 0x01088f00 - # vram: 0x80386DD0 + vram: 0x80386DD0 # follows_vram: core2 exclusive_ram_id: overlay - # subsegments: - # - [0x1064AE0, c, ch/orangepad] - # - [0x1065050, c, ch/hut] - # - [0x1065390, c, ch/chimpystump] - # - [0x10655C0, c, ch/conga] - # - [0x10665B0, c, crc] - # - [0x1066680, c, ch/orange] - # - [0x10669F0, c, ch/lmonkey] #chimpy - # - [0x1066FA0, c, mmspawnqueue] - # - [0x1067090, c, ch/grublin] - # - [0x1067220, c, ch/jujuhitbox] - # - [0x10676C0, c, ch/juju] - # - [0x1067F80, .data, ch/orangepad] - # - [0x1067FB0, .data, ch/hut] - # - [0x1068010, .data, ch/chimpystump] - # - [0x1068040, .data, ch/conga] - # - [0x10680B0, .data, crc] - # - [0x10680C0, .data, ch/orange] - # - [0x1068100, .data, ch/lmonkey] - # - [0x1068150, .data, ch/grublin] - # - [0x10681D0, .data, ch/jujuhitbox] - # - [0x1068200, .data, ch/juju] - # - [0x1068230, .rodata, ch/orangepad] - # - [0x1068240, .rodata, ch/hut] - # - [0x1068250, .rodata, ch/conga] - # - [0x10682D0, .rodata, ch/orange] - # - [0x10682F0, .rodata, ch/lmonkey] - # - [0x1068340, .rodata, ch/grublin] - # - [0x1068350, .rodata, ch/jujuhitbox] - # - [0x1068360, .rodata, ch/juju] - # - [0x1068370, .bss, checksums] - # - [0x1068370, .bss, ch/hut] - # - [0x1068370, .bss, ch/juju] + subsegments: + - [0x01088f00, c, ch/orangepad] + - [0x01088f00, c, ch/hut] + - [0x01088f00, c, ch/chimpystump] + - [0x01088f00, c, ch/conga] + - [0x01088f00, c, crc] + - [0x01088f00, c, ch/orange] + - [0x01088f00, c, ch/lmonkey] #chimpy + - [0x01088f00, c, mmspawnqueue] + - [0x01088f00, c, ch/grublin] + - [0x01088f00, c, ch/jujuhitbox] + - [0x01088f00, c, ch/juju] + - [0x01088f00, .data, ch/orangepad] + - [0x01088f00, .data, ch/hut] + - [0x01088f00, .data, ch/chimpystump] + - [0x01088f00, .data, ch/conga] + - [0x01088f00, .data, crc] + - [0x01088f00, .data, ch/orange] + - [0x01088f00, .data, ch/lmonkey] + - [0x01088f00, .data, ch/grublin] + - [0x01088f00, .data, ch/jujuhitbox] + - [0x01088f00, .data, ch/juju] + - [0x01088f00, .rodata, ch/orangepad] + - [0x01088f00, .rodata, ch/hut] + - [0x01088f00, .rodata, ch/conga] + - [0x01088f00, .rodata, ch/orange] + - [0x01088f00, .rodata, ch/lmonkey] + - [0x01088f00, .rodata, ch/grublin] + - [0x01088f00, .rodata, ch/jujuhitbox] + - [0x01088f00, .rodata, ch/juju] + - [0x01088f00, .bss, checksums] + - [0x01088f00, .bss, ch/hut] + - [0x01088f00, .bss, ch/juju] - name: BGS dir: BGS - type: bin + type: code start: 0x0108c790 vram: 0x80386DD0 # follows_vram: core2 exclusive_ram_id: overlay # # after: core2-data - # subsegments: - # - [0x1068370, c, ch/flibbit] #DONE - # - [0x1069960, c, ch/pinkegg] #DONE - # - [0x1069C10, c, ch/croctus] #DONE - # - [0x106A5E0, c, ch/tiptup] #DONE - # - [0x106B3A0, c, ch/choirturtle] #DONE - # - [0x106B790, c, mrvileminigame] - # - [0x106D0E0, c, ch/yumblie] #DONE - # - [0x106D970, c, ch/mrvile] #DONE - # - [0x106EAA0, c, ch/frogminigame] #DONE - # - [0x106F160, c, ch/yellowflibbit] #DONE - # - [0x10709B0, c, ch/mudhut] #DONE - # - [0x1070DD0, c, ch/swampswitch] #DONE - # - [0x1071160, c, bgsspawnqueue] #DONE - # - [0x10713F0, c, ch/tanktup] - # - [0x1071AC0, c, ch/tanktuplegs] #DONE - # - [0x1071C30, c, ch/bigalligator] #DONE - # - [0x1071C90, c, ch/leafboat] #DONE - # - [0x1072610, .data, ch/flibbit] - # - [0x1072640, .data, ch/pinkegg] - # - [0x1072730, .data, ch/croctus] - # - [0x10727B0, .data, ch/tiptup] - # - [0x1072800, .data, ch/choirturtle] - # - [0x10728E0, .data, mrvileminigame] - # - [0x10729C0, .data, ch/yumblie] - # - [0x10729F0, .data, ch/mrvile] - # - [0x1072A30, .data, ch/frogminigame] - # - [0x1072A60, .data, ch/yellowflibbit] - # - [0x1072AA0, .data, crc] - # - [0x1072AB0, .data, ch/mudhut] - # - [0x1072B10, .data, ch/swampswitch] - # - [0x1072BA0, .data, ch/tanktup] - # - [0x1072BD0, .data, ch/tanktuplegs] - # - [0x1072CF0, .data, ch/bigalligator] - # - [0x1072D20, .data, ch/leafboat] - # - [0x1072D50, .rodata, ch/flibbit] - # - [0x1072E60, .rodata, ch/croctus] - # - [0x1072EF0, .rodata, ch/tiptup] - # - [0x1072F60, .rodata, ch/choirturtle] - # - [0x1072F70, .rodata, mrvileminigame] - # - [0x1072F90, .rodata, ch/yumblie] - # - [0x1072FC0, .rodata, ch/mrvile] - # - [0x1073010, .rodata, ch/frogminigame] - # - [0x1073020, .rodata, ch/yellowflibbit] - # - [0x1073110, .rodata, ch/mudhut] - # - [0x1073120, .rodata, ch/swampswitch] - # - [0x1073130, .rodata, ch/tanktup] - # - [0x1073140, .rodata, ch/tanktuplegs] - # - [0x1073150, .rodata, ch/leafboat] - # - [0x10731B0, .bss, checksums] - # - [0x10731B0, .bss, ch/frogminigame] + subsegments: + - [0x0108c790, c, ch/flibbit] #DONE + - [0x0108c790, c, ch/pinkegg] #DONE + - [0x0108c790, c, ch/croctus] #DONE + - [0x0108c790, c, ch/tiptup] #DONE + - [0x0108c790, c, ch/choirturtle] #DONE + - [0x0108c790, c, mrvileminigame] + - [0x0108c790, c, ch/yumblie] #DONE + - [0x0108c790, c, ch/mrvile] #DONE + - [0x0108c790, c, ch/frogminigame] #DONE + - [0x0108c790, c, ch/yellowflibbit] #DONE + - [0x0108c790, c, ch/mudhut] #DONE + - [0x0108c790, c, ch/swampswitch] #DONE + - [0x0108c790, c, bgsspawnqueue] #DONE + - [0x0108c790, c, ch/tanktup] + - [0x0108c790, c, ch/tanktuplegs] #DONE + - [0x0108c790, c, ch/bigalligator] #DONE + - [0x0108c790, c, ch/leafboat] #DONE + - [0x0108c790, .data, ch/flibbit] + - [0x0108c790, .data, ch/pinkegg] + - [0x0108c790, .data, ch/croctus] + - [0x0108c790, .data, ch/tiptup] + - [0x0108c790, .data, ch/choirturtle] + - [0x0108c790, .data, mrvileminigame] + - [0x0108c790, .data, ch/yumblie] + - [0x0108c790, .data, ch/mrvile] + - [0x0108c790, .data, ch/frogminigame] + - [0x0108c790, .data, ch/yellowflibbit] + - [0x0108c790, .data, crc] + - [0x0108c790, .data, ch/mudhut] + - [0x0108c790, .data, ch/swampswitch] + - [0x0108c790, .data, ch/tanktup] + - [0x0108c790, .data, ch/tanktuplegs] + - [0x0108c790, .data, ch/bigalligator] + - [0x0108c790, .data, ch/leafboat] + - [0x0108c790, .rodata, ch/flibbit] + - [0x0108c790, .rodata, ch/croctus] + - [0x0108c790, .rodata, ch/tiptup] + - [0x0108c790, .rodata, ch/choirturtle] + - [0x0108c790, .rodata, mrvileminigame] + - [0x0108c790, .rodata, ch/yumblie] + - [0x0108c790, .rodata, ch/mrvile] + - [0x0108c790, .rodata, ch/frogminigame] + - [0x0108c790, .rodata, ch/yellowflibbit] + - [0x0108c790, .rodata, ch/mudhut] + - [0x0108c790, .rodata, ch/swampswitch] + - [0x0108c790, .rodata, ch/tanktup] + - [0x0108c790, .rodata, ch/tanktuplegs] + - [0x0108c790, .rodata, ch/leafboat] + - [0x0108c790, .bss, checksums] + - [0x0108c790, .bss, ch/frogminigame] - name: RBB dir: RBB - type: bin - start: 0x010975d0 + type: code + start: 0x10975D0 vram: 0x80386DD0 # follows_vram: core2 exclusive_ram_id: overlay - # subsegments: - # - [0x10731B0, c, ch/eggtoll1] - # - [0x10737F0, c, rbbspawnqueue] - # - [0x1073E50, c, code_CA0] - # - [0x1074720, c, code_1570] - # - [0x1075170, c, ch/grimlet] - # - [0x1075990, c, ch/cog] - # - [0x1075C20, c, ch/axle] - # - [0x1076040, c, ch/enginefan] - # - [0x1076660, c, ch/enginefanswitch] - # - [0x1076850, c, ch/propellor] - # - [0x1076E60, c, ch/propellorswitch] - # - [0x10772A0, c, ch/engineparts] - # - [0x1077980, c, ch/whistleswitch] - # - [0x1077E20, c, ch/whistle] - # - [0x1078210, c, ch/whistlectrl] - # - [0x10784A0, c, ch/anchorswitch] - # - [0x1078640, c, ch/dolphin] - # - [0x1078C60, c, ch/anchor] - # - [0x1078DC0, c, ch/anchorctrl] - # - [0x10790C0, c, ch/rarewareflag] - # - [0x1079130, c, ch/bossboombox] - # - [0x107AC10, c, ch/bossboomboxctrl] - # - [0x107ACD0, c, ch/bellbuoy] - # - [0x107B180, c, ch/rowboat] - # - [0x107B6D0, c, ch/boombox] - # - [0x107C820, c, code_9670] - # - [0x107C9F0, c, code_9840] - # - [0x107CBA0, c, propellorctrl] - # - [0x107CE10, .data, ch/eggtoll1] - # - [0x107CE90, .data, rbbspawnqueue] - # - [0x107CFC0, .data, code_CA0] - # - [0x107D030, .data, code_1570] - # - [0x107D140, .data, ch/grimlet] - # - [0x107D170, .data, ch/cog] - # - [0x107D1F0, .data, ch/axle] - # - [0x107D2F0, .data, ch/enginefan] - # - [0x107D470, .data, ch/enginefanswitch] - # - [0x107D4A0, .data, ch/propellor] - # - [0x107D4E0, .data, ch/propellorswitch] - # - [0x107D520, .data, ch/engineparts] - # - [0x107D630, .data, ch/whistleswitch] - # - [0x107D710, .data, ch/whistle] - # - [0x107D810, .data, ch/whistlectrl] - # - [0x107D840, .data, ch/anchorswitch] - # - [0x107D870, .data, ch/dolphin] - # - [0x107D8A0, .data, ch/anchor] - # - [0x107D8D0, .data, ch/anchorctrl] - # - [0x107D900, .data, ch/rarewareflag] - # - [0x107D930, .data, ch/bossboombox] - # - [0x107DAB0, .data, ch/bossboomboxctrl] - # - [0x107DAE0, .data, ch/bellbuoy] - # - [0x107DB10, .data, ch/rowboat] - # - [0x107DB40, .data, ch/boombox] - # - [0x107DBC0, .data, code_9670] - # - [0x107DBF0, .data, code_9840] - # - [0x107DC40, .rodata, rbbspawnqueue] - # - [0x107DC50, .rodata, code_CA0] - # - [0x107DC70, .rodata, code_1570] - # - [0x107DCD0, .rodata, ch/grimlet] - # - [0x107DD30, .rodata, ch/axle] - # - [0x107DD40, .rodata, ch/enginefanswitch] - # - [0x107DD50, .rodata, ch/propellor] - # - [0x107DD70, .rodata, ch/propellorswitch] - # - [0x107DD80, .rodata, ch/whistle] - # - [0x107DD90, .rodata, ch/whistlectrl] - # - [0x107DDB0, .rodata, ch/dolphin] - # - [0x107DE80, .rodata, ch/anchor] - # - [0x107DE90, .rodata, ch/anchorctrl] - # - [0x107DEA0, .rodata, ch/bossboombox] - # - [0x107DF30, .rodata, ch/bellbuoy] - # - [0x107DF60, .rodata, ch/rowboat] - # - [0x107DFB0, .rodata, ch/boombox] - # - [0x107E020, .rodata, code_9670] - # - [0x107E030, .bss, checksums] - # - [0x107E030, .bss, ch/bossboombox] - # - [0x107E030, .bss, ch/boombox] - # - [0x107E030, .bss, ch/boombox] - # - [0x107E030, .bss, code_9670] - # - [0x107E030, .bss, propellorctrl] + subsegments: + - [0x10975D0, c, ch/eggtoll1] + - [0x1097C10, c, rbbspawnqueue] + - [0x1098270, c, code_CA0] + - [0x1098B40, c, code_1570] + - [0x1099590, textbin, ch/grimlet_untouched] #PAL change + - [0x1099DE0, c, ch/cog] + - [0x109A070, c, ch/axle] + - [0x109A490, c, ch/enginefan] + - [0x109AAB0, c, ch/enginefanswitch] + - [0x109ACA0, c, ch/propellor] + - [0x109B2B0, c, ch/propellorswitch] + - [0x109B6F0, c, ch/engineparts] + - [0x109BDD0, c, ch/whistleswitch] + - [0x109C270, c, ch/whistle] + - [0x109C660, c, ch/whistlectrl] + - [0x109C8F0, c, ch/anchorswitch] + - [0x109CA90, c, ch/dolphin] + - [0x109D0B0, c, ch/anchor] + - [0x109D210, c, ch/anchorctrl] + - [0x109D510, c, ch/rarewareflag] + - [0x109D580, textbin, ch/bossboombox_untouched] #PAL change + - [0x109F050, c, ch/bossboomboxctrl] + - [0x109F110, c, ch/bellbuoy] + - [0x109F5C0, c, ch/rowboat] + - [0x109FB10, c, ch/boombox] + - [0x10A0C60, c, code_9670] + - [0x10A0E30, c, code_9840] + - [0x10A0FE0, c, propellorctrl] + - [0x10A1250, .data, ch/eggtoll1] + - [0x10A12C0, .data, rbbspawnqueue] + - [0x10A1400, .data, code_CA0] + - [0x10A1470, .data, code_1570] + - [0x10A1580, databin, ch/grimlet_untouched] + - [0x10A15B0, .data, ch/cog] + - [0x10A1630, .data, ch/axle] + - [0x10A1730, .data, ch/enginefan] + - [0x10A18B0, .data, ch/enginefanswitch] + - [0x10A18E0, .data, ch/propellor] + - [0x10A1920, .data, ch/propellorswitch] + - [0x10A1960, .data, ch/engineparts] + - [0x10A1A70, .data, ch/whistleswitch] + - [0x10A1B50, .data, ch/whistle] + - [0x10A1C50, .data, ch/whistlectrl] + - [0x10A1C80, .data, ch/anchorswitch] + - [0x10A1CB0, .data, ch/dolphin] + - [0x10A1CE0, .data, ch/anchor] + - [0x10A1D10, .data, ch/anchorctrl] + - [0x10A1D40, .data, ch/rarewareflag] + - [0x10A1D70, databin, ch/bossboombox_untouched] + - [0x10A1EF0, .data, ch/bossboomboxctrl] + - [0x10A1F20, .data, ch/bellbuoy] + - [0x10A1F50, .data, ch/rowboat] + - [0x10A1F80, .data, ch/boombox] + - [0x10A2000, .data, code_9670] + - [0x10A2030, .data, code_9840] + - [0x10A2080, .rodata, rbbspawnqueue] + - [0x10A2090, .rodata, code_CA0] + - [0x10A20B0, .rodata, code_1570] + - [0x10A2110, rodatabin, ch/grimlet] + - [0x10A2170, .rodata, ch/axle] + - [0x10A2180, .rodata, ch/enginefanswitch] + - [0x10A2190, .rodata, ch/propellor] + - [0x10A21B0, .rodata, ch/propellorswitch] + - [0x10A21C0, .rodata, ch/whistle] + - [0x10A21D0, .rodata, ch/whistlectrl] + - [0x10A21F0, .rodata, ch/dolphin] + - [0x10A22C0, .rodata, ch/anchor] + - [0x10A22D0, .rodata, ch/anchorctrl] + - [0x10A22E0, .rodata, ch/bossboombox] + - [0x10A2370, .rodata, ch/bellbuoy] + - [0x10A23A0, .rodata, ch/rowboat] + - [0x10A23F0, .rodata, ch/boombox] + - [0x10A2460, .rodata, code_9670] + - [0x10A2470, .bss, checksums] + - [0x10A2470, .bss, ch/bossboombox] + - [0x10A2470, .bss, ch/boombox] + - [0x10A2470, .bss, ch/boombox] + - [0x10A2470, .bss, code_9670] + - [0x10A2470, .bss, propellorctrl] - name: FP dir: FP - type: bin + type: code start: 0x010a2470 vram: 0x80386DD0 # follows_vram: core2 exclusive_ram_id: overlay - # subsegments: - # - [0x107E030, c, ch/scarfsled] #DONE - # - [0x107E500, c, ch/racesled] #DONE - # - [0x107E7C0, c, ch/snowmanbutton] #DONE - # - [0x107EA70, c, ch/xmastree] #DONE - # - [0x107F220, c, ch/boggy1] #DONE - # - [0x107FA10, c, ch/boggyraceflag1] #DONE - # - [0x1080020, c, ch/boggyraceflag2] #DONE - # - [0x1080380, c, ch/boggy2] #DONE - # - [0x1081E30, c, ch/bearcub] #DONE - # - [0x1082430, c, ma/snowy] #DONE - # - [0x1082600, c, ma/snowbutton] #DONE - # - [0x10827A0, c, ma/slalom] #DONE - # - [0x1083CF0, c, ch/twinkly] - # - [0x1084B10, c, ch/twinklybox] #DONE - # - [0x10859B0, c, ch/twinklymuncher] #DONE - # - [0x1086360, c, ch/xmastreeswitch] #DONE - # - [0x1086810, c, ch/xmastreestar] #DONE - # - [0x1086D30, c, ch/present] #DONE - # - [0x1086E50, c, ch/wozza] #DONE - # - [0x1087B40, c, ch/wozzasjig] #DONE - # - [0x1087ED0, c, ch/boggy3] #DONE - # - [0x10881F0, c, code_A1C0] #DONE - # - [0x1088270, c, ch/cavewozza] #DONE - # - [0x1088530, c, ch/xmastreeice] #DONE - # - [0x10888B0, c, ch/xmastreeeggtoll] #DONE - # - [0x1088C00, c, fpspawnqueue] #DONE - # - [0x1089500, c, code_B4D0] #DONE - # - [0x1089630, .data, ch/scarfsled] - # - [0x1089680, .data, ch/racesled] - # - [0x10896D0, .data, ch/snowmanbutton] - # - [0x1089790, .data, ch/xmastree] - # - [0x10897C0, .data, ch/boggy1] - # - [0x1089840, .data, ch/boggyraceflag1] - # - [0x1089880, .data, ch/boggyraceflag2] - # - [0x10898C0, .data, ch/boggy2] - # - [0x1089A30, .data, ch/bearcub] - # - [0x1089AF0, .data, ma/snowy] - # - [0x1089B00, .data, ma/snowbutton] - # - [0x1089B10, .data, ma/slalom] - # - [0x1089B90, .data, ch/twinkly] - # - [0x1089D00, .data, ch/twinklybox] - # - [0x1089FD0, .data, ch/twinklymuncher] - # - [0x108A040, .data, ch/xmastreeswitch] - # - [0x108A0B0, .data, ch/xmastreestar] - # - [0x108A0E0, .data, ch/present] - # - [0x108A160, .data, ch/wozza] - # - [0x108A200, .data, ch/wozzasjig] - # - [0x108A2C0, .data, ch/boggy3] - # - [0x108A300, .data, code_A1C0] - # - [0x108A330, .data, ch/cavewozza] - # - [0x108A370, .data, ch/xmastreeice] - # - [0x108A480, .data, ch/xmastreeeggtoll] - # - [0x108A520, .data, fpspawnqueue] - # - [0x108A7C0, .rodata, ch/scarfsled] - # - [0x108A7D0, .rodata, ch/xmastree] - # - [0x108A830, .rodata, ch/boggy1] - # - [0x108A850, .rodata, ch/boggyraceflag1] - # - [0x108A860, .rodata, ch/boggyraceflag2] - # - [0x108A870, .rodata, ch/boggy2] - # - [0x108A950, .rodata, ch/bearcub] - # - [0x108A970, .rodata, ma/slalom] - # - [0x108A9C0, .rodata, ch/twinkly] - # - [0x108AA40, .rodata, ch/twinklybox] - # - [0x108AA80, .rodata, ch/twinklymuncher] - # - [0x108AAB0, .rodata, ch/xmastreestar] - # - [0x108AAC0, .rodata, ch/wozza] - # - [0x108AB10, .rodata, ch/wozzasjig] - # - [0x108AB30, .rodata, ch/xmastreeice] - # - [0x108AB40, .rodata, ch/xmastreeeggtoll] - # - [0x108AB50, .bss, checksums] - # - [0x108AB50, .bss, ch/boggy2] - # - [0x108AB50, .bss, ma/snowy] - # - [0x108AB50, .bss, ma/snowbutton] - # - [0x108AB50, .bss, ma/slalom] - # - [0x108AB50, .bss, ch/xmastreestar] - # - [0x108AB50, .bss, code_B4D0] + subsegments: + - [0x010a2470, c, ch/scarfsled] #DONE + - [0x010a2470, c, ch/racesled] #DONE + - [0x010a2470, c, ch/snowmanbutton] #DONE + - [0x010a2470, c, ch/xmastree] #DONE + - [0x010a2470, c, ch/boggy1] #DONE + - [0x010a2470, c, ch/boggyraceflag1] #DONE + - [0x010a2470, c, ch/boggyraceflag2] #DONE + - [0x010a2470, c, ch/boggy2] #DONE + - [0x010a2470, c, ch/bearcub] #DONE + - [0x010a2470, c, ma/snowy] #DONE + - [0x010a2470, c, ma/snowbutton] #DONE + - [0x010a2470, c, ma/slalom] #DONE + - [0x010a2470, c, ch/twinkly] + - [0x010a2470, c, ch/twinklybox] #DONE + - [0x010a2470, c, ch/twinklymuncher] #DONE + - [0x010a2470, c, ch/xmastreeswitch] #DONE + - [0x010a2470, c, ch/xmastreestar] #DONE + - [0x010a2470, c, ch/present] #DONE + - [0x010a2470, c, ch/wozza] #DONE + - [0x010a2470, c, ch/wozzasjig] #DONE + - [0x010a2470, c, ch/boggy3] #DONE + - [0x010a2470, c, code_A1C0] #DONE + - [0x010a2470, c, ch/cavewozza] #DONE + - [0x010a2470, c, ch/xmastreeice] #DONE + - [0x010a2470, c, ch/xmastreeeggtoll] #DONE + - [0x010a2470, c, fpspawnqueue] #DONE + - [0x010a2470, c, code_B4D0] #DONE + - [0x010a2470, .data, ch/scarfsled] + - [0x010a2470, .data, ch/racesled] + - [0x010a2470, .data, ch/snowmanbutton] + - [0x010a2470, .data, ch/xmastree] + - [0x010a2470, .data, ch/boggy1] + - [0x010a2470, .data, ch/boggyraceflag1] + - [0x010a2470, .data, ch/boggyraceflag2] + - [0x010a2470, .data, ch/boggy2] + - [0x010a2470, .data, ch/bearcub] + - [0x010a2470, .data, ma/snowy] + - [0x010a2470, .data, ma/snowbutton] + - [0x010a2470, .data, ma/slalom] + - [0x010a2470, .data, ch/twinkly] + - [0x010a2470, .data, ch/twinklybox] + - [0x010a2470, .data, ch/twinklymuncher] + - [0x010a2470, .data, ch/xmastreeswitch] + - [0x010a2470, .data, ch/xmastreestar] + - [0x010a2470, .data, ch/present] + - [0x010a2470, .data, ch/wozza] + - [0x010a2470, .data, ch/wozzasjig] + - [0x010a2470, .data, ch/boggy3] + - [0x010a2470, .data, code_A1C0] + - [0x010a2470, .data, ch/cavewozza] + - [0x010a2470, .data, ch/xmastreeice] + - [0x010a2470, .data, ch/xmastreeeggtoll] + - [0x010a2470, .data, fpspawnqueue] + - [0x010a2470, .rodata, ch/scarfsled] + - [0x010a2470, .rodata, ch/xmastree] + - [0x010a2470, .rodata, ch/boggy1] + - [0x010a2470, .rodata, ch/boggyraceflag1] + - [0x010a2470, .rodata, ch/boggyraceflag2] + - [0x010a2470, .rodata, ch/boggy2] + - [0x010a2470, .rodata, ch/bearcub] + - [0x010a2470, .rodata, ma/slalom] + - [0x010a2470, .rodata, ch/twinkly] + - [0x010a2470, .rodata, ch/twinklybox] + - [0x010a2470, .rodata, ch/twinklymuncher] + - [0x010a2470, .rodata, ch/xmastreestar] + - [0x010a2470, .rodata, ch/wozza] + - [0x010a2470, .rodata, ch/wozzasjig] + - [0x010a2470, .rodata, ch/xmastreeice] + - [0x010a2470, .rodata, ch/xmastreeeggtoll] + - [0x010a2470, .bss, checksums] + - [0x010a2470, .bss, ch/boggy2] + - [0x010a2470, .bss, ma/snowy] + - [0x010a2470, .bss, ma/snowbutton] + - [0x010a2470, .bss, ma/slalom] + - [0x010a2470, .bss, ch/xmastreestar] + - [0x010a2470, .bss, code_B4D0] - name: SM dir: SM - type: bin - start: 0x010aef90 + type: code + start: 0x010AEF90 vram: 0x80386DD0 # follows_vram: core2 exclusive_ram_id: overlay - # subsegments: - # - [0x108AB50, c, code_0] - # - [0x108AC40, c, smspawnqueue] - # - [0x108B100, c, code_5B0] - # - [0x108B740, c, code_BF0] - # - [0x108B8B0, c, ch/attacktutorial] - # - [0x108C070, c, ch/vegetables] - # - [0x108D450, c, code_2900] - # - [0x108D4E0, c, code_2990] - # - [0x108EB10, c, code_3FC0] - # - [0x108EBC0, c, ch/jumptutorial] - # - [0x108F020, c, code_44D0] - # - [0x108F210, c, code_46C0] - # - [0x108F220, .data, code_0] - # - [0x108F240, .data, smspawnqueue] - # - [0x108F250, .data, code_5B0] - # - [0x108F350, .data, code_BF0] - # - [0x108F380, .data, ch/attacktutorial] - # - [0x108F3B0, .data, ch/vegetables] - # - [0x108F6C0, .data, code_2990] - # - [0x108F750, .data, code_3FC0] - # - [0x108F810, .data, ch/jumptutorial] - # - [0x108F840, .data, code_44D0] - # - [0x108F870, .rodata, code_5B0] - # - [0x108F890, .rodata, ch/attacktutorial] - # - [0x108F930, .rodata, ch/vegetables] - # - [0x108F960, .rodata, code_2990] - # - [0x108FA70, .rodata, code_44D0] - # - [0x108FA80, .bss, checksums] - # - [0x108FA80, .bss, smspawnqueue] + subsegments: + - [0x10AEF90, c, code_0] + - [0x10AF080, c, smspawnqueue] + - [0x10AF540, c, code_5B0] + - [0x10AFB80, c, code_BF0] + - [0x10AFCF0, textbin, ch/attacktutorial_untouched] # PAL change + - [0x10B04B0, c, ch/vegetables] + - [0x10B1890, c, code_2900] + - [0x10B1920, textbin, ch/smbottles_untouched] # PAL change + - [0x10B2F50, c, code_3FC0] + - [0x10B3000, c, ch/jumptutorial] + - [0x10B3460, c, code_44D0] + - [0x10B3650, c, code_46C0] + - [0x10B38A0, .data, code_0] + - [0x10B38C0, .data, smspawnqueue] + - [0x10B38D0, .data, code_5B0] + - [0x10B39D0, .data, code_BF0] + - [0x10B3A00, databin, ch/attacktutorial_untouched] + - [0x10B3A30, .data, ch/vegetables] + - [0x10B3D40, .data, ch/smbottles] + - [0x10B3DD0, .data, code_3FC0] + - [0x10B3E90, .data, ch/jumptutorial] + - [0x10B3EC0, .data, code_44D0] + - [0x10B3EF0, .data, code_46C0] + - [0x10B3F10, .rodata, code_5B0] + - [0x10B3F30, rodatabin, ch/attacktutorial_untouched] + - [0x10B3FA0, .rodata, ch/vegetables] + - [0x10B4000, rodatabin, ch/smbottles_untouched] + - [0x10B4110, .rodata, code_44D0] + - [0x10B4120, .rodata, code_46C0] + - [0x10B4170, .bss, checksums] + - [0x10B4170, .bss, code_46C0] - name: cutscenes dir: cutscenes type: code diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 07f4f9f7..4f412920 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -32,340 +32,20 @@ boot_core1_main = core1_main; /* Temporary*/ /* Temporary Correct*/ -func_802BC434 = 0x80000000 | (0xaf0a9 << 2); + ncDynamicCamera_enterFirstPerson = 0x80000000 | (0xaf9d5 << 2); ncDynamicCamera_exitFirstPerson = 0x80000000 | (0xaf9e6 << 2); -ncbadie_func_802BF2C0 = 0x80000000 | (0xafc50 << 2); -ncDynamicCam5_func_802BF590 = 0x80000000 | (0xafd04 << 2); -ncbafly_func_802BFE50 = 0x80000000 | (0xaff34 << 2); -ncbafly_func_802BFE74 = 0x80000000 | (0xaff3d << 2); -ncba1p_setZoomedOutPosition = 0x80000000 | (0xb0a39 << 2); -ncba1p_setZoomedOutRotation = 0x80000000 | (0xb0a43 << 2); -__spawnQueue_add_0 = 0x80000000 | (0xb0e9e << 2); -chJigsawDance_setState = 0x80000000 | (0xb2120 << 2); -func_802D8BE4 = 0x80000000 | (0xb6371 << 2); -func_802DC528 = 0x80000000 | (0xb71c2 << 2); -func_802DC560 = 0x80000000 | (0xb71d0 << 2); -func_802E4048 = 0x80000000 | (0xb908e << 2); -func_802E412C = 0x80000000 | (0xb90c7 << 2); -vtxList_getVertices = 0x80000000 | (0xbb18c << 2); -func_802EDD8C = 0x80000000 | (0xbb7db << 2); -particleEmitter_setSprite = 0x80000000 | (0xbbecc << 2); -particleEmitter_setAccelerationRange = 0x80000000 | (0xbbee3 << 2); -particleEmitter_setFade = 0x80000000 | (0xbbf0f << 2); -particleEmitter_setParticleFramerateRange = 0x80000000 | (0xbbf1f << 2); -particleEmitter_setSpawnPositionRange = 0x80000000 | (0xbbf3f << 2); -particleEmitter_setFinalScaleRange = 0x80000000 | (0xbbf59 << 2); -particleEmitter_setVelocityAndAccelerationRanges = 0x80000000 | (0xbbf99 << 2); -particleEmitter_setSphericalParticleVelocityRange = 0x80000000 | (0xbc03c << 2); -func_802EFF50 = 0x80000000 | (0xbc04c << 2); -particleEmitter_manualFree = 0x80000000 | (0xbc3cd << 2); -partEmitMgr_freeEmitter = 0x80000000 | (0xbc396 << 2); -partEmitMgr_newEmitter = 0x80000000 | (0xbc36c << 2); -func_802F1EC8 = 0x80000000 | (0xbc82a << 2); -fxRipple_802F3554 = 0x80000000 | (0xbcdcd << 2); -fxRipple_802F3584 = 0x80000000 | (0xbcdd9 << 2); -func_802F4094 = 0x80000000 | (0xbd09d << 2); -func_802F4200 = 0x80000000 | (0xbd0f8 << 2); -func_802F4798 = 0x80000000 | (0xbd25e << 2); -func_802F47D0 = 0x80000000 | (0xbd26c << 2); -func_802F487C = 0x80000000 | (0xbd297 << 2); -func_802F4884 = 0x80000000 | (0xbd299 << 2); -func_802F4894 = 0x80000000 | (0xbd29d << 2); -func_802F48B4 = 0x80000000 | (0xbd2a5 << 2); -func_802F48BC = 0x80000000 | (0xbd2a7 << 2); -func_802F48E0 = 0x80000000 | (0xbd2b0 << 2); -func_802F4900 = 0x80000000 | (0xbd2b8 << 2); -func_802F4924 = 0x80000000 | (0xbd2c1 << 2); -func_802F494C = 0x80000000 | (0xbd2cb << 2); -func_802F4978 = 0x80000000 | (0xbd2d6 << 2); -func_802F499C = 0x80000000 | (0xbd2df << 2); -func_802F9DB8 = 0x80000000 | (0xbe7e6 << 2); -mapModel_getBounds = 0x80000000 | (0xc26ce << 2); -level_get_main_map = 0x80000000 | (0xc2bde << 2); -level_get_main_exit = 0x80000000 | (0xc2bf1 << 2); -sfxSource_setCallbackByIndex = 0x80000000 | (0xc37bd << 2); -func_8030DD90 = 0x80000000 | (0xc37cc << 2); -func_8030E04C = 0x80000000 | (0xc387b << 2); -sfxSource_getSampleRate = 0x80000000 | (0xc38d9 << 2); -func_8030E4E4 = 0x80000000 | (0xc39a1 << 2); -func_8030E5F4 = 0x80000000 | (0xc39e5 << 2); -func_8030E3FC = 0x80000000 | (0xc3967 << 2); -func_8030E560 = 0x80000000 | (0xc39c0 << 2); -func_8030E760 = 0x80000000 | (0xc3a40 << 2); -func_8030EAAC = 0x80000000 | (0xc3b13 << 2); -func_8030EB00 = 0x80000000 | (0xc3b28 << 2); -func_8030EBC8 = 0x80000000 | (0xc3b5a << 2); -func_8030EB88 = 0x80000000 | (0xc3b4a << 2); -func_8030EC20 = 0x80000000 | (0xc3b70 << 2); -func_803114D0 = 0x80000000 | (0xc45c7 << 2); -gcpausemenu_returnToLair = 0x80000000 | (0xc53a1 << 2); -func_8031B990 = 0x80000000 | (0xc6f5c << 2); -func_8031F9F4 = 0x80000000 | (0xc7f79 << 2); -func_80324C58 = 0x80000000 | (0xc942a << 2); -timedFunc_set_0 = 0x80000000 | (0xc94bf << 2); -func_8032728C = 0x80000000 | (0xc9db7 << 2); -actor_spawnWithYaw_s16 = 0x80000000 | (0xca1c1 << 2); -func_80330FCC = 0x80000000 | (0xcc507 << 2); -modelbin_getVtxList = 0x80000000 | (0xce966 << 2); -modelRender_func_8033A1FC = 0x80000000 | (0xce993 << 2); -modelRender_setAppendageVisibility = 0x80000000 | (0xcea2b << 2); -func_8033DE30 = 0x80000000 | (0xcf8a0 << 2); -commonParticle_new = 0x80000000 | (0xcfa10 << 2); -item_set = 0x80000000 | (0xd1a19 << 2); -func_80346C10 = 0x80000000 | (0xd1c18 << 2); -func_80346CE8 = 0x80000000 | (0xd1c4e << 2); -func_80354030 = 0x80000000 | (0xd5124 << 2); -func_803541C0 = 0x80000000 | (0xd5188 << 2); -func_803541CC = 0x80000000 | (0xd518b << 2); -func_80354380 = 0x80000000 | (0xd51f8 << 2); -func_80356074 = 0x80000000 | (0xd5935 << 2); - - - -ncCameraNodeList_getRandomCameraNode = 0x802b9ca4; -ncCameraNodeList_getZoomCameraNode = 0x802b9cb8; -ncCameraNodeList_getPivotCameraNode = 0x802b9ccc; -ncCameraNodeList_getNodeType = 0x802b9cfc; -ncCameraNodeList_nodeIsValid = 0x802b9d18; -code33250_func_802BA234 = 0x802ba0a4; -code33310_func_802BA4D0 = 0x802ba340; -code336F0_func_802BA89C = 0x802ba70c; -gcStaticCamera_activate = 0x802bae54; -func_802BB360 = 0x802bb1d0; -func_802BB378 = 0x802bb1e8; -func_802BB3AC = 0x802bb21c; -func_802BB3C4 = 0x802bb234; -func_802BB3DC = 0x802bb24c; -code35520_getDistanceVectors = 0x802bc3a8; -code35520_selectTable = 0x802bc43c; ncDynamicCamera_getState = 0x802bcf3c; ncDynamicCamera_setState = 0x802bcf48; -func_802BD8A4 = 0x802bd718; -func_802BF798 = 0x802bf618; -ncDynamicCam8_func_802BF9B8 = 0x802bf838; +ncDynamicCamera_update = 0x80000000 | (0xAF34D << 2); +ncDynamicCamera_getPosition = 0x80000000 | (0xAF47D << 2); +ncDynamicCamera_getRotation = 0x80000000 | (0xAF486 << 2); +ncDynamicCamera_setPosition = 0x80000000 | (0xAF469 << 2); +ncDynamicCamera_setRotation = 0x80000000 | (0x0AF473 << 2); +ncDynamicCamera_setUpdateEnabled = 0x80000000 | (0xc4 << 2); -func_802C0640 = 0x802c04c0; -func_802C095C = 0x802c07dc; -func_802C189C = 0x802c171c; -func_802C1B20 = 0x802c19a0; -ncDynamicCamA_func_802C1DB0 = 0x802c1c30; -ncDynamicCamA_func_802C1EE0 = 0x802c1d60; - -ncba1p_getZoomedInRotation = 0x802c295c; -ncba1p_getState = 0x802c2980; - -spawnQueue_func_802C3A18 = 0x802C3898; -spawnQueue_flush = 0x802c38b8; -__spawnQueue_add_4 = 0x802c3d84; -spawnQueue_actor_f32 = 0x802c3fc0; -spawnQueue_actor_s16 = 0x802c400c; -gameSelect_getGameNumber = 0x802c5b20; -chjiggy_getJiggyId = 0x802c8248; -func_802C9C14 = 0x802c9dd4; -func_802CA1C4 = 0x802ca384; -func_802CA1CC = 0x802ca38c; -__spawnQueue_add_1 = 0x802c3b08; -chtrainers_canUse = 0x802ca8c8; -chtrainers_getDuration = 0x802ca908; -chtrainers_pickup = 0x802ca910; -mapSpecificFlags_get = 0x802caeb8; -mapSpecificFlags_set = 0x802caf80; -mapSpecificFlags_validateCRC1 = 0x802cb1cc; -func_802D6088 = 0x802d6268; -func_802D60C4 = 0x802d62a4; -func_802D6264 = 0x802d6444; -func_802D686C = 0x802d6a4c; -func_802D6924 = 0x802d6b0c; -chwadingboots_802D6E0C = 0x802d6fec; -chwadingboots_802D6E4C = 0x802d702c; -chwadingboots_802D6E54 = 0x802d7034; -chCollectible_collectEgg = 0x802d8fd0; -chCollectible_collectGoldFeather = 0x802d90bc; -chCollectible_collectRedFeather = 0x802d9048; -chmole_learnedAllSpiralMountainAbilities = 0x802da678; -chOverlayNoController_spawn = 0x802dd1e8; -chOverlayNoController_func_802DD040 = 0x802dd220; -chBottlesBonus_getPuzzleIndex = 0x802de5fc; -chsnacker_setControlState = 0x802e1bf4; -func_802E3580 = 0x802E3770; -dummy_func_802E35D0 = 0x802E37C0; -func_802E35D8 = 0x802E37c8; -game_draw = 0x802E417c; -transitionToMap = 0x802e4268; -func_802E4170 = 0x802E4360; -func_802E4214 = 0x802E4404; -func_802E4384 = 0x802e4574; -func_802E4424 = 0x802E4614; -game_defrag = 0x802e4ac8; -func_802E49E0 = 0x802e4bd0; -getGameMode = 0x802e4bec; -func_802E4A08 = 0x802e4bf8; -func_802E4A98 = 0x802e4c88; -func_802E4AAC = 0x802e4c9c; -func_802E4AC0 = 0x802e4cb0; -func_802E4AD4 = 0x802e4cc4; -func_802E4B38 = 0x802e4d28; -func_802E6820 = 0x802e6a04; -func_802E73C8 = 0x802e75a8; -animMtxList_setBoned = 0x802ea388; -vector_clear = 0x802ed800; -vector_getBegin = 0x802ed80c; -vector_getEnd = 0x802ed8b4; -vector_pushBackNew = 0x802ed8bc; -vector_new = 0x802edaa4; -vector_free = 0x802eda84; -freelist_clear = 0x802edc20; -freelist_at = 0x802edc5c; -freelist_size = 0x802edc74; -freelist_next = 0x802edc84; -freelist_elementIsAlive = 0x802eddf8; -freelist_free = 0x802ede44; -freelist_new = 0x802ede64; -freelist_freeElement = 0x802edebc; -freelist_defrag = 0x802edee0; -func_802EE354 = 0x802ee534; -dustEmitter_emit = 0x802ee8ac; - -particleEmitter_draw = 0x802ef588; -particleEmitter_emitN = 0x802ef7a8; -particleEmitter_free = 0x802ef864; -particleEmitter_new = 0x802ef88c; -particleEmitter_setModel = 0x802efca8; -particleEmitter_func_802EF9F8 = 0x802efbd8; -particleEmitter_func_802EFA18 = 0x802efbf8; -particleEmitter_setPosition = 0x802efd34; -particleEmitter_setStartingScaleRange = 0x802efd50; -particleEmitter_setVelocityAccelerationAndPositionRanges = 0x802eff5c; -particleEmitter_setAngularVelocityRange = 0x802f0004; -particleEmitter_setSpawnIntervalRange = 0x802f003c; -particleEmitter_setParticleLifeTimeRange = 0x802f00a0; -particleEmitter_setParticleVelocityRange = 0x802f00b4; -particleEmitter_update = 0x802f01c4; -partEmitMgr_defragEmitter = 0x802f0f54; - -pem_freeEmitters = 0x802f1474; -fxSparkle_emptyHoneycomb = 0x802f38bc; -fxSparkle_honeycomb = 0x802f391c; -fxSparkle_musicNote = 0x802f397c; -fxSparkle_extraLife = 0x802f3d1c; - -printbuffer_defrag = 0x802f560c; -func_802F9AA8 = 0x802f9c88; -func_802F9F80 = 0x802fa160; -func_802F9FD0 = 0x802fa1b0; -func_802FA060 = 0x802fa240; -func_802FADD4 = 0x802fafb4; - -func_80303F6C = 0x8030410C; -cubeList_findNodePropByActorIdAndPosition_s32 = 0x80304b6c; -nodeprop_findByActorIdAndActorPosition = 0x80304dd8; -nodeprop_findByActorIdAndPosition_f32 = 0x80304e4c; -nodeprop_getPosition_s32 = 0x80304eec; -nodeprop_getPosition = 0x80304f08; -nodeprop_findPositionFromActorId = 0x80304f70; -func_80305248 = 0x803053e8; -func_80305344 = 0x803054e4; -func_80306D40 = 0x80306EE0; -func_803077FC = 0x8030799C; -func_803084F0 = 0x80308690; -func_80309B48 = 0x80309ce8; -func_80309D58 = 0x80309ef8; -propModelList_flush = 0x8030a9f0; -gctransition_done = 0x8030bf38; -gctransition_8030BDC0 = 0x8030bf60; -gctransition_reset = 0x8030c07c; -func_8030C704 = 0x8030c8a4; -scissorBox_setSmall = 0x8030c8b0; -func_8030C77C = 0x8030c91c; -sfxsource_createSfxsourceAndReturnIndex = 0x8030daac; -sfxsource_freeSfxsourceByIndex = 0x8030dbe4; -sfxsource_setSfxId = 0x8030dc20; -sfxsource_setSampleRate = 0x8030dc5c; -sfxsource_playSfxAtVolume = 0x8030dd54; -sfxSource_setunk43_7ByIndex = 0x8030DEB4; -sfxSource_func_8030E2C4 = 0x8030e464; -sfxsource_playHighPriority = 0x8030e624; -func_8030E58C = 0x8030e72c; -func_8030E624 = 0x8030e7c4; -gcsfx_playWithPitch = 0x8030e844; -func_8030E6D4 = 0x8030e874; -func_8030ED70 = 0x8030ef10; -sfxSource_triggerCallbackByIndex = 0x8030e534; -func_803012F8 = 0x803014d8; -fxairscore_count_to_time = 0x80301f5c; -gcdialog_showDialog = 0x803116cc; -gcdialog_hasCurrentTextId = 0x803116fc; -gcpausemenu_80314AC8 = 0x80314e1c; - -func_8031B908 = 0x8031bce8; -func_8031B9D8 = 0x8031bdb8; -func_8031BA7C = 0x8031be5c; -func_8031BA9C = 0x8031be7c; -func_8031C44C = 0x8031c82c; -func_8031C594 = 0x8031c974; -func_8031C59C = 0x8031c97c; -func_8031C5A4 = 0x8031c984; -func_8031C5AC = 0x8031c98c; -floor_getXPosition = 0x8031c9b4; -func_8031C5DC = 0x8031c9bc; -floor_getYPosition = 0x8031c9c4; -func_8031C5EC = 0x8031c9cc; -func_8031C5F4 = 0x8031c9d4; -func_8031C5FC = 0x8031c9dc; -func_8031C608 = 0x8031c9e8; -func_8031C618 = 0x8031c9f8; -func_8031C638 = 0x8031ca18; -fileProgressFlag_get = 0x8032030c; -fileProgressFlag_set = 0x803203f4; -dummy_func_80320240 = 0x80320630; -volatileFlag_get = 0x803207ec; -volatileFlag_getAndSet = 0x80320844; -volatileFlag_set = 0x803208d4; -func_8032056C = 0x8032095C; -func_80320B98 = 0x80320f88; -func_80320C94 = 0x80321084; -func_80320DB0 = 0x803211a0; -func_80320ED8 = 0x803212c8; -jiggyscore_isCollected = 0x803213d0; -jiggyscore_setCollected = 0x8032147c; -jiggyscore_total = 0x8032162c; -honeycombscore_set = 0x80321754; -level_get = 0x80321cf0; -func_8032190C = 0x80321cfc; -func_80321960 = 0x80321d50; -func_803219F4 = 0x80321de4; -levelSpecificFlags_get = 0x803222d4; -levelSpecificFlags_validateCRC1 = 0x8032243c; -func_8032274C = 0x80322b4c; -func_80322758 = 0x80322b58; -func_80323240 = 0x80323690; -func_803246B4 = 0x80324b04; -func_80324DBC = 0x8032520c; -timedFunc_set_1 = 0x80325334; -timedFunc_set_2 = 0x80325370; -timedFunc_set_3 = 0x803253b4; -actor_spawnWithYaw_s32 = 0x80328574; -actor_spawnWithYaw_f32 = 0x80328594; -marker_despawn = 0x8032874c; -marker_getActor = 0x80329db0; -func_8032AD7C = 0x8032b1d4; -func_8032B258 = 0x8032b6b0; -marker_free = 0x8032f880; -func_8032F528 = 0x8032f978; -func_8032F64C = 0x8032fa9c; -func_8032FBE4 = 0x80330034; -marker_callCollisionFunc = 0x80330444; -marker_setCollisionScripts = 0x803304f8; -func_803300B8 = 0x80330508; -func_803306C8 = 0x80330b18; -func_80332790 = 0x80332be0; -func_8033452C = 0x8033497c; -gsworld_getMap = 0x80334d10; -gsworld_getExit = 0x80334d1c; -gsworld_getUnk0 = 0x80334d54; -gsworld_getEnableDraw = 0x80335584; -sfxInstruments_init = 0x80335670; +modelRender_func_8033A1FC = 0x80000000 | (0xce993 << 2); +modelRender_setAppendageVisibility = 0x80000000 | (0xcea2b << 2); modelRender_draw = 0x803395f4; modelRender_setBoneTransformList = 0x8033a688; modelRender_func_8033A280 = 0x8033a6d0; @@ -373,218 +53,358 @@ modelRender_setPreDrawCallback = 0x8033a724; modelRender_setEnvColor = 0x8033a7d8; modelRender_setRefPoints = 0x8033a8a0; modelRender_setDepthMode = 0x8033a91c; -boneTransformList_free = 0x8033ab40; -boneTransformList_new = 0x8033ab60; -boneTransformList_interpolate = 0x8033aba0; -boneTransformList_defrag = 0x8033ae34; -animationFile_getBoneTransformList = 0x8033AEA0; -boneTransformList_reset = 0X8033A960; -boneTransformList_setBoneScale = 0x8033ad78; -func_8033A968 = 0x8033adb8; -assetcache_release = 0x8033b828; -assetcache_update_ptr = 0x8033b9c4; -func_8033B61C = 0x8033ba6c; -func_8033B788 = 0x8033bbd8; -assetcache_get = 0x8033bbe8; -assetCache_init = 0x8033bfd4; -func_8033BD6C = 0x8033C1BC; -func_8033BD8C = 0x8033c1dc; -savedata_8033CA9C = 0x8033ceec; -savedata_8033CE40 = 0x8033d15c; -func_8033D2F4 = 0x8033d744; -func_8033D410 = 0x8033d860; -collision_getPlayerInteraction = 0x8033d9b4; -collision_getNextState = 0x8033d9c4; -collision_getDamageToPlayer = 0x8033d9e4; -collision_getHitsToTrigger = 0x8033d9f4; -time_setDeltaReal_frames = 0x8033e154; -time_getDeltaReal_frames = 0x8033e1e0; -time_getDelta = 0x8033e1ec; -allocUnusedBlock = 0x8033f3a8; -func_8033EFB0 = 0x8033f400; -__assert = 0x8033f450; -item_inc = 0x80346374; -item_dec = 0x80346394; -item_empty = 0x803463c4; -item_getCount = 0x803463f0; -item_adjustByDiffWithHud = 0x80346824; -item_adjustByDiffWithoutHud = 0x80346844; -carriedobj_actorId2ItemId = 0x80347144; +modelRender_setVertexList = 0x80000000 | (0xCEA44 << 2); +modelRender_geoCmd_Unk0 = 0x803388F8; +modelRender_geoCmd_SORT = 0x80338A0C; +modelRender_geoCmd_BONE = 0x80338C48; +modelRender_geoCmd_LOADDL = 0x80338D54; +modelRender_geoCmd_NOP = 0x803388E8; +modelRender_geoCmd_SKINNING = 0x80338DC0; +modelRender_geoCmd_CALL = 0x80338F14; +modelRender_geoCmd_LOADDL2 = 0x80338F38; +modelRender_geoCmd_LOD = 0x80338FA0; +modelRender_geoCmd_REFPOINT = 0x8033904C; +modelRender_geoCmd_SELECTOR = 0x80339120; +modelRender_geoCmd_DRAWDIST = 0x8033921C; +modelRender_geoCmd_UnkE = 0x80339308; +modelRender_geoCmd_CAMERA = 0x803394EC; +modelRender_geoCmd_TEXWRAP = 0x80338BDC; +modelRender_setAlpha = 0x80000000 | (0xCEA18 << 2); +modelRender_func_8033A170 = 0x80000000 | (0xCE970 << 2); +modelRender_func_8033A308 = 0x80000000 | (0xCE9D6 << 2); +modelRender_func_8033A244 = 0x80000000 | (0xCE9A5 << 2); +modelRender_func_8033A28C = 0x80000000 | (0xCE9B7 << 2); +modelRender_setAnimatedTexturesCacheId = 0x80000000 | (0xCEA39 << 2); +modelRender_reset = 0x80000000 | (0xCE1F8 << 2); +modelRender_setPrimAndEnvColors = 0x80000000 | (0xCE9E1 << 2); +modelRender_defrag = 0x80000000 | (0xCEA4A << 2); +modelRender_free = 0x80000000 | (0xCE973 << 2); +modelRender_init = 0x80000000 | (0xCE97D << 2); +modelRender_setPostDrawCallback = 0x80000000 | (0xCE9CE << 2); + +modelbin_getVtxList = 0x80000000 | (0xce966 << 2); +modelbin_getCollisionList = 0x80000000 | (0xCE935 << 2); +modelbin_getTextureList = 0x80000000 | (0xCE955 << 2); +modelbin_getMeshList = 0x80000000 | (0xCE940 << 2); +modelbin_getUnk14List = 0x80000000 | (0xCE95F << 2); +modelbin_getAnimTextureList = 0x80000000 | (0xCE958 << 2); +modelbin_getAnimationList = 0x80000000 | (0x0 << 2); + +marker_despawn = 0x8032874c; +marker_getActor = 0x80329db0; +marker_free = 0x8032f880; +marker_callCollisionFunc = 0x80330444; +marker_setCollisionScripts = 0x803304f8; +marker_setFreeMethod = 0x80000000 | (0xCC14A << 2); +marker_loadModelBin = 0x80000000 | (0xCC3DB << 2); +marker_getActorAndRotation = 0x80000000 | (0xC95D4 << 2); + +actor_spawnWithYaw_f32 = 0x80328594; +actor_draw = 0x80325CD8; +actor_collisionOn = 0x80000000 | (0xCABB8 << 2); +actor_collisionOff = 0x80000000 | (0xCABB3 << 2); +actor_update_func_80326224 = 0x80000000 | (0xC999D << 2); +actor_playAnimationOnce = 0x80000000 | (0xCA741 << 2); +actor_animationIsAt = 0x80000000 | (0xCA331 << 2); +actor_drawFullDepth = 0x80000000 | (0xC98B2 << 2); +actor_new = 0x80327748; +actor_loopAnimation = 0x80000000 | (0xCA74C << 2); +actor_setOpacity = 0x80000000 | (0xC99B7 << 2); +actor_predrawMethod = 0x803257F0; +actor_postdrawMethod = 0x80325BE4; +actor_spawnWithYaw_s16 = 0x80000000 | (0xca1c1 << 2); +actor_spawnWithYaw_s32 = 0x80328574; +actor_spawnWithYaw_f32 = 0x80328594; +actor_draw = 0x80325CD8; +actor_collisionOn = 0x80000000 | (0xCABB8 << 2); +actor_collisionOff = 0x80000000 | (0xCABB3 << 2); +actor_update_func_80326224 = 0x80000000 | (0xC999D << 2); +actor_playAnimationOnce = 0x80000000 | (0xCA741 << 2); +actor_animationIsAt = 0x80000000 | (0xCA331 << 2); +actor_new = 0x80327748; +actor_loopAnimation = 0x80000000 | (0xCA74C << 2); +actor_setOpacity = 0x80000000 | (0xC99B7 << 2); +actor_predrawMethod = 0x803257F0; +actor_postdrawMethod = 0x80325BE4; + +gsworld_getMap = 0x80334d10; +gsworld_getExit = 0x80334d1c; +gsworld_getUnk0 = 0x80334d54; +gsworld_getEnableDraw = 0x80335584; +gsworld_setEnableUpdate = 0x80000000 | (0xCD558 << 2); +gsworld_setEnableDraw = 0x80000000 | (0xCD55E << 2); +gsworld_update = 0x80000000 | (0xCD4C7 << 2); +gsworld_set = 0x80000000 | (0xCD3DC << 2); +gsworld_free = 0x80000000 | (0xCD358 << 2); +gsworld_draw = 0x80000000 | (0xCD264 << 2); +gsworld_setUnk0 = 0x80000000 | (0xCD49B << 2); + +actorArray_findActorFromActorId = 0x80000000 | (0xC9CCF << 2); +actorArray_findClosestActorFromActorId = 0x80000000 | (0xC9C6E << 2); +actorArray_defrag = 0x80000000 | (0xCACFB << 2); +actorArray_findJiggyActors = 0x80000000 | (0xC9D04 << 2); +actorArray_free = 0x80000000 | (0xC995D << 2); + +subaddie_set_state_with_direction = 0x80000000 | (0xCA3F9 << 2); +subaddie_set_state = 0x80000000 | (0xCA3B7 << 2); +subaddie_playerIsWithinSphere = 0x80000000 | (0xCA678 << 2); +subaddie_playerIsWithinSphereAndActive = 0x80000000 | (0xCA662 << 2); +subaddie_set_state_forward = 0x80000000 | (0xCA3C8 << 2); +subaddie_turnToYaw = 0x80000000 | (0xCA502 << 2); +subaddie_getYawToPlayer = 0x80000000 | (0xCA6F7 << 2); +subaddie_maybe_set_state_position_direction = 0x80000000 | (0xCA40B << 2); +subaddie_maybe_set_state = 0x80000000 | (0xCA3E4 << 2); +subaddie_set_ideal_yaw = 0x80000000 | (0xCA42F << 2); +subaddie_playerIsWithinCylinder = 0x80000000 | (0xCA6C4 << 2); +subaddie_set_state_looped = 0x80000000 | (0xCA3D1 << 2); +subaddie_getLinkedActor = 0x80000000 | (0xCA776 << 2); + +mapModel_setEnvColor = 0x80000000 | (0xC2908 << 2); +mapModel_getModel = 0x80000000 | (0xC2639 << 2); +mapModel_defrag = 0x80000000 | (0xC290E << 2); +mapModel_getCubeBounds = 0x80000000 | (0xC2653 << 2); +mapModel_getFloorY = 0x80000000 | (0xC2631 << 2); + +fxairscore_new = 0x8030197C; +fxairscore_update = 0x80301F8C; +fxairscore_draw = 0x803019B0; +fxairscore_free = 0x80301934; +fxairscore_count_to_time = 0x80301f5c; +fxairscore_time_to_count = 0x80000000 | (0xC07C1 << 2); + +actors_appendToSavestate = 0x80000000 | (0xCA845 << 2); +actors_applyFromSavestate = 0x80000000 | (0xCA93D << 2); + +func_80329904 = 0x80329D5C; +chJigsawDance_setState = 0x80000000 | (0xb2120 << 2); +mapModel_getBounds = 0x80000000 | (0xc26ce << 2); +func_803114D0 = 0x80000000 | (0xc45c7 << 2); +gcpausemenu_returnToLair = 0x80000000 | (0xc53a1 << 2); +func_8032728C = 0x80000000 | (0xc9db7 << 2); +func_8031F9F4 = 0x80000000 | (0xc7f79 << 2); +func_802BD8A4 = 0x802bd718; +func_802D686C = 0x802d6a4c; +gameSelect_getGameNumber = 0x802c5b20; +chjiggy_getJiggyId = 0x802c8248; +chBottlesBonus_getPuzzleIndex = 0x802de5fc; +func_802D6264 = 0x802d6444; +func_802D6088 = 0x802d6268; +func_802E6820 = 0x802e6a04; +func_802D60C4 = 0x802d62a4; +func_802D6924 = 0x802d6b0c; +gcdialog_showDialog = 0x803116cc; +gcdialog_hasCurrentTextId = 0x803116fc; +gcpausemenu_80314AC8 = 0x80314e1c; +func_80309B48 = 0x80309ce8; +func_80309D58 = 0x80309ef8; +func_8033452C = 0x8033497c; +func_8032AD7C = 0x8032b1d4; +func_8032B258 = 0x8032b6b0; demo_readInput = 0x8034a334; -vec3fArray_clearValues = 0x8034a580; -vec3fArray_get_vec3f = 0x8034a5c4; -vec3fArray_free = 0x8034a6f8; -vec3fArray_new = 0x8034a718; -vec3fArray_defrag = 0x8034a798; -randf = 0x8034a7e0; -randf2 = 0x8034ABA4; -randi2 = 0x8034AC0C; func_8034B9BC = 0x8034be20; func_8034BB48 = 0x8034bfac; -func_8034C630 = 0x8034ca90; -func_8034E698 = 0x8034eaf8; -func_80352CF4 = 0x80353154; - -progressDialog_showDialogMaskZero = 0x803568ac; -progressDialog_showDialogMaskFour = 0x803568cc; -progressDialog_setAndTriggerDialog_4 = 0x803569a0; - -func_80320EB0 = 0x80000000 | (0xC84A8 << 2); -func_802BEA4C = 0x80000000 | (0xAFA33 << 2); -camera_setType = 0x80000000 | (0xAEEB2 << 2); -timedFuncQueue_is_empty = 0x80000000 | (0xC954B << 2); func_802BE720 = 0x80000000 | (0xAF967 << 2); -timedFunc_set_6 = 0x80000000 | (0xC9526 << 2); -timedFuncQueue_flush = 0x80000000 | (0xC9555 << 2); -func_802E4AE8 = 0x80000000 | (0xB9336 << 2); -func_802E4AFC = 0x80000000 | (0xB933B << 2); -func_802E4B10 = 0x80000000 | (0xB9340 << 2); -func_802E4B24 = 0x80000000 | (0xB9345 << 2); -nodeprop_getScale = 0x80000000 | (0xC13D6 << 2); -nodeProp_getYaw = 0x80000000 | (0xC13D2 << 2); -gctransition_active = 0x80000000 | (0xC2FD3 << 2); -gctransition_8030BD88 = 0x80000000 | (0xC2FCA << 2); -coords_func_8033EAF8 = 0x80000000 | (0xCFBD2 << 2); -ncRandomCamera_end = 0x80000000 | (0xAFAE0 << 2); -ncRandomCamera_init = 0x80000000 | (0xAFAB8 << 2); -func_802BEE2C = 0x80000000 | (0xAFB2B << 2); -func_802BEBE8 = 0x80000000 | (0xAFA9A << 2); -func_802BEAAC = 0x80000000 | (0xAFA4B << 2); -func_802BE940 = 0x80000000 | (0xAF9F0 << 2); func_802BCBD4 = 0x80000000 | (0xAF291 << 2); -func_802BEF78 = 0x80000000 | (0xAFB7E << 2); func_802BCD30 = 0x80000000 | (0xAF2E8 << 2); -func_802BEF70 = 0x80000000 | (0xAFB7C << 2); -ncDynamicCamera_update = 0x80000000 | (0xAF34D << 2); -ncRandomCamera_update = 0x80000000 | (0xAFAEC << 2); -func_802BEFB0 = 0x80000000 | (0xAFB8C << 2); func_80328230 = 0x80000000 | (0xCA1A2 << 2); -func_80347A14 = 0x80000000 | (0xD1F99 << 2); func_802BE794 = 0x80000000 | (0xAF984 << 2); func_802BE894 = 0x80000000 | (0xAF9C4 << 2); -__spawnQueue_add_2 = 0x80000000 | (0xB0EEF << 2); -func_80342038 = 0x80000000 | (0xD0922 << 2); -func_803243D0 = 0x80000000 | (0xC9208 << 2); -func_80323540 = 0x80000000 | (0xC8E64 << 2); -func_80323F74 = 0x80000000 | (0xC90F1 << 2); func_8033451C = 0x80000000 | (0xCD25B << 2); func_80334524 = 0x80000000 | (0xCD25D << 2); -func_80341EC4 = 0x80000000 | (0xD08C5 << 2); +jiggy_spawn = 0x80000000 | (0xCCD44 << 2); +func_80325340 = 0x80000000 | (0xC95E4 << 2); +func_803292E0 = 0x80000000 | (0xCA5CE << 2); +func_80329934 = 0x80000000 | (0xCA763 << 2); +func_80329210 = 0x80000000 | (0xCA59A << 2); +func_80326310 = 0x80000000 | (0xC99D8 << 2); +func_802D3CE8 = 0x80000000 | (0xB4FAA << 2); +func_802D3D74 = 0x80000000 | (0xB4FCD << 2); +chMMMBreakableWooden_update = 0x802D3F14; +func_80325F84 = 0x803263D4; +D_80366CD0 = 0x80367150; +D_8038AAC0 = 0x8038B6E0; +D_8038AAD0 = 0x8038B6F0; +func_802BD780 = 0x80000000 | (0xAF57C << 2); +func_8031D04C = 0x80000000 | (0xC750B << 2); +func_8031CD20 = 0x80000000 | (0xC7440 << 2); +func_8031CE28 = 0x80000000 | (0xC7482 << 2); +GV_func_80387960 = 0x80388340; +chMinigame_update = 0x8031AD94; +chflotsam_update = 0x8035CD6C; +chflotsam_draw = 0x8035CB94; +func_802BE244 = 0x80000000 | (0xAF830 << 2); +func_802BE230 = 0x80000000 | (0xAF82B << 2); +func_802BD8D4 = 0x80000000 | (0xAF5D2 << 2); +func_802BE190 = 0x80000000 | (0xAF802 << 2); +func_802BE60C = 0x80000000 | (0xAF922 << 2); +func_802BC84C = 0x80000000 | (0xAF1AF << 2); +func_802BE6FC = 0x80000000 | (0xAF95E << 2); +func_802BD904 = 0x80000000 | (0xAF5DE << 2); +func_802BD51C = 0x80000000 | (0xAF4E3 << 2); +func_802BD870 = 0x80000000 | (0xAF5B9 << 2); +func_802BD4C0 = 0x80000000 | (0xAF4CC << 2); +func_802BD720 = 0x80000000 | (0xAF564 << 2); +func_802BD3CC = 0x80000000 | (0xAF48F << 2); +func_802BE834 = 0x80000000 | (0xAF9AC << 2); +func_802BDB30 = 0x80000000 | (0xAF669 << 2); +func_802BD82C = 0x80000000 | (0xAF5A8 << 2); +func_802BCE0C = 0x80000000 | (0xAF31F << 2); +func_802BDCE0 = 0x80000000 | (0xAF6D5 << 2); +func_802BDE88 = 0x80000000 | (0xAF73F << 2); +func_802BD840 = 0x80000000 | (0xAF5AD << 2); +func_80328CEC = 0x80000000 | (0xCA451 << 2); +func_80329480 = 0x80000000 | (0xCA636 << 2); +func_80329078 = 0x80000000 | (0xCA534 << 2); +func_80328FF0 = 0x80000000 | (0xCA512 << 2); +debugScoreStates = 0x80000000 | (0xC7FFA << 2); +clearScoreStates = 0x80000000 | (0xC7FE4 << 2); +func_803110F8 = 0x80000000 | (0xC44B5 << 2); +func_80329260 = 0x80000000 | (0xCA5AE << 2); +func_80329140 = 0x80000000 | (0xCA566 << 2); -particleEmitter_func_802EFA20 = 0x80000000 | (0xBBF00 << 2); -func_802EFC28 = 0x80000000 | (0xBBF82 << 2); -particleEmitter_setAlpha = 0x80000000 | (0xBBEF1 << 2); -func_802EFF5C = 0x80000000 | (0xBC04F << 2); -func_802EFF7C = 0x80000000 | (0xBC057 << 2); -func_802EFF9C = 0x80000000 | (0xBC05F << 2); -particleEmitter_setSfx = 0x80000000 | (0xBBEF3 << 2); -particleEmitter_setDrawMode = 0x80000000 | (0xBBF14 << 2); -func_80343DEC = 0x80000000 | (0xD108F << 2); -codeA5BC0_getPositionAndSelectorOrRadius = 0x80000000 | (0xCC4F9 << 2); -func_8034C528 = 0x80000000 | (0xD3262 << 2); -func_8034DEB4 = 0x80000000 | (0xD38C5 << 2); - - -D_803727F4 = 0x80372d74; -gChecksumsCore2 = 0x8037A560; D_8037DCCA = 0x8037e69a; D_8037DCCB = 0x8037e69b; D_8037DCCC = 0x8037e69c; -core2_TEXT_END = 0x80363a00; -core2_DATA_START = 0x80363a00; -core2_RODATA_END = 0x8037A560; -core2_BSS_START = 0x8037A560; -core2_BSS_END = 0x80386dd0; -core2_VRAM_END = 0x80386dd0; +leveloverlay_getOverlayFromLevel = 0x80000000 | (0xC8CBB << 2); +rbb_propellorCtrl_reset = 0x80000000 | (0xE4246 << 2); +rbb_propellorCtrl_stop = 0x80000000 | (0xE423A << 2); +rbb_propellorCtrl_update = 0x80000000 | (0xE425C << 2); +mm_resetHuts = 0x80000000 | (0xE1D9C << 2); +chTreasurehunt_resetProgress = 0x80000000 | (0xE2A19 << 2); +func_802D6114 = 0x80000000 | (0xB58BD << 2); +func_80309DBC = 0x80000000 | (0xC27D7 << 2); +gameSelect_saveAndExit = 0x80000000 | (0xB16A1 << 2); +gcpausemenu_80314B24 = 0x80000000 | (0xC539E << 2); +func_802D4608 = 0x80000000 | (0xB51F2 << 2); +chBottlesBonus_func_802DEA8C = 0x80000000 | (0xB7B1F << 2); +func_802DF11C = 0x80000000 | (0xB7CC3 << 2); +chBottlesBonus_spawn = 0x80000000 | (0xB7B02 << 2); +func_802DF090 = 0x80000000 | (0xB7CA0 << 2); +gcquiz_defrag = 0x80000000 | (0xC6A21 << 2); +gczoombox_defrag = 0x80000000 | (0xC63EF << 2); +spawn_child_actor = 0x80000000 | (0xCA179 << 2); +func_802E5F68 = 0x80000000 | (0xB9853 << 2); +warp_mmmEnterLoggo = 0x80000000 | (0xC7EF1 << 2); +func_803255FC = 0x80000000 | (0xC9693 << 2); +code_4C020_setHourglassTimer = 0x80000000 | (0xB5AB4 << 2); +func_802D4A9C = 0x80000000 | (0xB5317 << 2); +suSetSpriteScale = 0x80000000 | (0xCABAC << 2); +fxTouchSparkle_draw = 0x80325D84; +func_8032994C = 0x80000000 | (0xCA769 << 2); +func_803294F0 = 0x80000000 | (0xCA652 << 2); +func_8032863C = 0x80000000 | (0xCA2A5 << 2); +func_80328A2C = 0x80000000 | (0xCA3A1 << 2); +func_80329030 = 0x80000000 | (0xCA522 << 2); +func_803294B4 = 0x80000000 | (0xCA643 << 2); +func_80329878 = 0x80000000 | (0xCA734 << 2); +maSlalom_isActive = 0x80000000 | (0xE3260 << 2); +func_803296D8 = 0x80000000 | (0xCA6CC << 2); +maCastle_hasBanjoKazooieCodeBeenEntered = 0x80000000 | (0xE2FCC << 2); +func_80309B24 = 0x80000000 | (0xC2731 << 2); +func_8032BB88 = 0x80000000 | (0xCAFF8 << 2); +func_803115C4 = 0x80000000 | (0xC4604 << 2); +func_80329054 = 0x80000000 | (0xCA52B << 2); +func_80326244 = 0x80000000 | (0xC99A5 << 2); +gcdialog_showDialogConditional = 0x80000000 | (0xC44ED << 2); +func_8032BBE8 = 0x80000000 | (0xCB010 << 2); +func_803262B8 = 0x80000000 | (0xC99C2 << 2); +func_802E67AC = 0x80000000 | (0xB9A64 << 2); +func_802E67C4 = 0x80000000 | (0xB9A6A << 2); +func_802E5F10 = 0x80000000 | (0xB9840 << 2); +cutscenetrigger_update = 0x80000000 | (0xC7318 << 2); +func_803262E4 = 0x80000000 | (0xC99CD << 2); +func_80326894 = 0x80000000 | (0xC9B39 << 2); +func_803297FC = 0x80000000 | (0xCA715 << 2); +func_80328CA8 = 0x80000000 | (0xCA440 << 2); +func_8032944C = 0x80000000 | (0xCA629 << 2); +func_803257B4 = 0x80000000 | (0xC9701 << 2); +func_802D6A38 = 0x80000000 | (0xB5B08 << 2); +func_80334448 = 0x80000000 | (0xCD226 << 2); +func_8038685C = 0x80000000 | (0xE1C8F << 2); +func_8038E178 = 0x80000000 | (0xE3AD6 << 2); +rubeeEggPot_getEggGoal = 0x80000000 | (0xE3AD9 << 2); +rubeeEggPot_addedEggToPot = 0x80000000 | (0xE3AC8 << 2); +func_8038E344 = 0x80000000 | (0xE3B49 << 2); +func_8038E2FC = 0x80000000 | (0xE3B37 << 2); +func_8034BDA4 = 0x80000000 | (0xD3082 << 2); +func_8032BC18 = 0x80000000 | (0xCB01C << 2); +func_802E5F38 = 0x80000000 | (0xB984A << 2); +func_8034B940 = 0x80000000 | (0xD2F69 << 2); +func_8034B8C0 = 0x80000000 | (0xD2F44 << 2); +func_8034BB90 = 0x80000000 | (0xD2FFD << 2); +maSnowy_decRemaining = 0x80000000 | (0xE2CD6 << 2); +maSnowy_incTotal = 0x80000000 | (0xE2CDC << 2); +func_8038DD14 = 0x80000000 | (0xE39BD << 2); +preventSnowmanAttack = 0x80000000 | (0xE39C5 << 2); +chjiggy_setJiggyId = 0x80000000 | (0xB209D << 2); +chLeaky_eggCollision = 0x80000000 | (0xE2751 << 2); +func_80326C24 = 0x80000000 | (0xC9C1D << 2); +func_8032ACA8 = 0x80000000 | (0xCAC40 << 2); +func_8032AB84 = 0x80000000 | (0xCABF7 << 2); +func_80325760 = 0x80325BB0; -MMM_VRAM = 0x80386dd0; -MMM_VRAM_END = 0x8038cf10; -MMM_ROM_START = 0x0107bb30; -MMM_ROM_END = 0x01081c00; -MMM_TEXT_START = 0x80386dd0; -MMM_TEXT_END = 0x8038c3c0; -MMM_DATA_START = 0x8038c3c0; -MMM_RODATA_END = 0x8038cea0; -MMM_BSS_START = 0x8038cea0; -MMM_BSS_END = 0x8038cf10; +gcdialog_draw = 0x80000000 | (0xC3D6C << 2); +gcdialog_defrag = 0x80000000 | (0xC463A << 2); +gcpausemenu_draw = 0x80000000 | (0xC519D << 2); +gcpausemenu_free = 0x80000000 | (0xC468E << 2); +gcpausemenu_init = 0x80000000 | (0xC4B80 << 2); +gcpausemenu_80314B00 = 0x80000000 | (0xC5395 << 2); +gcPauseMenu_update = 0x80000000 | (0xC4DAD << 2); +gcpausemenu_defrag = 0x80000000 | (0xC4664 << 2); +gcparade_8031ABF8 = 0x80000000 | (0xC6BEA << 2); +gcparade_8031ABA0 = 0x80000000 | (0xC6BD4 << 2); +gcparade_8031B4CC = 0x80000000 | (0xC6E2B << 2); -GV_VRAM = 0x80386dd0; -GV_VRAM_END = 0x803924f0; -GV_ROM_START = 0x01070500; -GV_ROM_END = 0x0107bb30; -GV_TEXT_START = 0x80386dd0; -GV_TEXT_END = 0x803915b0; -GV_DATA_START = 0x803915b0; -GV_RODATA_END = 0x80392400; -GV_BSS_START = 0x80392400; -GV_BSS_END = 0x803924f0; - -TTC_VRAM = 0x80386dd0; -TTC_VRAM_END = 0x8038e120; -TTC_ROM_START = 0x01081c00; -TTC_ROM_END = 0x01088f00; -TTC_TEXT_START = 0x80386dd0; -TTC_TEXT_END = 0x8038CD90; -TTC_DATA_START = 0x8038CD90; -TTC_RODATA_END = 0x8038E0D0; -TTC_BSS_START = 0x8038E0D0; -TTC_BSS_END = 0x8038e120; - -MM_VRAM = 0x80386dd0; -MM_VRAM_END = 0x8038a680; -MM_ROM_START = 0x01088f00; -MM_ROM_END = 0x0108c790; -MM_TEXT_START = 0x80386dd0; -MM_TEXT_END = 0x8038a270; -MM_DATA_START = 0x8038a270; -MM_RODATA_END = 0x8038a660; -MM_BSS_START = 0x8038a660; -MM_BSS_END = 0x8038a680; - -BGS_VRAM = 0x80386DD0; -BGS_TEXT_START = 0x80386DD0; -BGS_ROM_START = 0x0108c790; -BGS_TEXT_END = 0x80391070; -BGS_DATA_START = 0x80391070; -BGS_RODATA_END = 0x80391C10; -BGS_BSS_START = 0x80391C10; -BGS_BSS_END = 0x80391C30; -BGS_VRAM_END = 0x80391C30; -BGS_ROM_END = 0x010975d0; - -RBB_VRAM = 0x80386DD0; -RBB_VRAM_END = 0x80391cd0; -RBB_ROM_START = 0x010975d0; -RBB_ROM_END = 0x010a2470; -RBB_TEXT_START = 0x80386DD0; -RBB_TEXT_END = 0x80390a50; -RBB_DATA_START = 0x80390a50; -RBB_RODATA_END = 0x80391c70; -RBB_BSS_START = 0x80391c70; -RBB_BSS_END = 0x80391cd0; - -FP_VRAM = 0x80386dd0; -FP_VRAM_END = 0x80393fd0; -FP_ROM_START = 0x010a2470; -FP_ROM_END = 0x010aef90; -FP_TEXT_START = 0x80386dd0; -FP_TEXT_END = 0x803923d0; -FP_DATA_START = 0x803923d0; -FP_RODATA_END = 0x803938f0; -FP_BSS_START = 0x803938f0; -FP_BSS_END = 0x80393fd0; - -SM_VRAM = 0x80386dd0; -SM_VRAM_END = 0x8038c010; -SM_ROM_START = 0x010aef90; -SM_ROM_END = 0x010b4170; -SM_TEXT_START = 0x80386dd0; -SM_TEXT_END = 0x8038b6e0; -SM_DATA_START = 0x8038b6e0; -SM_RODATA_END = 0x8038bfb0; -SM_BSS_START = 0x8038bfb0; -SM_BSS_END = 0x8038c010; +chmumbo_func_802D1724 = 0x80000000 | (0xB4639 << 2); +func_80325F8C = 0x80000000 | (0xC98F7 << 2); +gameSelect_banjoSleeping = 0x803662e0; +gameSelect_banjoGameboy = 0x80366334; +gameSelect_banjoCooking = 0x80366388; +chBottlesBonus_new = 0x802DED08; +func_8032A5F8 = 0x80000000 | (0xCAA94 << 2); +func_803268B4 = 0x80000000 | (0xC9B41 << 2); +func_803283BC = 0x80000000 | (0xCA205 << 2); +func_803283D4 = 0x80000000 | (0xCA20B << 2); +GV_func_80387118 = 0x80000000 | (0xE1EBE << 2); +BGS_func_803885DC = 0x80000000 | (0xE23EF << 2); +lair_func_8038A0C4 = 0x80000000 | (0x0E2AA9 << 2); +fight_addSpawnableActors = 0x80000000 | (0xE1B74 << 2); +SM_resetSpawnableActors = 0x80000000 | (0xE1C7C << 2); +GV_func_8038F154 = 0x80000000 | (0xE3ECD << 2); +code26D0_resetSpawnableActorsForTTC = 0x80000000 | (0xE2528 << 2); +MM_func_803888B0 = 0x80000000 | (0xE24A4 << 2); +bgs_updateSpawnableActors = 0x80000000 | (0xE3EF0 << 2); +RBB_func_80386C48 = 0x80000000 | (0xE1D8A << 2); +FP_func_80391324 = 0x80000000 | (0xE4741 << 2); +chBottlesBonusCursor_func_802E06B4 = 0x80000000 | (0xB8229 << 2); +chBottlesBonusCursor_update = 0x802DFC24; +chMumbo_update = 0x802D1EB0; +chMumbo_draw = 0x802D2B24; +chjiggy_update = 0x802C7F1C; +chjiggy_update_2 = 0x802C7EF4; +chjiggy_draw = 0x802C7E68; +chMumbosHandWithPicture_update = 0x802DF00C; +chMumbosHandWithPicture_draw = 0x802DEDF0; +chBottlesBonus_update = 0x802DE6B4; +chBottlesBonus_draw = 0x802DD368; +chIceKey_update = 0x802D4410; +chMumboSwitch_update = 0x802D4548; +chMumboSwitch_draw = 0x802D4748; +chFFTeleportPad_Update = 0x802D4840; +chSnsEgg_update = 0x802D4194; +chSnsEgg_draw = 0x802D4384; +gWorldExitPad_update = 0x802D3F64; +gWorldExitPad_draw = 0x802D4108; +chMMWitchSwitch_update = 0x802D4D54; +chMMMWitchSwitch_update = 0x802D4DF4; +chTTCWitchSwitch_update = 0x802D4E1C; +chRBBWitchSwitch_update = 0x802D4E44; +chCCWWitchSwitch_update = 0x802D4E6C; +chFPWitchSwitch_update = 0x802D4E94; +chCCWitchSwitch_update = 0x802D4D7C; +chBGSWitchSwitch_update = 0x802D4DA4; +chGVWitchSwitch_update = 0x802D4DCC; lair_VRAM = 0x80386dd0; lair_VRAM_END = 0x80395e50; @@ -611,487 +431,61 @@ fight_BSS_END = 0x80393390; /* Temporary */ -actor_draw = 0x80325CD8; -sfx_playFadeShorthand = 0x8030EA54; -levelSpecificFlags_set = 0x80000000 | (0xC88ED << 2); -actor_collisionOn = 0x80000000 | (0xCABB8 << 2); -func_80324E38 = 0x80000000 | (0xC94A2 << 2); -timed_setStaticCameraToNode = 0x80000000 | (0xC94AC << 2); -timed_exitStaticCamera = 0x80000000 | (0xC94B6 << 2); -actorArray_findActorFromActorId = 0x80000000 | (0xC9CCF << 2); -actor_collisionOff = 0x80000000 | (0xCABB3 << 2); -skeletalAnim_set = 0x80000000 | (0xCD75D << 2); -func_80324D54 = 0x80000000 | (0xC9469 << 2); -func_8030E878 = 0x80000000 | (0xC3A86 << 2); -skeletalAnim_setBehavior = 0x80000000 | (0xCD7B7 << 2); -func_8030DBFC = 0x80000000 | (0xC3767 << 2); -sfxsource_set_fade_distances = 0x80000000 | (0xC3815 << 2); -sfxsource_set_position = 0x80000000 | (0xC3842 << 2); -skeletalAnim_getAnimId = 0x80000000 | (0xCD6B3 << 2); -jiggy_spawn = 0x80000000 | (0xCCD44 << 2); -timed_playSfx = 0x80000000 | (0xC9436 << 2); -func_80325340 = 0x80000000 | (0xC95E4 << 2); -skeletalAnim_getProgress = 0x80000000 | (0xCD6B5 << 2); -func_803300C0 = 0x80000000 | (0xCC144 << 2); -jiggyscore_isSpawned = 0x80000000 | (0xC84DB << 2); -skeletalAnim_getBoneTransformList = 0x80000000 | (0x0CD6BC << 2); -skeletalAnim_free = 0x80000000 | (0xCD731 << 2); -skeletalAnim_new = 0x80000000 | (0xCD741 << 2); -skeletalAnim_update = 0x80000000 | (0xCD7B9 << 2); -skeletalAnim_getLoopCount = 0x80000000 | (0xCD6F9 << 2); -skeletalAnim_getProgressRange = 0x80000000 | (0xCD6B7 << 2); -actor_update_func_80326224 = 0x80000000 | (0xC999D << 2); -subaddie_set_state_with_direction = 0x80000000 | (0xCA3F9 << 2); -actor_playAnimationOnce = 0x80000000 | (0xCA741 << 2); -actor_animationIsAt = 0x80000000 | (0xCA331 << 2); -func_8030ED2C = 0x80000000 | (0xC3BB3 << 2); -subaddie_set_state = 0x80000000 | (0xCA3B7 << 2); -actor_drawFullDepth = 0x80000000 | (0xC98B2 << 2); -gcsfx_playAtSampleRate = 0x80000000 | (0xC39AC << 2); -func_80326310 = 0x80000000 | (0xC99D8 << 2); -skeletalAnim_setCallback_0 = 0x80000000 | (0xCD6FB << 2); -skeletalAnim_setCallback_1 = 0x80000000 | (0xCD714 << 2); -func_80329934 = 0x80000000 | (0xCA763 << 2); -mapModel_getFloorY = 0x80000000 | (0xC2631 << 2); -func_80329210 = 0x80000000 | (0xCA59A << 2); -skeletalAnim_swap = 0x80000000 | (0xCD79D << 2); -func_803292E0 = 0x80000000 | (0xCA5CE << 2); -func_802F9EC4 = 0x80000000 | (0xBE829 << 2); -skeletalAnim_clearCallbacks = 0x80000000 | (0xCD6A8 << 2); -bundle_setYaw = 0x80000000 | (0xB244C << 2); -particleEmitter_setStartingFrameRange = 0x80000000 | (0xBBF1C << 2); -particleEmitter_setPositionAndVelocityRanges = 0x80000000 | (0xBBFB8 << 2); -particleEmitter_setRGB = 0x80000000 | (0xBC062 << 2); -func_802D3CE8 = 0x80000000 | (0xB4FAA << 2); -func_802D3D74 = 0x80000000 | (0xB4FCD << 2); -actor_new = 0x80327748; -spawnableActorList_add = 0x80000000 | (0xC1562 << 2); -code_76C0_ccwWhipcrackRoomDoorUpdate = 0x8038E490; -chMMMBreakableWooden_update = 0x802D3F14; -func_80325F84 = 0x803263D4; -func_80345C78 = 0x80000000 | (0xD1832 << 2); -func_8033A8F0 = 0x80000000 | (0xCEB50 << 2); -subaddie_playerIsWithinSphere = 0x80000000 | (0xCA678 << 2); -subaddie_playerIsWithinSphereAndActive = 0x80000000 | (0xCA662 << 2); -func_802DABA0 = 0x80000000 | (0xB6B60 << 2); -humanoidBaddie_ow = 0x802DB728; -humanoidBaddie_update = 0x80000000 | (0xB6DE0 << 2); -cc_pal_unk_draw = 0x803262C8; +/* GV */ +func_8032B4DC = 0x80000000 | (0xCAE4D << 2); +func_8032B16C = 0x80000000 | (0xCAD71 << 2); +gcparade_8031B4F4 = 0x80000000 | (0xC6E35 << 2); +func_8032A7AC = 0x80000000 | (0xCAB01 << 2); +func_8032BC3C = 0x80000000 | (0xCB025 << 2); +func_802D4AC0 = 0x80000000 | (0xB5320 << 2); +func_80325F2C = 0x8032637C; -fxSparkle_giantGoldFeather = 0x80000000 | (0xBCF10 << 2); -func_8030E730 = 0x80000000 | (0xC3A34 << 2); -func_8031D04C = 0x80000000 | (0xC750B << 2); -func_80333334 = 0x80000000 | (0xCCDE1 << 2); -func_80333388 = 0x80000000 | (0xCCDF6 << 2); -codeABC00_spawnJiggyAtLocation = 0x80000000 | (0xCCD8A << 2); -func_80351A04 = 0x80000000 | (0xD4799 << 2); -func_80351A14 = 0x80000000 | (0xD479D << 2); -func_8035179C_copyPosition = 0x80000000 | (0xD46FF << 2); -func_80351814 = 0x80000000 | (0xD471D << 2); -func_80351830 = 0x80000000 | (0xD4724 << 2); -func_8034E71C = 0x80000000 | (0xD3ADF << 2); -func_8034C5AC = 0x80000000 | (0xD3283 << 2); -timedJiggySpawn = 0x80000000 | (0xC953A << 2); -func_8034E78C = 0x80000000 | (0xD3AFB << 2); -collisionList_func_802E805C = 0x80000000 | (0xBA08F << 2); -func_802E9118 = 0x80000000 | (0xBA4BE << 2); -func_802E9DD8 = 0x80000000 | (0xBA7EE << 2); -boneTransformList_getBoneScale = 0x80000000 | (0xCEAB0 << 2); -func_8033A9A8 = 0x80000000 | (0xCEB7E << 2); -modelRender_setVertexList = 0x80000000 | (0xCEA44 << 2); -func_8031CD20 = 0x80000000 | (0xC7440 << 2); -vtxList_free = 0x80000000 | (0xBB2DD << 2); -modelbin_getCollisionList = 0x80000000 | (0xCE935 << 2); -vtxList_clone = 0x80000000 | (0xBB2E5 << 2); -func_80320B24 = 0x80000000 | (0xC83C5 << 2); -nodeProp_findPositionFromActorId = 0x80000000 | (0xC13F1 << 2); -func_8031CE28 = 0x80000000 | (0xC7482 << 2); -func_8030E9FC = 0x80000000 | (0xC3AE7 << 2); -func_8030EA54 = 0x80000000 | (0xC3AFD << 2); -func_80340020 = 0x80000000 | (0xD011C << 2); -func_80340200 = 0x80000000 | (0xD0194 << 2); -func_80340690 = 0x80000000 | (0xD02B8 << 2); -func_803406B0 = 0x80000000 | (0xD02C0 << 2); -func_803406D4 = 0x80000000 | (0xD02C9 << 2); +/* TTC */ +func_8032970C = 0x80000000 | (0xCA6D9 << 2); +func_8032A82C = 0x80000000 | (0xCAB21 << 2); +func_8032A95C = 0x80000000 | (0xCAB6D << 2); +func_803272D0 = 0x80000000 | (0xC9DC8 << 2); +gameSelect_setGameNumber = 0x80000000 | (0xB16CB << 2); +func_802D6310 = 0x80000000 | (0xB593C << 2); -func_802F9E44 = 0x80000000 | (0xBE809 << 2); -func_802F9F48 = 0x80000000 | (0xBE84A << 2); -particleEmitter_setScaleAndLifetimeRanges = 0x80000000 | (0xBBF5E << 2); -func_80361C64 = 0x80000000 | (0xD8835 << 2); -func_80361D7C = 0x80000000 | (0xD887B << 2); -func_80361C24 = 0x80000000 | (0xD8825 << 2); -func_80361CF4 = 0x80000000 | (0xD8859 << 2); -func_80361CAC = 0x80000000 | (0xD8847 << 2); -D_80366CD0 = 0x80367150; -func_802E07E0 = 0x802E09D0; -func_802E0738 = 0x802E0928; -subaddie_set_state_forward = 0x80000000 | (0xCA3C8 << 2); -particleEmitter_func_802EFA78 = 0x80000000 | (0xBBF16 << 2); +/* MM */ +gcdialog_getCurrentTextId = 0x80000000 | (0xC45C4 << 2); +actorArray_findActorFromMarkerId = 0x80000000 | (0xC9C47 << 2); +func_8032A9E4 = 0x80000000 | (0xCAB8F << 2); -func_8033A5B8 = 0x80000000 | (0xCEA82 << 2); -vec4f_isZero = 0x80000000 | (0xD1621 << 2); -func_80345274 = 0x80000000 | (0xD15B1 << 2); +/* BGS */ +func_803289EC = 0x80000000 | (0xCA391 << 2); +func_80328748 = 0x80000000 | (0xCA2E8 << 2); +actorArray_actorCount = 0x80000000 | (0xC9CEA << 2); +func_802D4928 = 0x80000000 | (0xB52BA << 2); -points_to_boundingBoxWithMargin = 0x80000000 | (0xCF688 << 2); -marker_setFreeMethod = 0x80000000 | (0xCC14A << 2); -chmole_learnedAllLevelAbilities = 0x80000000 | (0xB6500 << 2); -func_803246F0 = 0x80000000 | (0xC92D0 << 2); -func_80324770 = 0x80000000 | (0xC92F0 << 2); -func_8032477C = 0x80000000 | (0xC92F3 << 2); -func_8032479C = 0x80000000 | (0xC92FB << 2); -func_80324700 = 0x80000000 | (0xC92D4 << 2); -D_8038AAC0 = 0x8038B6E0; -D_8038AAD0 = 0x8038B6F0; -func_802BD780 = 0x80000000 | (0x0 << 2); -ncDynamicCamera_getPosition = 0x80000000 | (0xAF47D << 2); -ncDynamicCamera_getRotation = 0x80000000 | (0xAF486 << 2); +/* RBB */ +func_8038A6B8 = 0x80000000 | (0xE2C32 << 2); +func_803342AC = 0x80000000 | (0xCD1BF << 2); +func_80309EB0 = 0x80000000 | (0xC2814 << 2); +func_803343F8 = 0x80000000 | (0xCD212 << 2); +chjiggy_hide = 0x80000000 | (0xCD212 << 2); +func_80326218 = 0x80000000 | (0xCD212 << 2); +chGrimlet = 0x80390D80; +chCageUpSwitch = 0x80390C00; +chTNTDownSwitch = 0x80390C70; +chBossBoomBoxLargest = 0x803915D0; +chBossBoomBoxLarge = 0x803915F4; +chBossBoomBoxMedium = 0x80391618; +chBossBoomBoxSmall = 0x8039163C; -particleEmitter_setSpawnInterval = 0x80000000 | (0xBC069 << 2); -func_8033D2A8 = 0x8033D6F8; -func_8033D240 = 0x8033D690; +/* FP */ +modelRender_func_8033A0F0 = 0x80000000 | (0xCE950 << 2); +subaddie_getYawToPosition = 0x80000000 | (0xCA708 << 2); -modelRender_geoCmd_Unk0 = 0x803388F8; -modelRender_geoCmd_SORT = 0x80338A0C; -modelRender_geoCmd_BONE = 0x80338C48; -modelRender_geoCmd_LOADDL = 0x80338D54; -modelRender_geoCmd_NOP = 0x803388E8; -modelRender_geoCmd_SKINNING = 0x80338DC0; -modelRender_geoCmd_CALL = 0x80338F14; -modelRender_geoCmd_LOADDL2 = 0x80338F38; -modelRender_geoCmd_LOD = 0x80338FA0; -modelRender_geoCmd_REFPOINT = 0x8033904C; -modelRender_geoCmd_SELECTOR = 0x80339120; -modelRender_geoCmd_DRAWDIST = 0x8033921C; -modelRender_geoCmd_UnkE = 0x80339308; -modelRender_geoCmd_CAMERA = 0x803394EC; -modelRender_geoCmd_TEXWRAP = 0x80338BDC; -func_80330974 = 0x80330DC4; -chMinigame_update = 0x8031AD94; - -func_80351DE0 = 0x80352240; -func_80351E60 = 0x803522C0; -chTumblar_init = 0x8038B7D0; -chTumblar_update = 0x8038B970; -func_8038B790 = 0x8038C170; -GV_func_80387960 = 0x80388340; -func_80351FE0 = 0x80352440; -func_80352114 = 0x80352574; -func_803567EC = 0x80356C4C; -chGrilleChompa_update = 0x8035712C; -chGrilleChompa_draw = 0x803570B0; -chClucker_update = 0x80357ABC; -chClucker_draw = 0x80357A18; -chScarabBeetle_update = 0x80358AE4; -chScarabBeetle_draw = 0x803587A4; -weatherParticle_isAlwaysActive = 0x80359570; -weatherParticle_shouldStartCCWHubLeafFalling = 0x8035957C; -weatherParticle_shouldStartCCWHubRainFalling = 0x803595C0; -weatherParticle_shouldStartCCWHubSnowFalling = 0x80359604; -weatherParticle_update = 0x8035979C; -func_80359424 = 0x80359884; -func_80359454 = 0x803598B4; -chfirefx_update = 0x80359CAC; -chdrips_update = 0x8035A0A0; -chicecube_update = 0x8035AEEC; -chicecube_draw = 0x8035A200; -chTeehee_update = 0x8035BD60; -chPurpleTeehee_update = 0x8035C1A8; -chflotsam_update = 0x8035CD6C; -chflotsam_draw = 0x8035CB94; -chskeleton_update = 0x8035D38C; -chSeamanGrublin_update = 0x8035D4C8; -chMumMum_update = 0x8035D848; -chchumpfish_update = 0x8035DE8C; -chTermite_update = 0x8035ECBC; -chgravestone_update = 0x8035F5A8; -chgravestone_draw = 0x8035F110; -chbat_update = 0x80360C98; - -func_8033B388 = 0x80000000 | (0xCEDF6 << 2); -func_8033BD20 = 0x80000000 | (0xCF05C << 2); -modelRender_setAlpha = 0x80000000 | (0xCEA18 << 2); -codeAEDA0_setSpriteDrawMode = 0x80000000 | (0xCE1CD << 2); -codeAEDA0_setPrimaryColorRGB = 0x80000000 | (0xCE1E2 << 2); -func_803382B4 = 0x80000000 | (0xCE1C1 << 2); -func_80338370 = 0x80000000 | (0xCE1F0 << 2); -codeAEDA0_drawSprite = 0x80000000 | (0xCD860 << 2); -func_80344C2C = 0x80000000 | (0xD141F << 2); -func_80344720 = 0x80000000 | (0xD12DC << 2); -func_80344424 = 0x80000000 | (0xD121D << 2); -codeAEDA0_postDrawSprite = 0x80000000 | (0xCDB33 << 2); -codeB3A80_getSprite = 0x80000000 | (0xCEEC5 << 2); -func_802EDD20 = 0x80000000 | (0xBB7C0 << 2); -fxRipple_free = 0x80000000 | (0xBCDE5 << 2); -func_802F1E80 = 0x80000000 | (0xBC818 << 2); -fxSparkle_free = 0x80000000 | (0xBCF91 << 2); -func_802F404C = 0x80000000 | (0xBD08B << 2); -func_802F422C = 0x80000000 | (0xBD103 << 2); -func_802F3CB0 = 0x80000000 | (0xBCFA4 << 2); -func_802EDD44 = 0x80000000 | (0xBB7C9 << 2); -fxRipple_init = 0x80000000 | (0xBCDEE << 2); -func_802F1EA4 = 0x80000000 | (0xBC821 << 2); -fxSparkle_init = 0x80000000 | (0xBCF99 << 2); -func_802F4070 = 0x80000000 | (0xBD094 << 2); -func_802F4250 = 0x80000000 | (0xBD10C << 2); -func_802F3CD4 = 0x80000000 | (0xBCFAD << 2); -func_80347FC0 = 0x80000000 | (0xD2104 << 2); -func_80349AD0 = 0x80000000 | (0xD27C8 << 2); -func_80349B1C = 0x80000000 | (0xD27DB << 2); -func_802F8110 = 0x80000000 | (0xBE0BC << 2); -func_802F962C = 0x80000000 | (0xBE603 << 2); -func_802F8264 = 0x80000000 | (0xBE111 << 2); -func_802F9054 = 0x80000000 | (0xBE48D << 2); -func_802F8214 = 0x80000000 | (0xBE0FD << 2); -func_802F8FFC = 0x80000000 | (0xBE477 << 2); -func_802F8338 = 0x80000000 | (0xBE146 << 2); -func_802F90F4 = 0x80000000 | (0xBE4B5 << 2); -func_802F8358 = 0x80000000 | (0xBE14E << 2); -func_802F9114 = 0x80000000 | (0xBE4BD << 2); -func_802F80F0 = 0x80000000 | (0xBE0B4 << 2); -func_802F8FF0 = 0x80000000 | (0xBE474 << 2); -func_802F83AC = 0x80000000 | (0xBE163 << 2); -func_802F919C = 0x80000000 | (0xBE4DF << 2); -func_802F8A90 = 0x80000000 | (0xBE31C << 2); -func_802F8BE0 = 0x80000000 | (0xBE370 << 2); -func_802F8B8C = 0x80000000 | (0xBE35B << 2); -func_802F8C90 = 0x80000000 | (0xBE39C << 2); -func_802F8A70 = 0x80000000 | (0xBE314 << 2); -func_802F8CB0 = 0x80000000 | (0xBE3A4 << 2); -func_802F8CD0 = 0x80000000 | (0xBE3AC << 2); -modelRender_func_8033A170 = 0x80000000 | (0xCE970 << 2); -func_802BEF64 = 0x80000000 | (0xAFB79 << 2); -func_8030E200 = 0x80000000 | (0xC38E8 << 2); -sfx_randf2 = 0x80000000 | (0xD2AF6 << 2); -itemscore_noteScores_getTotal = 0x80000000 | (0xD1CCF << 2); -print_bold_spaced = 0x80000000 | (0xBDEA8 << 2); -assetCache_free = 0x80000000 | (0xCF067 << 2); -itemPrint_getValue = 0x80000000 | (0xBEBFF << 2); -func_802FB0DC = 0x80000000 | (0xBECAF << 2); -func_802FB0E4 = 0x80000000 | (0xBECB1 << 2); -func_802FB0D4 = 0x80000000 | (0xBECAD << 2); -modelbin_getTextureList = 0x80000000 | (0xCE955 << 2); -func_80348044 = 0x80000000 | (0xD2125 << 2); -modelRender_func_8033A308 = 0x80000000 | (0xCE9D6 << 2); - -code_B3A80_func_8033BDAC = 0x80000000 | (0xCF07F << 2); - -func_802C0150 = 0x80000000 | (0xAFFF4 << 2); -func_802C02D4 = 0x80000000 | (0xB0055 << 2); -func_802BE244 = 0x80000000 | (0xAF830 << 2); -func_802BE230 = 0x80000000 | (0xAF82B << 2); -func_802BD8D4 = 0x80000000 | (0xAF5D2 << 2); -func_802BE190 = 0x80000000 | (0xAF802 << 2); -func_802BE60C = 0x80000000 | (0xAF922 << 2); -func_802BC84C = 0x80000000 | (0xAF1AF << 2); -func_802BE6FC = 0x80000000 | (0xAF95E << 2); -func_802BD904 = 0x80000000 | (0xAF5DE << 2); -func_802BD51C = 0x80000000 | (0xAF4E3 << 2); -func_802BD4C0 = 0x80000000 | (0xAF4CC << 2); - -func_802BD870 = 0x80000000 | (0xAF5B9 << 2); -ncDynamicCamera_setPosition = 0x80000000 | (0xAF469 << 2); -func_802BD720 = 0x80000000 | (0xAF564 << 2); -func_802BE834 = 0x80000000 | (0xAF9AC << 2); -func_802BD3CC = 0x80000000 | (0xAF48F << 2); -ncDynamicCamera_setRotation = 0x80000000 | (0x0AF473 << 2); -func_802BDB30 = 0x80000000 | (0xAF669 << 2); -func_802BD82C = 0x80000000 | (0xAF5A8 << 2); -func_802BD840 = 0x80000000 | (0xAF5AD << 2); -func_802BCE0C = 0x80000000 | (0xAF31F << 2); -func_802BDCE0 = 0x80000000 | (0xAF6D5 << 2); -func_802BDE88 = 0x80000000 | (0xAF73F << 2); - -func_8034CF74 = 0x8034D3D4; -func_8034CF90 = 0x8034D3F0; -func_8034CF6C = 0x8034D3CC; -func_8034D170 = 0x8034D5D0; -func_8034D194 = 0x8034D5F4; -func_8034D168 = 0x8034D5C8; -func_8034DD74 = 0x8034E1D4; -func_8034E26C = 0x8034E6CC; -func_8034DD48 = 0x8034E1A8; -func_8034E6A8 = 0x8034EB08; -func_8034E8E4 = 0x8034ED44; -func_8034E6A0 = 0x8034EB00; -func_8034CB64 = 0x8034CFC4; -func_8034CB9C = 0x8034CFFC; -func_8034CB5C = 0x8034CFBC; -func_8034EE2C = 0x8034F28C; -func_8034EF60 = 0x8034F3C0; -func_8034EE24 = 0x8034F284; -func_8034CD30 = 0x8034D190; -func_8034CD8C = 0x8034D1EC; -func_8034CD28 = 0x8034D188; -func_8034F250 = 0x8034F6B0; -func_8034F268 = 0x8034F6C8; -func_8034F248 = 0x8034F6A8; -func_8034F570 = 0x8034F9D0; -func_8034F5B0 = 0x8034FA10; -func_8034F568 = 0x8034F9C8; -func_8034D048 = 0x8034D4A8; - -fxairscore_new = 0x8030197C; -fxairscore_update = 0x80301F8C; -fxairscore_draw = 0x803019B0; -fxairscore_free = 0x80301934; - -actor_loopAnimation = 0x80000000 | (0xCA74C << 2); -func_80329480 = 0x80000000 | (0xCA636 << 2); -func_80329260 = 0x80000000 | (0xCA5AE << 2); -func_8032CA80 = 0x80000000 | (0xCB3B4 << 2); -subaddie_turnToYaw = 0x80000000 | (0xCA502 << 2); -subaddie_getYawToPlayer = 0x80000000 | (0xCA6F7 << 2); -func_80328CEC = 0x80000000 | (0xCA451 << 2); -func_80329140 = 0x80000000 | (0xCA566 << 2); -func_80329078 = 0x80000000 | (0xCA534 << 2); - -func_8030AFD8 = 0x80000000 | (0xC2C5E << 2); -func_80321854 = 0x80000000 | (0xC8711 << 2); -debugScoreStates = 0x80000000 | (0xC7FFA << 2); -clearScoreStates = 0x80000000 | (0xC7FE4 << 2); -func_803216D0 = 0x80000000 | (0xC86B0 << 2); -func_8030AFA0 = 0x80000000 | (0xC2C50 << 2); -map_getLevel = 0x80000000 | (0xC2BBA << 2); -func_8033B678 = 0x80000000 | (0x800 << 2); - -bundle_spawn_f32 = 0x80000000 | (0xB254F << 2); -func_803333DC = 0x80000000 | (0xCCE0B << 2); -func_80355C60 = 0x80000000 | (0xD5830 << 2); -func_80329904 = 0x80329D5C; -commonParticle_add = 0x80000000 | (0xCFAE3 << 2); - -func_802FAFE8 = 0x80000000 | (0xBEC72 << 2); -code_73640_printItemCount = 0x80000000 | (0xBEBA1 << 2); -fxairscore_time_to_count = 0x80000000 | (0xC07C1 << 2); -jiggyscore_leveltotal = 0x80000000 | (0xC8567 << 2); -itemPrint_reset = 0x80000000 | (0xBE9EC << 2); -func_802FBDFC = 0x80000000 | (0xBEFF7 << 2); -func_80320708 = 0x80000000 | (0xC82BE << 2); -dummy_func_80320248 = 0x80000000 | (0xC818E << 2); -volatileFlag_setN = 0x80000000 | (0xC8245 << 2); -honeycombscore_get_total = 0x80000000 | (0xC8623 << 2); -volatileFlag_backupAll = 0x80000000 | (0xC82CE << 2); -volatileFlag_restoreAll = 0x80000000 | (0xC82E2 << 2); - -spriteRender_drawWithSegment = 0x80000000 | (0xCDB5D << 2); - -func_80307E1C = 0x80000000 | (0xC1FEF << 2); -func_80307EA8 = 0x80000000 | (0xC2012 << 2); -func_8032DC70 = 0x80000000 | (0xCB830 << 2); -func_803080C8 = 0x80000000 | (0xC209A << 2); -func_803234FC = 0x80000000 | (0xC8E53 << 2); -func_803110F8 = 0x80000000 | (0xC44B5 << 2); -func_8032417C = 0x80000000 | (0xC9173 << 2); -func_80328FF0 = 0x80000000 | (0xCA512 << 2); -func_803240E0 = 0x80000000 | (0xC914C << 2); -func_80323FDC = 0x80000000 | (0xC910B << 2); -func_803237E8 = 0x80000000 | (0xC8F0E << 2); -func_802CDAC4 = 0x80000000 | (0xB3721 << 2); - -func_803382FC = 0x80000000 | (0xCE1D3 << 2); -func_80338308 = 0x80000000 | (0xCE1D6 << 2); -func_8033837C = 0x80000000 | (0xCE1F3 << 2); -spriteRender_draw = 0x80000000 | (0xCDB55 << 2); - -marker_loadModelBin = 0x80000000 | (0xCC3DB << 2); -modelbin_getMeshList = 0x80000000 | (0xCE940 << 2); -func_80330DE4 = 0x80000000 | (0xCC48D << 2); - -func_80303FE4 = 0x80000000 | (0xC1061 << 2); -func_80303F7C = 0x80000000 | (0xC1047 << 2); -leveloverlay_getOverlayFromLevel = 0x80000000 | (0xC8CBB << 2); -func_802E4A8C = 0x80000000 | (0xB931F << 2); -func_802E4A80 = 0x80000000 | (0xB931C << 2); -mapSavestate_init = 0x80000000 | (0xB8C0C << 2); -mapSavestate_clearAll = 0x80000000 | (0xB8C1B << 2); -rbb_propellorCtrl_reset = 0x80000000 | (0xE4246 << 2); -mm_resetHuts = 0x80000000 | (0xE1D9C << 2); -chTreasurehunt_resetProgress = 0x80000000 | (0xE2A19 << 2); -chFlowerpot_reset = 0x80000000 | (0xE1F10 << 2); -rbb_propellorCtrl_stop = 0x80000000 | (0xE423A << 2); -rbb_propellorCtrl_update = 0x80000000 | (0xE425C << 2); -musicKeepsPlaying = 0x80000000 | (0xC8B36 << 2); - -func_80330078 = 0x80000000 | (0xCC132 << 2); - -func_8030EDAC = 0x80000000 | (0xC3BD3 << 2); -func_8031D06C = 0x80000000 | (0x2 << 2); -func_8031D0C0 = 0x80000000 | (0x3 << 2); -func_8030E9C4 = 0x80000000 | (0xC3AD9 << 2); -func_802D6114 = 0x80000000 | (0xB58BD << 2); -func_8032278C = 0x80000000 | (0xC8AE3 << 2); - -jiggylist_set_level = 0x80000000 | (0xCCC0F << 2); -gameSelect_saveAndExit = 0x80000000 | (0xB16A1 << 2); -func_8033301C = 0x80000000 | (0xCCD1B << 2); -gcpausemenu_80314B24 = 0x80000000 | (0xC539E << 2); -modelRender_func_8033A244 = 0x80000000 | (0xCE9A5 << 2); -modelRender_func_8033A28C = 0x80000000 | (0xCE9B7 << 2); -codeB3A80_releaseSprite = 0x80000000 | (0xCEDE2 << 2); -modelRender_setAnimatedTexturesCacheId = 0x80000000 | (0xCEA39 << 2); -modelbin_getUnk14List = 0x80000000 | (0xCE95F << 2); -func_8034C6DC = 0x80000000 | (0xD32CF << 2); -modelbin_getAnimTextureList = 0x80000000 | (0xCE958 << 2); -jigsawPicture_isJigsawPictureComplete = 0x80000000 | (0xE3D30 << 2); -gsworld_setEnableUpdate = 0x80000000 | (0xCD558 << 2); -func_802D4608 = 0x80000000 | (0xB51F2 << 2); -func_8030E704 = 0x80000000 | (0xC3A29 << 2); -gsworld_setEnableDraw = 0x80000000 | (0xCD55E << 2); -modelRender_reset = 0x80000000 | (0xCE1F8 << 2); -func_8030C180 = 0x80000000 | (0xC30C8 << 2); -gsworld_update = 0x80000000 | (0xCD4C7 << 2); -chBottlesBonus_func_802DEA8C = 0x80000000 | (0xB7B1F << 2); -func_802DF11C = 0x80000000 | (0xB7CC3 << 2); -chBottlesBonus_spawn = 0x80000000 | (0xB7B02 << 2); -func_802DF090 = 0x80000000 | (0xB7CA0 << 2); - -commonParticle_getCurrentProjectileIndex = 0x80000000 | (0xCFB48 << 2); -func_8033E93C = 0x80000000 | (0xCFB63 << 2); -commonParticle_getCurrentParticle = 0x80000000 | (0xCFB6C << 2); -commonParticle_getCurrentAnimSprite = 0x80000000 | (0xCFB51 << 2); -commonParticle_setCurrentInUseFalse = 0x80000000 | (0xCFB75 << 2); -modelRender_setPrimAndEnvColors = 0x80000000 | (0xCE9E1 << 2); -gcquiz_defrag = 0x80000000 | (0xC6A21 << 2); -gczoombox_defrag = 0x80000000 | (0xC63EF << 2); -func_803048E0 = 0x80000000 | (0xC12A0 << 2); -func_80305290 = 0x80000000 | (0xC150C << 2); -func_80309DBC = 0x80000000 | (0xC27D7 << 2); -func_8038B5D8 = 0x80000000 | (0xE2FEE << 2); -func_8034C344 = 0x80000000 | (0xD31E9 << 2); -func_8034C4CC = 0x80000000 | (0xD324B << 2); -func_8034C448 = 0x80000000 | (0xD322A << 2); -func_8034C4F0 = 0x80000000 | (0xD3254 << 2); -func_8034C50C = 0x80000000 | (0xD325B << 2); - -commonParticle_getCurrentActorMarker = 0x80000000 | (0xCFB2D << 2); -func_8033E888 = 0x80000000 | (0xCFB36 << 2); -func_8033E8AC = 0x80000000 | (0xCFB3F << 2); -bundle_getVelocity = 0x80000000 | (0xB2773 << 2); - -func_8034B9E4 = 0x80000000 | (0xa << 2); -func_803226E8 = 0x80000000 | (0xa << 2); -func_80322914 = 0x80000000 | (0xa << 2); -func_802E40D0 = 0x80000000 | (0xa << 2); -func_802E40E8 = 0x80000000 | (0xa << 2); -func_802E40C4 = 0x80000000 | (0xa << 2); -ncDynamicCamera_setUpdateEnabled = 0x80000000 | (0xa << 2); -func_80304ED0 = 0x80000000 | (0xa << 2); -func_8034B968 = 0x80000000 | (0xa << 2); -nodeprop_findByActorIdAndPosition_s16 = 0x80000000 | (0xa << 2); -func_802D6344 = 0x80000000 | (0xa << 2); -gameSelect_resetGameNumber = 0x80000000 | (0xa << 2); -func_8038F570 = 0x80000000 | (0xb << 2); -chNipper_isInState7 = 0x80000000 | (0xb << 2); - -mapModel_setEnvColor = 0x80000000 | (0xC2908 << 2); -func_802E4A70 = 0x80000000 | (0xa << 2); - - -warp_mmmEnterLoggo = 0x80000000 | (0xC7EF1 << 2); -func_803255FC = 0x80000000 | (0xC9693 << 2); -spawn_child_actor = 0x80000000 | (0xCA179 << 2); -code_4C020_setHourglassTimer = 0x80000000 | (0xB5AB4 << 2); -func_802D4A9C = 0x80000000 | (0xB5317 << 2); -D_80367E70 = 0x803682F0; -actorArray_findClosestActorFromActorId = 0x80000000 | (0xC9C6E << 2); -mapModel_getModel = 0x80000000 | (0xC2639 << 2); \ No newline at end of file +/* SM */ +modelRender_func_8033A470 = 0x80000000 | (0xCEA30 << 2); +INITIAL_CAMERA_TARGETS = 0x8036628C; +chSmBottles_update = 0x8038A390; +func_8038A3B0 = 0x8038AD90; +gChAttackTutorial = 0x8038B840; +gcquiz_func_8031A48C = 0x80000000 | (0xC6A11 << 2); +gcquiz_init = 0x80000000 | (0xC6500 << 2); +__gcquiz_unused = 0x80000000 | (0xC6979 << 2); +gcquiz_free = 0x80000000 | (0xC6550 << 2); +gcquiz_func_80319EA4 = 0x80000000 | (0xC6897 << 2); \ No newline at end of file diff --git a/src/BGS/ch/croctus.c b/src/BGS/ch/croctus.c index 023b5fee..f4b4e26e 100644 --- a/src/BGS/ch/croctus.c +++ b/src/BGS/ch/croctus.c @@ -97,7 +97,7 @@ void func_80387E40(ActorMarker * arg0){ void chCroctus_activateNextCroctus(ActorMarker *caller, enum asset_e text_id, s32 arg2){ Actor *this; - if(text_id == ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS){ + if(text_id == VER_SELECT(ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS, 0x9C9, 0, 0)){ this = marker_getActor(caller); timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); timed_playSfx(1.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); @@ -108,7 +108,7 @@ void chCroctus_activateNextCroctus(ActorMarker *caller, enum asset_e text_id, s3 bgs_D_803907B8[this->actorTypeSpecificField]->propPtr->isNotFeatherEggOrNote = TRUE; timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->actorTypeSpecificField])); timed_setStaticCameraToNode(0.8f, 9); - func_80324DBC(3.4f, ASSET_C87_DIALOG_CROCTUS_SECOND_SPAWN, 0xE, NULL, NULL, chCroctus_activateNextCroctus, NULL); + func_80324DBC(3.4f, VER_SELECT(ASSET_C87_DIALOG_CROCTUS_SECOND_SPAWN, 0x9CA, 0, 0), 0xE, NULL, NULL, chCroctus_activateNextCroctus, NULL); __spawnQueue_add_2((GenFunction_2) func_80387D18, reinterpret_cast(s32, this->marker), 0x46); } else{ @@ -154,7 +154,7 @@ void chCroctus_update(Actor *this){ coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000); if (this->actorTypeSpecificField == 1) { func_8028F94C(2, this->position); - gcdialog_showDialog(ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS, 0xE, this->position, this->marker, chCroctus_activateNextCroctus, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C86_DIALOG_CROCTUS_FIRST_SUCCESS, 0x9C9, 0, 0), 0xE, this->position, this->marker, chCroctus_activateNextCroctus, NULL); subaddie_set_state_with_direction(this, CHCROCTUS_STATE_6_DESPAWN, 0.79f, 1); } else { timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f diff --git a/src/BGS/ch/frogminigame.c b/src/BGS/ch/frogminigame.c index 5973f18e..9ee5df3b 100644 --- a/src/BGS/ch/frogminigame.c +++ b/src/BGS/ch/frogminigame.c @@ -65,13 +65,13 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){ mapSpecificFlags_set(BGS_SPECIFIC_FLAG_10_FROG_MINIGAME_FIRST_MET, 1); if(!fileProgressFlag_get(FILEPROG_1B_MET_YELLOW_FLIBBITS)){ fileProgressFlag_set(FILEPROG_1B_MET_YELLOW_FLIBBITS, 1); - gcdialog_showDialog(ASSET_C81_DIALOG_YELLOW_FLIBBITS_MEET, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); + gcdialog_showDialog(VER_SELECT(ASSET_C81_DIALOG_YELLOW_FLIBBITS_MEET, 0x9C4, 0, 0), 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); }else{ if(!arg0->bgs_6730.unk8){ - gcdialog_showDialog(ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); + gcdialog_showDialog(VER_SELECT(ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0x9C6, 0, 0), 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); } else{ - __chFrogMinigame_textCallback(arg0->marker, ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0); + __chFrogMinigame_textCallback(arg0->marker, VER_SELECT(ASSET_C83_DIALOG_YELLOW_FLIBBITS_RETURN, 0x9C6, 0, 0), 0); return; } } @@ -102,7 +102,7 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){ } if (next_state == CH_FROG_MINIGAME_STATE_4_COMPLETE) { - gcdialog_showDialog(ASSET_C82_DIALOG_YELLOW_FLIBBITS_COMPLETE, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); + gcdialog_showDialog(VER_SELECT(ASSET_C82_DIALOG_YELLOW_FLIBBITS_COMPLETE, 0x9C5, 0, 0), 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0); } if(next_state == CH_FROG_MINIGAME_STATE_5_SPAWN_JIGGY){ diff --git a/src/BGS/ch/tanktup.c b/src/BGS/ch/tanktup.c index 432abcdf..17b9938d 100644 --- a/src/BGS/ch/tanktup.c +++ b/src/BGS/ch/tanktup.c @@ -148,7 +148,7 @@ void chTanktup_update(Actor *this) { if ((((ml_vec3f_distance(local->unk18, sp48) < 250.0f) && (ml_vec3f_distance(local->unk18, sp48) > 80.0f)) && (!player_movementGroup())) && (player_getTransformation() == TRANSFORM_1_BANJO)) { - gcdialog_showDialog(ASSET_C7E_DIALOG_TANKTUP_MEET, 0, 0, 0, 0, 0); + gcdialog_showDialog(VER_SELECT(ASSET_C7E_DIALOG_TANKTUP_MEET, 0x9C1, 0, 0), 0, 0, 0, 0, 0); this->has_met_before = TRUE; } } @@ -169,7 +169,7 @@ void chTanktup_update(Actor *this) if ((!this->unk138_23) && (!local->unk14)) { - if (gcdialog_showDialog(ASSET_C80_DIALOG_TANKTUP_HIT, 0, 0, 0, 0, 0)) + if (gcdialog_showDialog(VER_SELECT(ASSET_C80_DIALOG_TANKTUP_HIT, 0x9C3, 0, 0), 0, 0, 0, 0, 0)) { this->unk138_23 = 1; } @@ -220,11 +220,11 @@ void chTanktup_update(Actor *this) func_8028F918(0); if (jiggyscore_isCollected(JIGGY_26_BGS_TANKTUP) == 0) { - gcdialog_showDialog(ASSET_C7F_DIALOG_TANKTUP_COMPLETE, 0xF, this->position, this->marker, func_8038F5E4, 0); + gcdialog_showDialog(VER_SELECT(ASSET_C7F_DIALOG_TANKTUP_COMPLETE, 0x9C2, 0, 0), 0xF, this->position, this->marker, func_8038F5E4, 0); } else { - func_8038F5E4(this->marker, ASSET_C7F_DIALOG_TANKTUP_COMPLETE, -1); + func_8038F5E4(this->marker, VER_SELECT(ASSET_C7F_DIALOG_TANKTUP_COMPLETE, 0x9C2, 0, 0), -1); } } break; diff --git a/src/BGS/ch/tiptup.c b/src/BGS/ch/tiptup.c index aff9b3da..0159108f 100644 --- a/src/BGS/ch/tiptup.c +++ b/src/BGS/ch/tiptup.c @@ -31,16 +31,16 @@ ActorInfo gChTiptup = { s16 chTiptupRepeatDialogs[] = { NULL, - ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT, - ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT, - ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT + VER_SELECT(ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT, 0x9BB, 0, 0), + VER_SELECT(ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT, 0x9BD, 0, 0), + VER_SELECT(ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT, 0x9BF, 0, 0) }; s16 chTiptupSuccessDialogs[] = { NULL, - ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE, - ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE, - ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE + VER_SELECT(ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE, 0x9BA, 0, 0), + VER_SELECT(ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE, 0x9BC, 0, 0), + VER_SELECT(ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE, 0x9BE, 0, 0) }; u8 chTiptupSequenceLength[] = {3, 3, 5, 7}; @@ -98,7 +98,7 @@ void chTiptup_activateTimer(ActorMarker *this){ thisActor = marker_getActor(this); item_set(ITEM_6_HOURGLASS, 1); - item_set(ITEM_0_HOURGLASS_TIMER, TIPTUP_TIMER * 60 - 1); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(TIPTUP_TIMER, 25, 0, 0) * 60 - 1); chTiptup_setState(thisActor, CH_TIPTUP_STATE_5_WIN_MINIGAME); } @@ -115,21 +115,21 @@ void chTiptup_textEvent(ActorMarker *this, enum asset_e text_id, s32 arg2){ thisActor = marker_getActor(this); switch(text_id){ - case ASSET_C72_DIALOG_TIPTUP_MEET_1: - case ASSET_C74_DIALOG_TIPTUP_MEET_3: + case VER_SELECT(ASSET_C72_DIALOG_TIPTUP_MEET_1, 0x9B5, 0, 0): + case VER_SELECT(ASSET_C74_DIALOG_TIPTUP_MEET_3, 0x9B7, 0, 0): chTiptup_setState(thisActor, CH_TIPTUP_STATE_3_FF_GIVE_SEQUENCE); break; - case ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT: - case ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT: - case ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT: + case VER_SELECT(ASSET_C78_DIALOG_TIPTUP_LESSON_1_REPEAT, 0x9BB, 0, 0): + case VER_SELECT(ASSET_C7A_DIALOG_TIPTUP_LESSON_2_REPEAT, 0x9BD, 0, 0): + case VER_SELECT(ASSET_C7C_DIALOG_TIPTUP_LESSON_3_REPEAT, 0x9BF, 0, 0): chTiptup_setState(thisActor, CH_TIPTUP_STATE_4_AWAIT_SEQUENCE_COMPLETION); break; - case ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE: - case ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE: + case VER_SELECT(ASSET_C77_DIALOG_TIPTUP_LESSON_1_COMPLETE, 0x9BA, 0, 0): + case VER_SELECT(ASSET_C79_DIALOG_TIPTUP_LESSON_2_COMPLETE, 0x9BC, 0, 0): func_80324E38(0.0f, 0); chTiptup_setState(thisActor, CH_TIPTUP_STATE_3_FF_GIVE_SEQUENCE); break; - case ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE: + case VER_SELECT(ASSET_C7B_DIALOG_TIPTUP_LESSON_3_COMPLETE, 0x9BE, 0, 0): timedFunc_set_0(0.0f, chTiptup_jiggySpawn); timed_exitStaticCamera(2.5f); func_80324E38(2.5f, 0); @@ -185,7 +185,7 @@ void chTiptup_setState(Actor *this, s32 next_state){ if (unqPtr->round == TIPTUP_ROUND_1) { gcdialog_showDialog( - ASSET_C72_DIALOG_TIPTUP_MEET_1, + VER_SELECT(ASSET_C72_DIALOG_TIPTUP_MEET_1, 0x9B5, 0, 0), 0xe, this->position, this->marker, @@ -194,7 +194,7 @@ void chTiptup_setState(Actor *this, s32 next_state){ } else { gcdialog_showDialog( - ASSET_C74_DIALOG_TIPTUP_MEET_3, + VER_SELECT(ASSET_C74_DIALOG_TIPTUP_MEET_3, 0x9B7, 0, 0), 0xf, this->position, this->marker, @@ -242,7 +242,7 @@ void chTiptup_setState(Actor *this, s32 next_state){ if(!unqPtr->round && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ func_80324DBC( sequence_time + 0.5, - ASSET_C73_DIALOG_TIPTUP_MEET_2, + VER_SELECT(ASSET_C73_DIALOG_TIPTUP_MEET_2, 0x9B6, 0, 0), 0xe, this->position, this->marker, @@ -325,7 +325,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){ unqPtr = (ActorLocal_Tiptup *)&thisActor->local; if((s32)unqPtr->unk0 >= (s32) vector_size(unqPtr->unk4)){ if(!mapSpecificFlags_get(CH_TIPTUP_SPECIFIC_FLAG_0_CHOIR_MEMBER_HIT_AFTER_JIGGY) - && gcdialog_showDialog(ASSET_C76_DIALOG_CHOIR_MEMBER_HIT_AFTER_JIGGY, 0, 0, 0, 0, 0)) + && gcdialog_showDialog(VER_SELECT(ASSET_C76_DIALOG_CHOIR_MEMBER_HIT_AFTER_JIGGY, 0x9B9, 0, 0), 0, 0, 0, 0, 0)) { mapSpecificFlags_set(CH_TIPTUP_SPECIFIC_FLAG_0_CHOIR_MEMBER_HIT_AFTER_JIGGY, 1); } @@ -339,7 +339,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){ timedFunc_set_0(0.5f, chTiptup_sfxIncorrectHit); if(!mapSpecificFlags_get(CH_TIPTUP_SPECIFIC_FLAG_1_TIPTUP_MISS) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) - && gcdialog_showDialog(ASSET_C75_DIALOG_TIPTUP_MISS, 0, NULL, NULL, NULL, NULL)) + && gcdialog_showDialog(VER_SELECT(ASSET_C75_DIALOG_TIPTUP_MISS, 0x9B8, 0, 0), 0, NULL, NULL, NULL, NULL)) { mapSpecificFlags_set(CH_TIPTUP_SPECIFIC_FLAG_1_TIPTUP_MISS, TRUE); } @@ -446,7 +446,7 @@ void chTiptup_update(Actor *this){ if(this->state == CH_TIPTUP_STATE_6_AFTER_JIGGY_DIALOG){ if(ml_vec3f_distance(this->position, player_position) < 300.0f && !unqPtr->unk8){ unqPtr->unk8 = 1; - gcdialog_showDialog(ASSET_C7D_DIALOG_TIPTUP_MEET_AFTER_JIGGY, 4, 0, 0, 0, 0); + gcdialog_showDialog(VER_SELECT(ASSET_C7D_DIALOG_TIPTUP_MEET_AFTER_JIGGY, 0x9C0, 0, 0), 4, 0, 0, 0, 0); } } } diff --git a/src/BGS/crc.c b/src/BGS/crc.c index 36d63044..d5f83499 100644 --- a/src/BGS/crc.c +++ b/src/BGS/crc.c @@ -2,6 +2,6 @@ #include "checksums.h" #include "version.h" -s32 D_80390B20 = VER_SELECT(0x00282B61, 0, 0, 0); // BGS_TEXT_CRC1 -s32 D_80390B24 = VER_SELECT(0xccdaeea0, 0, 0, 0); // BGS_TEXT_CRC2 -s32 D_80390B28 = VER_SELECT(0x0002DE6B, 0, 0, 0); // BGS_DATA_CRC1 +s32 D_80390B20 = VER_SELECT(0x00282B61, 0x002871C5, 0, 0); // BGS_TEXT_CRC1 +s32 D_80390B24 = VER_SELECT(0xccdaeea0, 0xEDE9F826, 0, 0); // BGS_TEXT_CRC2 +s32 D_80390B28 = VER_SELECT(0x0002DE6B, 0x0002EA91, 0, 0); // BGS_DATA_CRC1 diff --git a/src/BGS/mrvileminigame.c b/src/BGS/mrvileminigame.c index b5d7b4ec..ca25b64d 100644 --- a/src/BGS/mrvileminigame.c +++ b/src/BGS/mrvileminigame.c @@ -44,50 +44,50 @@ ActorInfo gChVileGame = { enum asset_e chMrVileMinigamePlayerLosesDialog[] = { 0, - ASSET_C66_DIALOG_MR_VILE_WINS_ROUND_1, - ASSET_C68_DIALOG_MR_VILE_WINS_ROUND_2, - ASSET_C6A_DIALOG_MR_VILE_WINS_ROUND_3, - ASSET_C92_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_2, - ASSET_C93_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_3, - ASSET_C94_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_4, + VER_SELECT(ASSET_C66_DIALOG_MR_VILE_WINS_ROUND_1, 0x9A9, 0, 0), + VER_SELECT(ASSET_C68_DIALOG_MR_VILE_WINS_ROUND_2, 0x9AB, 0, 0), + VER_SELECT(ASSET_C6A_DIALOG_MR_VILE_WINS_ROUND_3, 0x9AD, 0, 0), + VER_SELECT(ASSET_C92_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_2, 0x9D5, 0, 0), + VER_SELECT(ASSET_C93_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_3, 0x9D6, 0, 0), + VER_SELECT(ASSET_C94_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_4, 0x9D7, 0, 0), 0 }; enum asset_e chMrVileMinigamePlayerWinsDialog[] = { 0, - ASSET_C67_DIALOG_MR_VILE_ROUND_2_START, - ASSET_C69_DIALOG_MR_VILE_ROUND_3_START, + VER_SELECT(ASSET_C67_DIALOG_MR_VILE_ROUND_2_START, 0x9AA, 0, 0), + VER_SELECT(ASSET_C69_DIALOG_MR_VILE_ROUND_3_START, 0x9AC, 0, 0), 0, - ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, - ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, - ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3 + VER_SELECT(ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, 0x9D8, 0, 0), + VER_SELECT(ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, 0x9D9, 0, 0), + VER_SELECT(ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3, 0x9DA, 0, 0) }; enum asset_e chMrVileMinigamePlayerWinsRematchDialog[] = { 0, - ASSET_C6E_DIALOG_MR_VILE_LOSE_ROUND_2_REMATCH, - ASSET_C6F_DIALOG_MR_VILE_LOSE_ROUND_3_REMATCH, + VER_SELECT(ASSET_C6E_DIALOG_MR_VILE_LOSE_ROUND_2_REMATCH, 0x9B1, 0, 0), + VER_SELECT(ASSET_C6F_DIALOG_MR_VILE_LOSE_ROUND_3_REMATCH, 0x9B2, 0, 0), 0, - ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, - ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, - ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3 + VER_SELECT(ASSET_C95_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_1, 0x9D8, 0, 0), + VER_SELECT(ASSET_C96_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_2, 0x9D9, 0, 0), + VER_SELECT(ASSET_C97_DIALOG_MR_VILE_LOSES_EXTRA_CHALLENGE_3, 0x9DA, 0, 0) }; enum asset_e chMrVileMinigamePlayerDeclinesDialog[] = { - ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, - ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, - ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, - ASSET_C8F_DIALOG_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE, + VER_SELECT(ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, 0x9A8, 0, 0), + VER_SELECT(ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, 0x9A8, 0, 0), + VER_SELECT(ASSET_C65_DIALOG_MR_VILE_PLAYER_DECLINES, 0x9A8, 0, 0), + VER_SELECT(ASSET_C8F_DIALOG_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE, 0x9D2, 0, 0), 0, 0, 0 }; enum asset_e chMrVileMinigameRound1AndChallengeDialog[] = { - ASSET_C64_DIALOG_MR_VILE_ROUND_1_START, + VER_SELECT(ASSET_C64_DIALOG_MR_VILE_ROUND_1_START, 0x9A7, 0, 0), 0, 0, - ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, + VER_SELECT(ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0x9D1, 0, 0), 0, 0, 0, @@ -95,10 +95,10 @@ enum asset_e chMrVileMinigameRound1AndChallengeDialog[] = { }; enum asset_e chMrVileMinigameRematchDialog[] = { - ASSET_C6D_DIALOG_MR_VILE_LOSE_ROUND_1_REMATCH, - ASSET_C70_DIALOG_MR_VILE_WIN_ROUND_2_REMATCH, - ASSET_C71_DIALOG_MR_VILE_WIN_ROUND_3_REMATCH, - ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, + VER_SELECT(ASSET_C6D_DIALOG_MR_VILE_LOSE_ROUND_1_REMATCH, 0x9B0, 0, 0), + VER_SELECT(ASSET_C70_DIALOG_MR_VILE_WIN_ROUND_2_REMATCH, 0x9B3, 0, 0), + VER_SELECT(ASSET_C71_DIALOG_MR_VILE_WIN_ROUND_3_REMATCH, 0x9B4, 0, 0), + VER_SELECT(ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0x9D1, 0, 0), 0, 0, 0, @@ -128,7 +128,7 @@ enum MrVileMinigameMode { MR_VILE_MINIGAME_MODE_4_CHALLENGE_3 }; -#define MR_VILE_MINIGAME_TIMER 3600 +#define MR_VILE_MINIGAME_TIMER VER_SELECT(3600, 3000, 0, 0) #define TYPE_CHANGE_TIMER_REGULAR 10.0f #define TYPE_CHANGE_TIMER_FF 5.0f #define EXTRA_LIFE_SCORE 35 @@ -311,7 +311,7 @@ void chMrVileMinigame_vileDropsJiggy(ActorMarker *marker) { chMrVileMinigame_spawnJiggy(this, 1); gcdialog_showDialog( - ASSET_C6B_DIALOG_MR_VILE_PLAYER_WINS, + VER_SELECT(ASSET_C6B_DIALOG_MR_VILE_PLAYER_WINS, 0x9AE, 0, 0), 0xF, chMrVile_getPostion(local->vile_marker), this->marker, @@ -358,7 +358,7 @@ void chMrVileMinigame_vileDropsExtraLives(ActorMarker *marker) { } } gcdialog_showDialog( - ASSET_C98_DIALOG_MR_VILE_GIVES_PRIZE, + VER_SELECT(ASSET_C98_DIALOG_MR_VILE_GIVES_PRIZE, 0x9DB, 0, 0), 0xF, chMrVile_getPostion(local->vile_marker), this->marker, @@ -386,7 +386,7 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) { if (local->dialogIndex == 3) { if (local->mode >= MR_VILE_MINIGAME_MODE_4_CHALLENGE_2) { gcdialog_showDialog( - ASSET_C91_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_2, + VER_SELECT(ASSET_C91_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_2, 0x9D4, 0, 0), 0xE, chMrVile_getPostion(local->vile_marker), this->marker, @@ -396,8 +396,8 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) { } else { gcdialog_showDialog( (local->dialogIndex == local->mode) ? - ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO : - ASSET_C90_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_1, + VER_SELECT(ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO, 0x9D0, 0, 0) : + VER_SELECT(ASSET_C90_DIALOG_MR_VILE_EXTRA_CHALLENGE_REMATCH_1, 0x9D3, 0, 0), 0xE, chMrVile_getPostion(local->vile_marker), this->marker, @@ -408,8 +408,8 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) { } else { gcdialog_showDialog( (local->dialogIndex == local->mode) ? - ASSET_C63_DIALOG_MR_VILE_INTRO : - ASSET_C6C_DIALOG_MR_VILE_TRY_AGAIN, + VER_SELECT(ASSET_C63_DIALOG_MR_VILE_INTRO, 0x9A6, 0, 0) : + VER_SELECT(ASSET_C6C_DIALOG_MR_VILE_TRY_AGAIN, 0x9AF, 0, 0), 0xE, chMrVile_getPostion(local->vile_marker), this->marker, @@ -432,7 +432,7 @@ void chMrVileMinigame_setState(Actor *this, s32 next_state) { if (local->dialogIndex == local->mode) { gcdialog_showDialog( chMrVileMinigameRound1AndChallengeDialog[local->dialogIndex], - 0xE | ((chMrVileMinigameRound1AndChallengeDialog[local->dialogIndex] == ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1) ? 1 : 0) | 0xE, + 0xE | ((chMrVileMinigameRound1AndChallengeDialog[local->dialogIndex] == VER_SELECT(ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1, 0x9D1, 0, 0)) ? 1 : 0) | 0xE, chMrVile_getPostion(local->vile_marker), this->marker, chMrVileMinigame_setStatePlayingMinigame, diff --git a/src/CCW/ccwspawnqueue.c b/src/CCW/ccwspawnqueue.c index cb4d10fc..a25063ee 100644 --- a/src/CCW/ccwspawnqueue.c +++ b/src/CCW/ccwspawnqueue.c @@ -74,7 +74,7 @@ Actor* cc_pal_unk_draw(ActorMarker *, Gfx **, Mtx **, Vtx **); ActorInfo chNabnutWindowSpring = { MARKER_239_CCW_UNKNOWN_NABNUT_WINDOW, ACTOR_25F_CCW_UNKNOWN_NABNUT_WINDOW, ASSET_4FC_MODEL_CCW_UNKNOWN_NABNUT_WINDOW, 0x1, NULL, - chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; @@ -82,63 +82,63 @@ ActorInfo chNabnutWindowSpring = { ActorInfo chNabnutWindowSummer = { MARKER_236_CCW_UNKNOWN_NABNUT_WINDOW, ACTOR_260_CCW_UNKNOWN_NABNUT_WINDOW, ASSET_4F9_MODEL_CCW_UNKNOWN_NABNUT_WINDOW, 0x1, NULL, - chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chNabnutWindowAutumn = { MARKER_237_CCW_AUTUMN_NABNUT_WINDOW, ACTOR_261_CCW_AUTUMN_NABNUT_WINDOW, ASSET_4FA_MODEL_CCW_AUTUMN_NABNUT_WINDOW, 0x1, NULL, - chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chNabnutWindowWinter = { MARKER_238_CCW_WINTER_NABNUT_WINDOW, ACTOR_262_CCW_WINTER_NABNUT_WINDOW, ASSET_4FB_MODEL_CCW_WINTER_NABNUT_WINDOW, 0x1, NULL, - chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chNabnutDoor = { MARKER_243_NABNUT_DOOR, ACTOR_2E6_NABNUT_DOOR, ASSET_533_MODEL_NABNUT_DOOR, 0x1, NULL, - chMMMBreakableWooden_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chMMMBreakableWooden_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chCCWWhipcrackRoomDoor = { MARKER_263_CCW_WHIPCRACK_ROOM_DOOR, ACTOR_2E7_WHIPCRACK_ROOM_DOOR, ASSET_518_MODEL_CCW_WHIPCRACK_ROOM_DOOR, 0x1, NULL, - code_76C0_ccwWhipcrackRoomDoorUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + code_76C0_ccwWhipcrackRoomDoorUpdate, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chCCWMumbosHut = { MARKER_21E_CCW_MUMBOS_HUT, ACTOR_233_CCW_MUMBOS_HUT, ASSET_3B3_MODEL_CCW_MUMBOS_HUT, 0x1, NULL, - func_802D3D74, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + func_802D3D74, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chGnawtysDen = { MARKER_26B_GNAWTYS_DEN, ACTOR_2DE_GNAWTYS_DEN, ASSET_531_MODEL_GNAWTYS_DEN, 0x1, NULL, - code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chGnawtysBed = { MARKER_26C_GNAWTYS_BED, ACTOR_2DD_GNAWTYS_BED, ASSET_53E_MODEL_GNAWTY_BED, 0x1, NULL, - code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; ActorInfo chGnawtysShelves = { MARKER_26D_GNAWTYS_SHELVES, ACTOR_2DC_GNAWTYS_SHELVES, ASSET_53F_MODEL_GNAWTY_SHELVES, 0x1, NULL, - code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + code_76C0_ccwGnawtysStuffUpdate, actor_update_func_80326224, actor_drawFullDepth, 0, 0, 0.0f, 0 }; diff --git a/src/CCW/ch/seasonswitchdoors.c b/src/CCW/ch/seasonswitchdoors.c index ae822acb..43fa162b 100644 --- a/src/CCW/ch/seasonswitchdoors.c +++ b/src/CCW/ch/seasonswitchdoors.c @@ -29,14 +29,10 @@ ActorAnimationInfo chSeasonSwitchAnimations[] = { {ASSET_D4_ANIM_SWITCH_DOWN, 100000000.0f} }; -#if VERSION == VERSION_PAL -Actor* cc_pal_unk_draw(ActorMarker *, Gfx **, Mtx **, Vtx **); -#endif - ActorInfo chCCWSpringSwitchDoor = { MARKER_133_CCW_SPRING_SEASON_DOOR, ACTOR_1E3_CCW_SPRING_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR, 0x1, NULL, - chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0 }; @@ -50,7 +46,7 @@ ActorInfo chCCWSpringSwitch = { ActorInfo chCCWSummerSwitchDoor = { MARKER_131_CCW_SUMMER_SEASON_DOOR, ACTOR_16D_CCW_SUMMER_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR, 0x1, NULL, - chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0 }; @@ -64,7 +60,7 @@ ActorInfo chCCWSummerSwitch = { ActorInfo chCCWAutumnSwitchDoor = { MARKER_12F_CCW_AUTUMN_SEASON_DOOR, ACTOR_16B_CCW_AUTUMN_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR, 0x1, NULL, - chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0 }; @@ -78,7 +74,7 @@ ActorInfo chCCWAutumnSwitch = { ActorInfo chCCWWinterSwitchDoor = { MARKER_12D_CCW_WINTER_SEASON_DOOR, ACTOR_169_CCW_WINTER_SEASON_DOOR, ASSET_52E_MODEL_CCW_SEASON_DOOR, 0x1, NULL, - chSeasonSwitchDoors_update, actor_update_func_80326224, VER_SELECT(actor_drawFullDepth, cc_pal_unk_draw, 0, 0), + chSeasonSwitchDoors_update, actor_update_func_80326224, actor_drawFullDepth, 0, 0x4000, 0.0f, 0 }; diff --git a/src/FP/ch/bearcub.c b/src/FP/ch/bearcub.c index 4bc64146..3f7d650a 100644 --- a/src/FP/ch/bearcub.c +++ b/src/FP/ch/bearcub.c @@ -78,7 +78,7 @@ void func_8038A274(Actor *this){ } void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){ - if(text_id == 0xc19){ + if(text_id == VER_SELECT(ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3, 0x993, 0, 0)){ gcStaticCamera_activate(0x25); jiggy_spawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74); coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000); @@ -124,9 +124,9 @@ void func_8038A384(Actor *this){ }//L8038A4E4 sp34 = levelSpecificFlags_get(LEVEL_FLAG_11_FP_UNKNOWN) + levelSpecificFlags_get(LEVEL_FLAG_12_FP_UNKNOWN) + levelSpecificFlags_get(LEVEL_FLAG_13_FP_UNKNOWN); - sp38 = (sp34 == 1) ? ASSET_C17_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_1 - : (sp34 == 2) ? ASSET_C18_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_2 - : ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3; + sp38 = (sp34 == 1) ? VER_SELECT(ASSET_C17_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_1, 0x991, 0, 0) + : (sp34 == 2) ? VER_SELECT(ASSET_C18_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_2, 0x992, 0, 0) + : VER_SELECT(ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3, 0x993, 0, 0); this->yaw_ideal = (f32)subaddie_getYawToPlayer(this); subaddie_turnToYaw(this, 2.0f); @@ -140,7 +140,7 @@ void func_8038A384(Actor *this){ && !jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3) && !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3) ){ - if (gcdialog_showDialog(ASSET_C1A_DIALOG_BOGGY_KIDS_MEET, 0x2a, NULL, NULL, NULL, NULL)) { + if (gcdialog_showDialog(VER_SELECT(ASSET_C1A_DIALOG_BOGGY_KIDS_MEET, 0x994, 0, 0), 0x2a, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(LEVEL_FLAG_19_FP_UNKNOWN, TRUE); } } @@ -163,7 +163,7 @@ void func_8038A384(Actor *this){ } if(levelSpecificFlags_get(D_80391E80[sp3C].unk0)){ subaddie_set_state_with_direction(this, 2, 0.001f, 1); - if (sp38 == ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3) { + if (sp38 == VER_SELECT(ASSET_C19_DIALOG_BOGGY_KIDS_PRESENT_RECEIVED_3, 0x993, 0, 0)) { gcdialog_showDialog(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL); } else { diff --git a/src/FP/ch/boggy1.c b/src/FP/ch/boggy1.c index 481cd3ff..987547fe 100644 --- a/src/FP/ch/boggy1.c +++ b/src/FP/ch/boggy1.c @@ -85,8 +85,8 @@ void func_803877A8(ActorMarker *caller, enum asset_e text_id, s32 arg2){ void func_80387828(ActorMarker *caller, enum asset_e text_id, s32 arg2){ Actor *this = marker_getActor(caller); - if (text_id == ASSET_C00_DIALOG_BOGGY_SAVED) { - gcdialog_showDialog(ASSET_C2B_DIALOG_BOGGY_SAVED_2, 0xf, NULL, this->marker, NULL, func_803877A8); + if (text_id == VER_SELECT(ASSET_C00_DIALOG_BOGGY_SAVED, 0x97A, 0, 0)) { + gcdialog_showDialog(VER_SELECT(ASSET_C2B_DIALOG_BOGGY_SAVED_2, 0x9A5, 0, 0), 0xf, NULL, this->marker, NULL, func_803877A8); } } @@ -142,14 +142,14 @@ void func_8038794C(Actor *this){ if(mapSpecificFlags_get(0x1)){ func_8028F94C(1, this->position); timed_setStaticCameraToNode(0.0f, 0x12); - func_80324DBC(1.0f, ASSET_C00_DIALOG_BOGGY_SAVED, 0xe, NULL, this->marker, func_80387828, func_803877A8); + func_80324DBC(1.0f, VER_SELECT(ASSET_C00_DIALOG_BOGGY_SAVED, 0x97A, 0, 0), 0xe, NULL, this->marker, func_80387828, func_803877A8); func_803876A4(this); break; }//L80387B38 if(!this->has_met_before && subaddie_playerIsWithinSphereAndActive(this, 0x1f4)){ if(!player_movementGroup() || player_movementGroup() == BSGROUP_8_TROT){ - if (gcdialog_showDialog(ASSET_BFF_DIALOG_BOGGY_MEET, 0x2a, this->position, NULL, NULL, NULL)) { + if (gcdialog_showDialog(VER_SELECT(ASSET_BFF_DIALOG_BOGGY_MEET, 0x979, 0, 0), 0x2a, this->position, NULL, NULL, NULL)) { for (i = 0; i < 5; i++) { timedFunc_set_1(D_80391BEC[i], (GenFunction_1) func_8038787C, (s32) this->marker); } diff --git a/src/FP/ch/boggy2.c b/src/FP/ch/boggy2.c index 41fc7f3f..86704114 100644 --- a/src/FP/ch/boggy2.c +++ b/src/FP/ch/boggy2.c @@ -94,19 +94,19 @@ void FP_func_803888E4(Actor *this){ subaddie_set_state_with_direction(this, 0xC, 0.0001f, 1); if(!jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){ if(mapSpecificFlags_get(FP_SPECIFIC_FLAG_5_WALRUS_RACE_FAILED)){ - func_80324DBC(0.1f, ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL); + func_80324DBC(0.1f, VER_SELECT(ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START, 0x980, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL); } else{//L80388964 - func_80324DBC(0.1f, ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL); + func_80324DBC(0.1f, VER_SELECT(ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START, 0x97D, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL); } } else{//L803889A0 func_8028F490(D_80391D0C); if(mapSpecificFlags_get(FP_SPECIFIC_FLAG_6_BANJO_RACE_FAILED)){ - func_80324DBC(0.1f, ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL); + func_80324DBC(0.1f, VER_SELECT(ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START, 0x9A3, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL); } else{ - func_80324DBC(0.1f, ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START, 0x2a, D_80391D18, this->marker, func_80388D70, NULL); + func_80324DBC(0.1f, VER_SELECT(ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START, 0x9A2, 0, 0), 0x2a, D_80391D18, this->marker, func_80388D70, NULL); } }//L80388A30 mapSpecificFlags_set(FP_SPECIFIC_FLAG_5_WALRUS_RACE_FAILED, TRUE); @@ -124,10 +124,10 @@ void func_80388A50(Actor *this){ void func_80388A94(Actor *this){ func_80388A50(this); if(mapSpecificFlags_get(FP_SPECIFIC_FLAG_6_BANJO_RACE_FAILED)){ - gcdialog_showDialog(ASSET_C0A_DIALOG_BOGGY_SLED_BEAR_MISS_RETRY, 0xe, this->position, this->marker, func_80388D70, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C0A_DIALOG_BOGGY_SLED_BEAR_MISS_RETRY, 0x984, 0, 0), 0xe, this->position, this->marker, func_80388D70, NULL); } else{ - gcdialog_showDialog(ASSET_C09_DIALOG_BOGGY_SLED_BEAR_ANSWER_TO_START, 0xe, this->position, this->marker, func_80388D70, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C09_DIALOG_BOGGY_SLED_BEAR_ANSWER_TO_START, 0x983, 0, 0), 0xe, this->position, this->marker, func_80388D70, NULL); } } @@ -136,15 +136,15 @@ void func_80388B18(Actor *this, u8 arg1){ if(player_getTransformation() == TRANSFORM_4_WALRUS){ func_80388A50(this); if(mapSpecificFlags_get(FP_SPECIFIC_FLAG_5_WALRUS_RACE_FAILED)){ - gcdialog_showDialog(ASSET_C05_DIALOG_BOGGY_SLED_WALRUS_MISS_RETRY, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C05_DIALOG_BOGGY_SLED_WALRUS_MISS_RETRY, 0x97F, 0, 0), 0xf, this->position, this->marker, func_80388D70, NULL); } else{ - gcdialog_showDialog(ASSET_C02_DIALOG_BOGGY_SLED_WALRUS_MEET, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C02_DIALOG_BOGGY_SLED_WALRUS_MEET, 0x97C, 0, 0), 0xf, this->position, this->marker, func_80388D70, NULL); } } else{//L80388BB8 if(!volatileFlag_get(VOLATILE_FLAG_B3)){ - if(gcdialog_showDialog(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0xe, this->position, this->marker, func_80388D70, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0x97B, 0, 0), 0xe, this->position, this->marker, func_80388D70, NULL)){ volatileFlag_set(VOLATILE_FLAG_B3, TRUE); func_80388A50(this); } @@ -154,7 +154,7 @@ void func_80388B18(Actor *this, u8 arg1){ else{//L80388C08 if(player_getTransformation() == TRANSFORM_4_WALRUS){ if(!volatileFlag_get(VOLATILE_FLAG_B4)){ - if(gcdialog_showDialog(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0xe, this->position, this->marker, func_80388D70, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0x982, 0, 0), 0xe, this->position, this->marker, func_80388D70, NULL)){ volatileFlag_set(VOLATILE_FLAG_B4, TRUE); func_80388A50(this); } @@ -195,10 +195,10 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){ timed_exitStaticCamera(0.0f); switch(text_id){ - case ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START: - case ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START: - case ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START: - case ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START://L80388DC4 + case VER_SELECT(ASSET_C03_DIALOG_BOGGY_SLED_WALRUS_START, 0x97D, 0, 0): + case VER_SELECT(ASSET_C06_DIALOG_BOGGY_SLED_WALRUS_SECOND_START, 0x980, 0, 0): + case VER_SELECT(ASSET_C28_DIALOG_BOGGY_SLED_BEAR_START, 0x9A2, 0, 0): + case VER_SELECT(ASSET_C29_DIALOG_BOGGY_SLED_BEAR_SECOND_START, 0x9A3, 0, 0)://L80388DC4 coMusicPlayer_playMusic(COMUSIC_3A_FP_BOGGY_RACE, 25000); func_8025A58C(0, 4000); core1_ce60_incOrDecCounter(FALSE); @@ -481,13 +481,13 @@ void func_803896FC(Actor *this){ && player_getTransformation() != TRANSFORM_4_WALRUS && volatileFlag_get(VOLATILE_FLAG_B3) ){ - gcdialog_showDialog(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C01_DIALOG_BOGGY_SLED_BEAR_DENY, 0x97B, 0, 0), 0xf, this->position, this->marker, func_80388D70, NULL); } else if( local->unk19 == 2){ if( player_getTransformation() == TRANSFORM_4_WALRUS && volatileFlag_get(VOLATILE_FLAG_B4) ){ - gcdialog_showDialog(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0xf, this->position, this->marker, func_80388D70, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C08_DIALOG_BOGGY_SLED_WALRUS_COMPLETE_RETRY, 0x982, 0, 0), 0xf, this->position, this->marker, func_80388D70, NULL); } else if( player_getTransformation() != TRANSFORM_4_WALRUS){ func_80388A94(this); diff --git a/src/FP/ch/boggy3.c b/src/FP/ch/boggy3.c index 1e00430b..91acf25d 100644 --- a/src/FP/ch/boggy3.c +++ b/src/FP/ch/boggy3.c @@ -26,7 +26,7 @@ Actor *func_80390290(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){ if(this->unk38_31) return this; - if(gcdialog_getCurrentTextId() == 0xC1F || gcdialog_getCurrentTextId() == 0xC1E){ + if(gcdialog_getCurrentTextId() == VER_SELECT(ASSET_C1F_DIALOG_BOGGY_IGLOO_2, 0x999, 0, 0) || gcdialog_getCurrentTextId() == VER_SELECT(ASSET_C1E_DIALOG_BOGGY_IGLOO_1, 0x998, 0, 0)){ sp18 = 1; } modelRender_setAppendageVisibility(1, 0); @@ -77,14 +77,14 @@ void func_80390388(Actor *this){ && (player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT) ){ if(0.0f == this->unk1C[0] && func_80390334()){ - if(gcdialog_showDialog(ASSET_C1F_DIALOG_BOGGY_IGLOO_2, 0xb, this->position, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_C1F_DIALOG_BOGGY_IGLOO_2, 0x999, 0, 0), 0xb, this->position, NULL, NULL, NULL)){ this->has_met_before = TRUE; this->unk1C[0] = 1.0f; } } else{ if( !this->has_met_before ){ - if(gcdialog_showDialog(ASSET_C1E_DIALOG_BOGGY_IGLOO_1, 0x2b, this->position, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_C1E_DIALOG_BOGGY_IGLOO_1, 0x998, 0, 0), 0x2b, this->position, NULL, NULL, NULL)){ this->has_met_before = TRUE; } } diff --git a/src/FP/ch/cavewozza.c b/src/FP/ch/cavewozza.c index b0dab7c9..b55f5e3c 100644 --- a/src/FP/ch/cavewozza.c +++ b/src/FP/ch/cavewozza.c @@ -69,14 +69,14 @@ void chCaveWozza_update(Actor *this){ if (subaddie_playerIsWithinSphereAndActive(this, 350)) { if (player_getTransformation() == TRANSFORM_4_WALRUS) { if (!levelSpecificFlags_get(LEVEL_FLAG_31_FP_WOZZA_WALRUS_TALKED)) { - if (gcdialog_showDialog(ASSET_C27_DIALOG_WOZZA_CAVE_MEET_AS_WALRUS, 0x23, NULL, NULL, NULL, NULL)) { + if (gcdialog_showDialog(VER_SELECT(ASSET_C27_DIALOG_WOZZA_CAVE_MEET_AS_WALRUS, 0x9A1, 0, 0), 0x23, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(LEVEL_FLAG_31_FP_WOZZA_WALRUS_TALKED, TRUE); } } } else { if (!levelSpecificFlags_get(LEVEL_FLAG_32_FP_WOZZA_BEAR_TALKED)) { - if (gcdialog_showDialog(ASSET_C26_DIALOG_WOZZA_CAVE_MEET_AS_BEAR, 0x23, NULL, NULL, NULL, NULL)) { + if (gcdialog_showDialog(VER_SELECT(ASSET_C26_DIALOG_WOZZA_CAVE_MEET_AS_BEAR, 0x9A0, 0, 0), 0x23, NULL, NULL, NULL, NULL)) { levelSpecificFlags_set(LEVEL_FLAG_32_FP_WOZZA_BEAR_TALKED, TRUE); } } diff --git a/src/FP/ch/twinkly.c b/src/FP/ch/twinkly.c index 21495de4..056a6f82 100644 --- a/src/FP/ch/twinkly.c +++ b/src/FP/ch/twinkly.c @@ -336,11 +336,11 @@ void chTwinkly_update(Actor *this){ if(this->unk1C[1] <= this->position_y){ this->position_y = this->unk1C[1]; if(!fileProgressFlag_get(FILEPROG_82_MET_TWINKLIES)){ - gcdialog_showDialog(ASSET_C12_DIALOG_TWINKLIE_MINIGAME_START, 0x2a, this->position, this->marker, chTwinkly_setUpMinigame, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C12_DIALOG_TWINKLIE_MINIGAME_START, 0x98C, 0, 0), 0x2a, this->position, this->marker, chTwinkly_setUpMinigame, NULL); fileProgressFlag_set(FILEPROG_82_MET_TWINKLIES, TRUE); } else{ - gcdialog_showDialog(ASSET_C25_DIALOG_TWINKLIE_MINIGAME_RETRY, 0x2b, this->position, this->marker, chTwinkly_setUpMinigame, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C25_DIALOG_TWINKLIE_MINIGAME_RETRY, 0x99F, 0, 0), 0x2b, this->position, this->marker, chTwinkly_setUpMinigame, NULL); } subaddie_set_state(this, 5); this->pitch -= 3.0f; diff --git a/src/FP/ch/twinklybox.c b/src/FP/ch/twinklybox.c index 275076ac..a7223f6d 100644 --- a/src/FP/ch/twinklybox.c +++ b/src/FP/ch/twinklybox.c @@ -177,7 +177,7 @@ void chTwinklyBox_destroyBox(ActorMarker *marker){ chTwinklyBox_destroyBoxDust(this->position, 12, ASSET_700_SPRITE_DUST); this->velocity[1] = 0.0f; sfx_playFadeShorthandDefault(SFX_30_MAGIC_POOF, 1.0f, 32000, this->position, 1000, 3500); - gcdialog_showDialog(ASSET_C13_DIALOG_TWINKLIE_MINIGAME_COMPLETE, 0, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C13_DIALOG_TWINKLIE_MINIGAME_COMPLETE, 0x98D, 0, 0), 0, NULL, NULL, NULL, NULL); } void chTwinklyBox_openBox(Actor *this){ @@ -364,7 +364,7 @@ void chTwinklyBox_update(Actor *this){ func_8028F784(0); subaddie_set_state_with_direction(this, 4, 0.999f, 1); actor_playAnimationOnce(this); - item_set(ITEM_0_HOURGLASS_TIMER, 80*60 - 1); + item_set(ITEM_0_HOURGLASS_TIMER, 80*FRAMERATE - 1); item_set(ITEM_6_HOURGLASS, TRUE); this->unk38_31 = 0xA; item_set(ITEM_24_TWINKLY_SCORE, this->unk38_31); diff --git a/src/FP/ch/twinklymuncher.c b/src/FP/ch/twinklymuncher.c index 261b62ec..22395ab5 100644 --- a/src/FP/ch/twinklymuncher.c +++ b/src/FP/ch/twinklymuncher.c @@ -127,7 +127,7 @@ void chTwinklyMuncher_update(Actor *this){ if(this->actorTypeSpecificField == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){ if(this->state != 6 && this->state != 7 && 0.0f == this->velocity[0]){ timed_setStaticCameraToNode(0.5f, 0xd); - gcdialog_showDialog(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_MISS, 0x2b, this->position, this->marker, chTwinklyMuncher_failMinigameExit, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_MISS, 0x98F, 0, 0), 0x2b, this->position, this->marker, chTwinklyMuncher_failMinigameExit, NULL); this->velocity[0] = 1.0f; subaddie_set_state_with_direction(this, 6, 0.03f, 1); actor_loopAnimation(this); @@ -201,7 +201,7 @@ void chTwinklyMuncher_update(Actor *this){ sfx_playFadeShorthandDefault(SFX_27_JINJO_HI, 1.6f, 32000, this->position, 1250, 2500); func_80324D54(0.35f, SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250.0f, 2500.0f); marker_despawn(sp38->marker); - if( !mapSpecificFlags_get(FP_SPECIFIC_FLAG_A_FIRST_TWINKLY_EATEN) && gcdialog_showDialog(ASSET_C16_DIALOG_TWINKLIE_MINIGAME_EATEN, 0, NULL, NULL, NULL, NULL)){ + if( !mapSpecificFlags_get(FP_SPECIFIC_FLAG_A_FIRST_TWINKLY_EATEN) && gcdialog_showDialog(VER_SELECT(ASSET_C16_DIALOG_TWINKLIE_MINIGAME_EATEN, 0x990, 0, 0), 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(FP_SPECIFIC_FLAG_A_FIRST_TWINKLY_EATEN, TRUE); } } diff --git a/src/FP/ch/wozza.c b/src/FP/ch/wozza.c index c38b6608..e5c26307 100644 --- a/src/FP/ch/wozza.c +++ b/src/FP/ch/wozza.c @@ -70,11 +70,11 @@ void chWozza_enterCaveFinal(Actor *this){ void chWozza_textCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2){ Actor *this = marker_getActor(caller); switch(text_id){ - case ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR: + case VER_SELECT(ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR, 0x995, 0, 0): timed_exitStaticCamera(0.0f); break; - case ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS: + case VER_SELECT(ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS, 0x996, 0, 0): timed_exitStaticCamera(0.0f); chWozza_enterCaveFinal(this); break; @@ -110,7 +110,7 @@ void chWozza_firstContact(Actor *this){ subaddie_set_state(this, 2); actor_loopAnimation(this); timed_setStaticCameraToNode(0.0f, 0x2e); - func_80324DBC(0.0f, ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR, 0x2a, this->position, this->marker, chWozza_textCallback, NULL); + func_80324DBC(0.0f, VER_SELECT(ASSET_C1B_DIALOG_WOZZA_MEET_AS_BEAR, 0x995, 0, 0), 0x2a, this->position, this->marker, chWozza_textCallback, NULL); timedFunc_set_1(2.5f, (GenFunction_1)chWozza_delayedRetreatToCave, (s32)this->marker); } else{ @@ -276,7 +276,7 @@ void chWozza_update(Actor *this){ chWozza_checkForPlayer(this); if(!local->unk30){ - if(gcdialog_showDialog(ASSET_C1D_DIALOG_WOZZA_RETURN, 0x20, NULL, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_C1D_DIALOG_WOZZA_RETURN, 0x997, 0, 0), 0x20, NULL, NULL, NULL, NULL)){ local->unk30 = TRUE; } } @@ -303,7 +303,7 @@ void chWozza_update(Actor *this){ } if(subaddie_playerIsWithinSphereAndActive(this, 500) && !this->has_met_before){ - if(gcdialog_showDialog(ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS, 0xAA, this->position, this->marker, chWozza_textCallback, chWozza_checkCompletion)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_C1C_DIALOG_WOZZA_MEET_AS_WALRUS, 0x996, 0, 0), 0xAA, this->position, this->marker, chWozza_textCallback, chWozza_checkCompletion)){ timed_setStaticCameraToNode(0.0f, 0x2E); this->has_met_before = TRUE; } diff --git a/src/FP/ch/xmastree.c b/src/FP/ch/xmastree.c index 1dfca604..5e46ac8c 100644 --- a/src/FP/ch/xmastree.c +++ b/src/FP/ch/xmastree.c @@ -127,7 +127,7 @@ void chXmasTree_update(Actor *this){ this->lifetime_value = 2.0f; coMusicPlayer_playMusic(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000); gcStaticCamera_activate(0x1A); - gcdialog_showDialog(ASSET_C14_DIALOG_TWINKLIE_MINIGAME_LIGHT_TREE, 0, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C14_DIALOG_TWINKLIE_MINIGAME_LIGHT_TREE, 0x98E, 0, 0), 0, NULL, NULL, NULL, NULL); break; case 3: // L803872F0 @@ -150,7 +150,7 @@ void chXmasTree_update(Actor *this){ if(func_802BB270()){ subaddie_set_state(this, 4); chXmasTree_setState(this, 1); - item_set(ITEM_0_HOURGLASS_TIMER, 3600 - 1); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(3600, 3000, 0, 0) - 1); item_set(ITEM_6_HOURGLASS, TRUE); } diff --git a/src/FP/ma/slalom.c b/src/FP/ma/slalom.c index 95cba1d6..453064f2 100644 --- a/src/FP/ma/slalom.c +++ b/src/FP/ma/slalom.c @@ -249,23 +249,23 @@ void maSlalom_dialogCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2 } switch(text_id){ - case ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS: //8038B318 + case VER_SELECT(ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS, 0x97E, 0, 0): //8038B318 __maSlalom_loseDialogCallback(); break; - case ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE: //8038B328 + case VER_SELECT(ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE, 0x981, 0, 0): //8038B328 __maSlalom_winDialogCallback(JIGGY_30_FP_BOGGY_2); break; - case ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS: //8038B338 + case VER_SELECT(ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS, 0x985, 0, 0): //8038B338 __maSlalom_loseDialogCallback(); break; - case ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE: //8038B348 + case VER_SELECT(ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE, 0x987, 0, 0): //8038B348 __maSlalom_winDialogCallback(JIGGY_2C_FP_BOGGY_3); break; - case ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP: //8038B358 + case VER_SELECT(ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP, 0x98A, 0, 0): //8038B358 func_8038ABDC(); code_7060_setVoidOutLocation(gsworld_getMap(), 0x11); func_8028F66C(BS_INTR_2A); @@ -299,12 +299,12 @@ void maSlalom_lose(void){ if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){ timed_setStaticCameraToNode(0.0f, 1); timed_playSfx(1.0f, SFX_8C_BOGGY_WAHEY, 1.0f, 32000); - func_80324DBC(2.0f, ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); + func_80324DBC(2.0f, VER_SELECT(ASSET_C04_DIALOG_BOGGY_SLED_WALRUS_MISS, 0x97E, 0, 0), 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); }//L8038B4E0 else{ timed_setStaticCameraToNode(0.0f, 1); timed_playSfx(1.0f, SFX_8C_BOGGY_WAHEY, 1.0f, 32000); - func_80324DBC(2.0f, ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS, 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); + func_80324DBC(2.0f, VER_SELECT(ASSET_C0B_DIALOG_BOGGY_SLED_BEAR_MISS, 0x985, 0, 0), 0x2b, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); } } @@ -358,10 +358,10 @@ void maSlalom_update(void){ pntBoggy->unk38_31 = 2; timed_playSfx(1.0f, SFX_8D_BOGGY_OHWW, 1.0f, 32000); if(jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) || jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){ - func_80324DBC(2.0f, ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE, 0x2a, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); + func_80324DBC(2.0f, VER_SELECT(ASSET_C0D_DIALOG_BOGGY_SLED_BEAR_COMPLETE, 0x987, 0, 0), 0x2a, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); } else{ - func_80324DBC(2.0f, ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE, 0x22, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); + func_80324DBC(2.0f, VER_SELECT(ASSET_C07_DIALOG_BOGGY_SLED_WALRUS_COMPLETE, 0x981, 0, 0), 0x22, pntBoggy->position, NULL, maSlalom_dialogCallback, NULL); } Me.state = MA_SLALOM_STATE_4_LOSE; break; @@ -538,7 +538,7 @@ void maSlalom_setBoggyGate(s32 gate_num){ FP_func_8038AB60(0); if(!player_isDead()){ func_8028F918(2); - gcdialog_showDialog(ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP, 0x20, NULL, NULL, maSlalom_dialogCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C10_DIALOG_BOGGY_SLED_EITHER_GIVE_UP, 0x98A, 0, 0), 0x20, NULL, NULL, maSlalom_dialogCallback, NULL); }//L8038BD40 Me.state = MA_SLALOM_STATE_4_LOSE; break; @@ -546,7 +546,7 @@ void maSlalom_setBoggyGate(s32 gate_num){ case 3: if(!Me.hasBeenThreeBehind && !player_isDead()){ Me.hasBeenThreeBehind = 1; - gcdialog_showDialog(ASSET_C0F_DIALOG_BOGGY_SLED_EITHER_TAUNT_2, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C0F_DIALOG_BOGGY_SLED_EITHER_TAUNT_2, 0x989, 0, 0), 0x20, NULL, NULL, NULL, NULL); }//L8038BD94 func_8025AEA0(0x3a, 0x411aa); break; @@ -554,7 +554,7 @@ void maSlalom_setBoggyGate(s32 gate_num){ case 2: if(!Me.hasBeenTwoBehind && !player_isDead()){ Me.hasBeenTwoBehind = 1; - gcdialog_showDialog(ASSET_C0E_DIALOG_BOGGY_SLED_EITHER_TAUNT_1, 0x20, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_C0E_DIALOG_BOGGY_SLED_EITHER_TAUNT_1, 0x988, 0, 0), 0x20, NULL, NULL, NULL, NULL); }//L8038BDF0 func_8025AEA0(0x3a, 0x493e0); break; diff --git a/src/GV/ch/ancientone.c b/src/GV/ch/ancientone.c index 36cd47db..c42adb66 100644 --- a/src/GV/ch/ancientone.c +++ b/src/GV/ch/ancientone.c @@ -95,7 +95,7 @@ void func_803867F4(void){ void func_80386850(ActorMarker *caller_marker, enum asset_e text_id, s32 arg2){ Actor *caller = marker_getActor(caller_marker); - if(text_id == 0xA80){ + if(text_id == VER_SELECT(0xA80, 0x93C, 0, 0)){ subaddie_set_state_with_direction(caller, 2, 0.0f, 1); actor_playAnimationOnce(caller); coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff); @@ -149,16 +149,16 @@ void chAncientOne_update(Actor *this){ mapSpecificFlags_set(sp38, TRUE); if(sp38== 0xB){ if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){ - gcdialog_showDialog(ASSET_A80_DIALOG_ANCIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A80_DIALOG_ANCIENT_ONES_DONE, 0x93C, 0, 0), 0xE, NULL, this->marker, func_80386850, NULL); } else{ - func_80386850(this->marker, 0xA80, -1); + func_80386850(this->marker, VER_SELECT(ASSET_A80_DIALOG_ANCIENT_ONES_DONE, 0x93C, 0, 0), -1); } }//L80386B98 else { if(sp38== 7){ if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){ - gcdialog_showDialog(ASSET_A7F_DIALOG_ANCIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A7F_DIALOG_ANCIENT_ONES_MEET, 0x93B, 0, 0), 0x4, NULL, NULL, NULL, NULL); } } diff --git a/src/GV/ch/gobi1.c b/src/GV/ch/gobi1.c index 29c05a6e..410c3034 100644 --- a/src/GV/ch/gobi1.c +++ b/src/GV/ch/gobi1.c @@ -158,7 +158,7 @@ void chGobi1_update(Actor *this){ timed_playSfx(1.0f, SFX_84_GOBI_CRYING, 1.1f, 30000); timed_playSfx(2.0f, SFX_84_GOBI_CRYING, 1.3f, 30000); timed_playSfx(2.5f, SFX_74_WALKING_NOISE_5, 0.5f, 30000); - func_80324DBC(3.0f, ASSET_A74_DIALOG_GOBI_HELPED, 0x2a, this->position, NULL, NULL, NULL); + func_80324DBC(3.0f, VER_SELECT(ASSET_A74_DIALOG_GOBI_HELPED, 0x930, 0, 0), 0x2a, this->position, NULL, NULL, NULL); timed_playSfx(5.0f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000); timed_playSfx(5.6f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000); timed_playSfx(6.5f, SFX_2E_BIGBUTT_RUNNING, 1.0f, 20000); @@ -180,7 +180,7 @@ void chGobi1_update(Actor *this){ && subaddie_playerIsWithinSphereAndActive(this, 250) && !subaddie_playerIsWithinSphereAndActive(this, 80) && func_8028F2A0() - && gcdialog_showDialog(0xa73, 0, NULL, NULL, NULL, NULL) + && gcdialog_showDialog(VER_SELECT(0xa73, 0x92F, 0, 0), 0, NULL, NULL, NULL, NULL) ){ this->has_met_before = TRUE; } diff --git a/src/GV/ch/gobi2.c b/src/GV/ch/gobi2.c index 5a76976f..e30f672e 100644 --- a/src/GV/ch/gobi2.c +++ b/src/GV/ch/gobi2.c @@ -85,7 +85,7 @@ void chGobi2_setState(Actor *this, s32 next_state){ timed_playSfx(0.8f, SFX_4B_GULPING, 0.8f, 28000); timed_playSfx(1.4f, SFX_4B_GULPING, 0.8f, 28000); timed_playSfx(2.0f, SFX_4B_GULPING, 0.8f, 28000); - func_80324DBC(3.0f, ASSET_A72_DIALOG_TRUNKER_HELPED, 0x2A, D_80390CEC, this->marker, func_80387A2C, NULL); + func_80324DBC(3.0f, VER_SELECT(ASSET_A72_DIALOG_TRUNKER_HELPED, 0x92E, 0, 0), 0x2A, D_80390CEC, this->marker, func_80387A2C, NULL); }//L80387C94 if(next_state == 4){ @@ -203,7 +203,7 @@ void chGobi2_update(Actor *this){ if(!this->has_met_before){ if(subaddie_playerIsWithinSphereAndActive(this, 0xFA) && !subaddie_playerIsWithinSphereAndActive(this, 0x50)){ if(func_8028F2A0()){ - if(gcdialog_showDialog(ASSET_A75_DIALOG_GOBI2_MEET, 0, this->position, NULL, NULL, NULL)) + if(gcdialog_showDialog(VER_SELECT(ASSET_A75_DIALOG_GOBI2_MEET, 0x931, 0, 0), 0, this->position, NULL, NULL, NULL)) this->has_met_before = TRUE; } } diff --git a/src/GV/ch/gobi3.c b/src/GV/ch/gobi3.c index 03391066..028f93ef 100644 --- a/src/GV/ch/gobi3.c +++ b/src/GV/ch/gobi3.c @@ -72,7 +72,7 @@ void chGobi3_setState(Actor *this, s32 next_state){ if(next_state == 5){ skeletalAnim_set(this->unk148, 0xd9, 0.5f, 4.0f); - gcdialog_showDialog(ASSET_A77_DIALOG_GOBI3_DONE, 0xe, this->position, this->marker, __chGobi3_runaway, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A77_DIALOG_GOBI3_DONE, 0x933, 0, 0), 0xe, this->position, this->marker, __chGobi3_runaway, NULL); } if(next_state == 4){ diff --git a/src/GV/ch/grabba.c b/src/GV/ch/grabba.c index 8bf2663e..818e4c49 100644 --- a/src/GV/ch/grabba.c +++ b/src/GV/ch/grabba.c @@ -73,7 +73,7 @@ void func_8038BA08(Actor *this){ if(player_movementGroup() == BSGROUP_6_TURBO_TALON_TRAINERS) player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f); - gcdialog_showDialog(ASSET_A79_DIALOG_GRABBA_DEFEAT, 0xf, this->position, this->marker, func_8038B988, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A79_DIALOG_GRABBA_DEFEAT, 0x935, 0, 0), 0xf, this->position, this->marker, func_8038B988, NULL); comusic_8025AB44(COMUSIC_57_TURBO_TRAINERS, 7000, 700); } @@ -255,7 +255,7 @@ void chGrabba_update(Actor *this){ } else{ if(!this->has_met_before){ - if(gcdialog_showDialog(ASSET_A78_DIALOG_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_A78_DIALOG_GRABBA_MEET, 0x934, 0, 0), 0, NULL, NULL, NULL, NULL)){ this->has_met_before = TRUE; } } @@ -286,7 +286,7 @@ void chGrabba_update(Actor *this){ } if(!this->unk138_23){ - if(gcdialog_showDialog(ASSET_A7A_DIALOG_GRABBA_TOO_FAST, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_A7A_DIALOG_GRABBA_TOO_FAST, 0x936, 0, 0), 0, NULL, NULL, NULL, NULL)){ this->unk138_23 = TRUE; } } diff --git a/src/GV/ch/mazectrl.c b/src/GV/ch/mazectrl.c index bbd2f299..d5946ab2 100644 --- a/src/GV/ch/mazectrl.c +++ b/src/GV/ch/mazectrl.c @@ -66,7 +66,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){ if(next_state == 2){ func_8025A58C(0, 4000); coMusicPlayer_playMusic(COMUSIC_26_GV_SANDYBUTT_DANGER, 30000); - item_set(ITEM_0_HOURGLASS_TIMER, 0xdd3); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(0xdd3, 0xb85, 0, 0)); item_set(ITEM_6_HOURGLASS, TRUE); func_8038F520(1.0f); FUNC_8030E624(SFX_3F6_RUBBING, 0.8f, 25000); @@ -85,7 +85,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){ } if (!levelSpecificFlags_get(LEVEL_FLAG_16_GV_UNKNOWN)) { - gcdialog_showDialog(ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, 0x93E, 0, 0), 4, NULL, NULL, NULL, NULL); levelSpecificFlags_set(LEVEL_FLAG_16_GV_UNKNOWN, TRUE); } }//L8038F794 @@ -135,7 +135,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){ coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff); if(!levelSpecificFlags_get(LEVEL_FLAG_17_GV_UNKNOWN)){ - gcdialog_showDialog(ASSET_A83_DIALOG_SANDYBUTT_DONE, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A83_DIALOG_SANDYBUTT_DONE, 0x93F, 0, 0), 4, NULL, NULL, NULL, NULL); levelSpecificFlags_set(LEVEL_FLAG_17_GV_UNKNOWN, TRUE); } } @@ -178,7 +178,7 @@ void chMazeCtrl_update(Actor *this){ if (!levelSpecificFlags_get(LEVEL_FLAG_15_GV_UNKNOWN) && ml_timer_update(&local->unk8, sp34) - && gcdialog_showDialog(ASSET_A81_DIALOG_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL) + && gcdialog_showDialog(VER_SELECT(ASSET_A81_DIALOG_SANDYBUTT_ENTER, 0x93D, 0, 0), 0, NULL, NULL, NULL, NULL) ) { levelSpecificFlags_set(LEVEL_FLAG_15_GV_UNKNOWN, TRUE); } diff --git a/src/GV/ch/trunker.c b/src/GV/ch/trunker.c index 8fb1f553..c776e665 100644 --- a/src/GV/ch/trunker.c +++ b/src/GV/ch/trunker.c @@ -74,7 +74,7 @@ void chTrucker_update(Actor *this){ && !subaddie_playerIsWithinSphereAndActive(this, 80) && func_8028F2A0() ){ - gcdialog_showDialog(ASSET_A71_DIALOG_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A71_DIALOG_TRUNKER_MEET, 0x92D, 0, 0), 0xe, this->position, NULL, NULL, NULL); this->has_met_before = TRUE; }//L80389254 diff --git a/src/GV/code_3630.c b/src/GV/code_3630.c index 48f42178..1e8e3277 100644 --- a/src/GV/code_3630.c +++ b/src/GV/code_3630.c @@ -38,14 +38,14 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){ } void func_80389A60(Actor *this){ - gcdialog_showDialog(ASSET_A70_DIALOG_RUBEE_HELPED, 4, NULL, this->marker, func_80389A20, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A70_DIALOG_RUBEE_HELPED, 0x92C, 0, 0), 4, NULL, this->marker, func_80389A20, NULL); this->has_met_before = TRUE; subaddie_set_state(this, CH_RUBEE_STATE_5_UNK); } void func_80389ABC(Actor *this){ if(this->unk138_23){ - func_80389A20(this->marker, ASSET_A70_DIALOG_RUBEE_HELPED, -1); + func_80389A20(this->marker, VER_SELECT(ASSET_A70_DIALOG_RUBEE_HELPED, 0x92C, 0, 0), -1); } else{ this->unk138_23 = TRUE; @@ -77,7 +77,7 @@ void chRubee_update(Actor *this){ && subaddie_playerIsWithinSphereAndActive(this, 250) && !subaddie_playerIsWithinSphereAndActive(this, 0x50)) { - gcdialog_showDialog(ASSET_A6F_DIALOG_RUBEE_MEET, 0xE, this->position, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A6F_DIALOG_RUBEE_MEET, 0x92B, 0, 0), 0xE, this->position, NULL, NULL, NULL); this->has_met_before = TRUE; mapSpecificFlags_set(0, TRUE); } diff --git a/src/GV/code_7060.c b/src/GV/code_7060.c index aea5ad99..fb76e9ac 100644 --- a/src/GV/code_7060.c +++ b/src/GV/code_7060.c @@ -74,7 +74,7 @@ void func_8038D47C(Actor *this){ player_getPosition(sp3C); if(player_movementGroup() == BSGROUP_0_NONE){ if( ml_vec3f_distance(sp3C, this->unk1C) < 100.0f || ml_vec3f_distance(sp3C, this->velocity) < 100.0f){ - if(gcdialog_showDialog(ASSET_A7B_DIALOG_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_A7B_DIALOG_JINXY_MEET, 0x937, 0, 0), 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(0x14, 1); } } @@ -103,7 +103,7 @@ void func_8038D47C(Actor *this){ } if( actor_animationIsAt(this, 0.99f) ){ if(--this->unk38_31 == 0){ - gcdialog_showDialog(ASSET_A7C_DIALOG_JINXY_ONE_EGG, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A7C_DIALOG_JINXY_ONE_EGG, 0x938, 0, 0), 4, NULL, NULL, NULL, NULL); mapSpecificFlags_set(0x14, TRUE); subaddie_set_state_forward(this, 1); } diff --git a/src/GV/crc.c b/src/GV/crc.c index 108197fe..b0ee598d 100644 --- a/src/GV/crc.c +++ b/src/GV/crc.c @@ -6,9 +6,9 @@ extern void player_stateTimer_set(s32, f32); extern f32 player_stateTimer_get(enum state_timer_e); -s32 D_80390F30 = VER_SELECT(0x00274530, 0, 0, 0); // GV_TEXT_CRC1 -s32 D_80390F34 = VER_SELECT(0xAA18BBF3, 0, 0, 0); // GV_TEXT_CRC2 -s32 D_80390F38 = VER_SELECT(0x0003031C, 0, 0, 0); // GV_DATA_CRC1 +s32 D_80390F30 = VER_SELECT(0x00274530, 0x002764CA, 0, 0); // GV_TEXT_CRC1 +s32 D_80390F34 = VER_SELECT(0xAA18BBF3, 0xFB1E80F4, 0, 0); // GV_TEXT_CRC2 +s32 D_80390F38 = VER_SELECT(0x0003031C, 0x00031973, 0, 0); // GV_DATA_CRC1 /* .code */ diff --git a/src/GV/gvspawnqueue.c b/src/GV/gvspawnqueue.c index 02ecac82..0d9e966d 100644 --- a/src/GV/gvspawnqueue.c +++ b/src/GV/gvspawnqueue.c @@ -177,7 +177,7 @@ void func_8038E460(Actor *this){//banjo_door if(!mapSpecificFlags_get(2)){ mapSpecificFlags_set(2, TRUE); func_8028F918(0); - func_80324DBC(4.0f, ASSET_A7D_DIALOG_JINXY_HELPED, 4, NULL, NULL, NULL, NULL); + func_80324DBC(4.0f, VER_SELECT(ASSET_A7D_DIALOG_JINXY_HELPED, 0x939, 0, 0), 4, NULL, NULL, NULL, NULL); } } } diff --git a/src/GV/matchinggame.c b/src/GV/matchinggame.c index 9f2e9e27..8f96659d 100644 --- a/src/GV/matchinggame.c +++ b/src/GV/matchinggame.c @@ -70,9 +70,9 @@ void __matchingGame_setState(s32 next_state){ if(next_state == 2){ item_set(ITEM_6_HOURGLASS, 1); if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) - item_set(ITEM_0_HOURGLASS_TIMER, 4499); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(4499, 0xea5, 0, 0)); else - item_set(ITEM_0_HOURGLASS_TIMER, 5999); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(5999, 0x1387, 0, 0)); } if(matchingGame.state == 2){ item_set(ITEM_6_HOURGLASS, 0); diff --git a/src/MM/ch/conga.c b/src/MM/ch/conga.c index a09e995d..b8ece98c 100644 --- a/src/MM/ch/conga.c +++ b/src/MM/ch/conga.c @@ -143,7 +143,7 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){ ){ func_8038708C(actorPtr, 2); if(actorPtr->unk38_31 == 1){ - gcdialog_showDialog(ASSET_B39_DIALOG_CONGA_HIT_BY_EGG, 4, actorPtr->position, 0, 0, 0); + gcdialog_showDialog(VER_SELECT(ASSET_B39_DIALOG_CONGA_HIT_BY_EGG, 0x957, 0, 0), 4, actorPtr->position, 0, 0, 0); } } } @@ -153,10 +153,10 @@ void func_80387168(ActorMarker *marker, ActorMarker *other_marker){ int func_803872EC(void){ s32 text_id = gcdialog_getCurrentTextId(); - return text_id == ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE - || text_id == ASSET_B38_DIALOG_CONGA_DEFEAT + return text_id == VER_SELECT(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0x955, 0, 0) + || text_id == VER_SELECT(ASSET_B38_DIALOG_CONGA_DEFEAT, 0x956, 0, 0) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) - || text_id == ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY + || text_id == VER_SELECT(ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY, 0x959, 0, 0) || text_id == ASSET_B45_DIALOG_JIGGY_COLLECT_10 || text_id == ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL; } @@ -260,13 +260,13 @@ void chConga_update(Actor *this) { if (func_8032A9E4(((ActorLocal_Conga *)&this->local)->unk10, ((ActorLocal_Conga *)&this->local)->unk18, ((ActorLocal_Conga *)&this->local)->unk1C) && !this->unk138_23 - && gcdialog_showDialog(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0, 0, 0, 0, 0)) { + && gcdialog_showDialog(VER_SELECT(ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE, 0x955, 0, 0), 0, 0, 0, 0, 0)) { this->unk138_23 = 1; mapSpecificFlags_set(MM_SPECIFIC_FLAG_A_UNKNOWN, TRUE); }//L803878F8 if (sp3C && !this->has_met_before) { - if (gcdialog_showDialog((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE : ASSET_B3C_DIALOG_CONGA_MEET, 0, this->position, 0,0,0)) { + if (gcdialog_showDialog((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE : VER_SELECT(ASSET_B3C_DIALOG_CONGA_MEET, 0x95A, 0, 0), 0, this->position, 0,0,0)) { this->has_met_before = TRUE; } } //L80387968 @@ -369,7 +369,7 @@ void chConga_update(Actor *this) { if (actor_animationIsAt(this, 0.99f)) { subaddie_set_state_with_direction(this, CONGA_STATE_MOPEY, 0.0f, 1); - gcdialog_showDialog(ASSET_B38_DIALOG_CONGA_DEFEAT, 0xe, this->position, this->marker, func_80387370, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_B38_DIALOG_CONGA_DEFEAT, 0x956, 0, 0), 0xe, this->position, this->marker, func_80387370, NULL); } break; diff --git a/src/MM/ch/juju.c b/src/MM/ch/juju.c index 2650e176..581ae946 100644 --- a/src/MM/ch/juju.c +++ b/src/MM/ch/juju.c @@ -208,7 +208,7 @@ void chjuju_update(Actor *this) { switch (jujuPtr->animation_state) { case JUJU_ANIMATION_STATE_1_YAWING: //L80389624 previous_yaw = this->yaw; - this->yaw += ((11 - mm_juju_count * 2) * time_getDelta() * 60.0f) / 2; + this->yaw += ((11 - mm_juju_count * 2) * time_getDelta() * (float)FRAMERATE) / 2; if (360.0f < this->yaw) { has_completed_full_turn = TRUE; diff --git a/src/MM/ch/orange.c b/src/MM/ch/orange.c index 72150533..05690a6c 100644 --- a/src/MM/ch/orange.c +++ b/src/MM/ch/orange.c @@ -30,7 +30,7 @@ f32 D_80389A00[3] = {0.0f, 0.0f, 0.0f}; void __chorange_collisionCallback(ActorMarker *marker, ActorMarker *other_marker) { if (!player_isDead() && !mapSpecificFlags_get(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE) && - gcdialog_showDialog(ASSET_B3A_DIALOG_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)) { + gcdialog_showDialog(VER_SELECT(ASSET_B3A_DIALOG_CONGA_HITS_PLAYER, 0x958, 0, 0), 0, 0, 0, NULL, NULL)) { mapSpecificFlags_set(MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE, TRUE); } diff --git a/src/MM/ch/orangepad.c b/src/MM/ch/orangepad.c index 3dc8b8d0..6607b372 100644 --- a/src/MM/ch/orangepad.c +++ b/src/MM/ch/orangepad.c @@ -60,7 +60,7 @@ void handleOrangeCollision(ActorMarker *marker) { coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF); if (!jiggyscore_isCollected(JIGGY_8_MM_ORANGE_PADS)) { - gcdialog_showDialog(ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY, 0x959, 0, 0), 4, NULL, NULL, NULL, NULL); } } @@ -112,7 +112,7 @@ void chOrangePad_update(Actor *this) { && !mapSpecificFlags_get(MM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS) && conga->state != CONGA_STATE_MOPEY) { - if (gcdialog_showDialog(ASSET_B3D_DIALOG_CONGA_TOUCH_PAD, 0, NULL, NULL, NULL, NULL)) { + if (gcdialog_showDialog(VER_SELECT(ASSET_B3D_DIALOG_CONGA_TOUCH_PAD, 0x95B, 0, 0), 0, NULL, NULL, NULL, NULL)) { mapSpecificFlags_set(MM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS, TRUE); } } diff --git a/src/MM/crc.c b/src/MM/crc.c index b826e72e..89585527 100644 --- a/src/MM/crc.c +++ b/src/MM/crc.c @@ -3,9 +3,9 @@ #include "functions.h" #include "variables.h" -s32 D_803899C0 = VER_SELECT(0x000C740C, 0, 0, 0); // MM_TEXT_CRC1 -s32 D_803899C4 = VER_SELECT(0xCD249CB3, 0, 0, 0); // MM_TEXT_CRC2 -s32 D_803899C8 = VER_SELECT(0x0000D44F, 0, 0, 0); // MM_DATA_CRC1 +s32 D_803899C0 = VER_SELECT(0x000C740C, 0x000C896A, 0, 0); // MM_TEXT_CRC1 +s32 D_803899C4 = VER_SELECT(0xCD249CB3, 0xED04CB8F, 0, 0); // MM_TEXT_CRC2 +s32 D_803899C8 = VER_SELECT(0x0000D44F, 0x0000D9E8, 0, 0); // MM_DATA_CRC1 void chmumbo_func_802D1724(void); diff --git a/src/RBB/ch/anchorctrl.c b/src/RBB/ch/anchorctrl.c index 46c94945..c00f1cfe 100644 --- a/src/RBB/ch/anchorctrl.c +++ b/src/RBB/ch/anchorctrl.c @@ -54,7 +54,7 @@ void __chAnchorCtrl_setState(Actor *this, s32 next_state){ timed_playSfx(2.1f, SFX_3F6_RUBBING, 0.6f, 32700); timedFunc_set_2(2.7f, (GenFunction_2)mapSpecificFlags_set, RBB_MAIN_SPECIFIC_FLAG_4_ANCHOR_LIFTING, TRUE); timedFunc_set_0(3.0f, func_8038C058); - func_80324DBC(3.0f, ASSET_B9C_DIALOG_SNORKEL_COMPLETE, 7, NULL, this->marker, __chAnchorCtrl_spawnJiggy, NULL); + func_80324DBC(3.0f, VER_SELECT(ASSET_B9C_DIALOG_SNORKEL_COMPLETE, 0x971, 0, 0), 7, NULL, this->marker, __chAnchorCtrl_spawnJiggy, NULL); }//L8038C1D8 this->state = next_state; } diff --git a/src/RBB/ch/bossboombox.c b/src/RBB/ch/bossboombox.c index 5d4a5afd..54ce07fa 100644 --- a/src/RBB/ch/bossboombox.c +++ b/src/RBB/ch/bossboombox.c @@ -334,7 +334,7 @@ void chBossBoomBox_setState(Actor *this, s32 new_state){ } else{//L8038CEFC timedFunc_set_3(2.4f, (GenFunction_3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 8000, 300); - func_80324DBC(2.4f, ASSET_B9E_DIALOG_BOSS_BOOM_BOX_MEET, 4, NULL, this->marker, func_8038CB34, func_8038CB68); + func_80324DBC(2.4f, VER_SELECT(ASSET_B9E_DIALOG_BOSS_BOOM_BOX_MEET, 0x973, 0, 0), 4, NULL, this->marker, func_8038CB34, func_8038CB68); } }//L8038CF60 @@ -381,7 +381,7 @@ void chBossBoomBox_setState(Actor *this, s32 new_state){ } else{//L8038D220 timedFunc_set_3(0.0f, (GenFunction_3)chbossboombox_respawnJiggy, (s32)this->position_x, (s32)this->position_y, (s32)this->position_z); - gcdialog_showDialog(ASSET_B9F_DIALOG_BOSS_BOOM_BOX_COMPLETE, 4, 0, 0, 0, 0); + gcdialog_showDialog(VER_SELECT(ASSET_B9F_DIALOG_BOSS_BOOM_BOX_COMPLETE, 0x974, 0, 0), 4, 0, 0, 0, 0); } }//L8038D278 } diff --git a/src/RBB/ch/dolphin.c b/src/RBB/ch/dolphin.c index f0cd3095..5dbcb4e8 100644 --- a/src/RBB/ch/dolphin.c +++ b/src/RBB/ch/dolphin.c @@ -97,7 +97,7 @@ void func_8038B900(Actor *this){ && subaddie_playerIsWithinSphereAndActive(this, 600) && !player_movementGroup() ){ - gcdialog_showDialog(ASSET_B9B_DIALOG_SNORKEL_MEET, 4, 0, 0, 0, 0); + gcdialog_showDialog(VER_SELECT(ASSET_B9B_DIALOG_SNORKEL_MEET, 0x970, 0, 0), 4, 0, 0, 0, 0); this->has_met_before = TRUE; } } diff --git a/src/RBB/code_CA0.c b/src/RBB/code_CA0.c index 3173dcc7..3d429f74 100644 --- a/src/RBB/code_CA0.c +++ b/src/RBB/code_CA0.c @@ -165,7 +165,7 @@ void chCageUpSwitch_setState(Actor *this, s32 next_state){ if(next_state == CH_CAGE_UP_SWITCH_STATE_3_TIMED_RAISED_CAGE){ item_set(ITEM_6_HOURGLASS, 1); - item_set(ITEM_0_HOURGLASS_TIMER, 0x3bf); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(0x3bf, 0x31f, 0, 0)); } if(this->state == CH_CAGE_UP_SWITCH_STATE_3_TIMED_RAISED_CAGE){ diff --git a/src/RBB/propellorctrl.c b/src/RBB/propellorctrl.c index e37ce565..0a0c494a 100644 --- a/src/RBB/propellorctrl.c +++ b/src/RBB/propellorctrl.c @@ -16,7 +16,7 @@ void __propellorCtrl_setState(s32 arg0){ } if(arg0 == 2){ - item_set(ITEM_3_PROPELLOR_TIMER, 3900 - 1); + item_set(ITEM_3_PROPELLOR_TIMER, VER_SELECT(3900, 3250, 0, 0) - 1); item_set(ITEM_9_PROPELLOR, 1); } @@ -26,7 +26,7 @@ void __propellorCtrl_setState(s32 arg0){ item_set(ITEM_9_PROPELLOR,0); if(arg0 == 3 && !jiggyscore_isCollected(JIGGY_57_RBB_PROPELLOR)){ timedFunc_set_1(0.5f, (GenFunction_1)func_802FAD64, 3); - func_80324DBC(1.0f, ASSET_B9D_DIALOG_GRUNTY_PROPELLER_MISS, 4, NULL, NULL, NULL, NULL); + func_80324DBC(1.0f, VER_SELECT(ASSET_B9D_DIALOG_GRUNTY_PROPELLER_MISS, 0x972, 0, 0), 4, NULL, NULL, NULL, NULL); } else{ func_802FAD64(3); diff --git a/src/SM/ch/jumptutorial.c b/src/SM/ch/jumptutorial.c index 9436d092..231dbade 100644 --- a/src/SM/ch/jumptutorial.c +++ b/src/SM/ch/jumptutorial.c @@ -57,7 +57,7 @@ void chJumpTutorial_setState(Actor *this, s32 state) { ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER); gcdialog_showDialog(ASSET_DF6_DIALOG_BOTTLES_HIGH_JUMP_LEARN, 0xe, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); - this->sm_4070.dialog_id = ASSET_E1A_DIALOG_BOTTLES_UNKNOWN; + this->sm_4070.dialog_id = VER_SELECT(ASSET_E1A_DIALOG_BOTTLES_UNKNOWN, 0xA5C, 0, 0); mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); } break; @@ -113,7 +113,7 @@ void chJumpTutorial_update(Actor *this) { ability_unlock(ABILITY_7_FEATHERY_FLAP); gcdialog_showDialog(ASSET_DF7_DIALOG_BOTTLES_FEATHERY_FLAP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); - this->sm_4070.dialog_id = ASSET_E1B_DIALOG_BOTTLES_UNKNOWN; + this->sm_4070.dialog_id = VER_SELECT(ASSET_E1B_DIALOG_BOTTLES_UNKNOWN, 0xA5D, 0, 0); mapSpecificFlags_set(SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED, FALSE); }//L8038A730 @@ -122,7 +122,7 @@ void chJumpTutorial_update(Actor *this) { ability_unlock(ABILITY_8_FLAP_FLIP); gcdialog_showDialog(ASSET_DF8_DIALOG_BOTTLES_FLAP_FLIP_LEARN, 0xa, this->unk1C, this->marker, __chJumpTutorial_textCallback, NULL); - this->sm_4070.dialog_id = ASSET_E1C_DIALOG_BOTTLES_UNKNOWN; + this->sm_4070.dialog_id = VER_SELECT(ASSET_E1C_DIALOG_BOTTLES_UNKNOWN, 0xA5E, 0, 0); mapSpecificFlags_set(SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED, FALSE); }//L8038A794 diff --git a/src/SM/code_46C0.c b/src/SM/code_46C0.c index 82d27694..5e230666 100644 --- a/src/SM/code_46C0.c +++ b/src/SM/code_46C0.c @@ -2,62 +2,111 @@ #include "functions.h" #include "variables.h" -#define US_1_0 0 -#define PAL 1 +#if VERSION == VERSION_USA_1_0 +int func_8038AAB0(void) { + return 0; +} -#if VERSION == US_1_0 -int func_8038AAB0(void){return 0;} +#elif VERSION == VERSION_PAL -#elif VERSION == PAL -// u8 D_8038BFC2; -// void func_8038AAB0(s32 arg0, s32 arg1){ -// if(arg1 < 0){ -// func_8031A844(); -// } -// else{ -// D_8038BFC2 = arg1; -// func_8038B4D0(3); -// } -// } +struct language_selection_screen_s { + u8 *unk0; + u8 *unk4; + u64 unk8; -// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038A8F0.s") -// void func_8038A8F0(s32 arg0) { -// u8 temp_v0; + u8 *unk10; + u32 unk14; + u64 unk18; -// switch (arg0) { /* irregular */ -// case 1: -// D_8038BFC1 = 1; -// func_80319400(); -// break; -// case 2: -// D_8038BFC8->unk0 = (s32) D_8038BD38; -// D_8038BFC8->unk4 = (s32) D_8038BD3C; -// D_8038BFC8->unk10 = (s32) D_8038BD40; -// D_8038BFC8->unk20 = (s32) D_8038BD44; -// D_8038BFC8->unk30 = (s32) chMMMWideWindow; -// func_8031A5E4(&D_8038BD30, &D_8038BD34, (void *)0x8038BFC8, 0xA, &D_8038B490); -// break; -// case 3: -// temp_v0 = *(u8 *)0x8038BFC2; -// if (temp_v0 != 0) { -// func_8031B9A4(temp_v0 - 1, 0x80390000); -// } -// func_802FAF44(0); -// D_8038BFC1 = 0; -// break; -// } -// D_8038BFC0 = (s8) arg0; -// } + u8 *unk20; + u32 unk24; + u64 unk28; + u8 *unk30; + u32 unk34; + u64 unk38; +}; -// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038A9E4.s") +/* data */ +u32 D_8038BD30_pal = 0x0C68696A; +u32 D_8038BD34_pal = 0x02010101; +u8 *D_8038BD38_pal = "WHICH LANGUAGE WOULD"; +u8 *D_8038BD3C_pal = "YOU LIKE TO USE?"; +u8 *D_8038BD40_pal = "ENGLISH"; +u8 *D_8038BD44_pal = "FRANaAIS"; +u8 *D_8038BD48_pal = "DEUTSCH"; -// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AA30.s") +/* bss */ +u8 D_8038BFC0_pal; +u8 D_8038BFC1_pal; +u8 D_8038BFC2_pal; +struct language_selection_screen_s D_8038BFC8_pal; -// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AA64.s") +/* text */ +void func_8038B4D0_pal(s32 arg0); -// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AA74.s") +void func_8038B490_pal(s32 arg0, s32 arg1) { + if (arg1 < 0) { + /*func_8031A844_pal*/gcquiz_func_8031A48C(); + return; + } + D_8038BFC2_pal = arg1; + func_8038B4D0_pal(3); +} + +void func_8038B4D0_pal(s32 arg0) { + switch (arg0) { /* irregular */ + case 1: + D_8038BFC1_pal = 1; + /*func_80319400_pal*/gcquiz_init(); + break; + case 2: + D_8038BFC8_pal.unk0 = D_8038BD38_pal; + D_8038BFC8_pal.unk4 = D_8038BD3C_pal; + D_8038BFC8_pal.unk10 = D_8038BD40_pal; + D_8038BFC8_pal.unk20 = D_8038BD44_pal; + D_8038BFC8_pal.unk30 = D_8038BD48_pal; + /*func_8031A5E4_pal*/__gcquiz_unused(&D_8038BD30_pal, &D_8038BD34_pal, &D_8038BFC8_pal, 0xA, &func_8038B490_pal); + break; + case 3: + if (D_8038BFC2_pal) { + func_8031B5C4(D_8038BFC2_pal - 1); + } + func_802FAD64(ITEM_0_HOURGLASS_TIMER); + D_8038BFC1_pal = 0; + break; + } + D_8038BFC0_pal = (s8) arg0; +} + +void func_8038B5C4_pal(void) { + if (gsworld_getMap() == MAP_91_FILE_SELECT) { + func_8038B4D0_pal(func_8031B638() ? 3 : 1); + } +} + +void func_8038B610_pal(void) { + if (gsworld_getMap() == MAP_91_FILE_SELECT) { + /*func_80319540_pal*/gcquiz_free(); + } +} + +void func_8038B644_pal(s32 arg0, s32 arg1, s32 arg2) { +} + +void func_8038B654_pal(void) { + if ((D_8038BFC1_pal) && (getGameMode() == 3)) { + /*func_8031A25C_pal*/gcquiz_func_80319EA4(); + if (D_8038BFC0_pal == 1) { + timedFunc_set_1(1.0f, func_8038B4D0_pal, 2); + func_8038B4D0_pal(0); + } + } +} + +u8 func_8038B6C8_pal(void) { + return D_8038BFC1_pal; +} -// #pragma GLOBAL_ASM("asm/nonmatchings/SM/code_46C0/func_8038AAE8.s") #endif diff --git a/src/SM/smspawnqueue.c b/src/SM/smspawnqueue.c index 7c393e3b..97ca855c 100644 --- a/src/SM/smspawnqueue.c +++ b/src/SM/smspawnqueue.c @@ -26,9 +26,9 @@ extern ActorInfo gBanjosChair; extern ActorInfo gBanjosStove; extern ActorInfo gRockTrappingGrunty; -s32 D_8038AAE0 = VER_SELECT(0x000FE2C1, 0, 0, 0); // SM_TEXT_CRC1 -s32 D_8038AAE4 = VER_SELECT(0x8C0992D1, 0, 0, 0); // SM_TEXT_CRC2 -s32 D_8038AAE8 = VER_SELECT(0x0001EB56, 0, 0, 0); // SM_DATA_CRC1 +s32 D_8038AAE0 = VER_SELECT(0x000FE2C1, 0x00109339, 0, 0); // SM_TEXT_CRC1 +s32 D_8038AAE4 = VER_SELECT(0x8C0992D1, 0xC3A58E96, 0, 0); // SM_TEXT_CRC2 +s32 D_8038AAE8 = VER_SELECT(0x0001EB56, 0x00020B4D, 0, 0); // SM_DATA_CRC1 s32 D_8038AAEC = 0; diff --git a/src/TTC/ch/blubber.c b/src/TTC/ch/blubber.c index 58b2dc6f..664a4b50 100644 --- a/src/TTC/ch/blubber.c +++ b/src/TTC/ch/blubber.c @@ -63,7 +63,7 @@ static void __chBlubber_showTextCallback(ActorMarker *caller, enum asset_e text_ Actor *this = marker_getActor(caller); ActorLocal_Blubber *local = (ActorLocal_Blubber*)&this->local; - if(text_id == ASSET_A0D_DIALOG_BLUBBER_COMPLETE || text_id == ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED){ + if(text_id == VER_SELECT(ASSET_A0D_DIALOG_BLUBBER_COMPLETE, 0x90D, 0, 0) || text_id == ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED){ local->unk24 = 0; } else{ @@ -89,7 +89,7 @@ static void __chBlubber_showJiggySpawnedText(ActorMarker *marker){ this->actor_specific_1_f = 0.0f; if(!mapSpecificFlags_get(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN)) { - text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_DIALOG_BLUBBER_COMPLETE; + text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_DIALOG_BLUBBER_COMPLETE_JIGGY_COLLECTED : VER_SELECT(ASSET_A0D_DIALOG_BLUBBER_COMPLETE, 0x90D, 0, 0); gcdialog_showDialog(text_id, 0xf, this->position, this->marker, __chBlubber_showTextCallback, __chBlubber_showTextCallback2); mapSpecificFlags_set(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN, TRUE); } @@ -157,7 +157,7 @@ static void __chBlubber_updateFunc(Actor *this){ && !this->has_met_before && item_getCount(ITEM_18_GOLD_BULLIONS) == 0 ){ - gcdialog_showDialog(ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET, 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET, 0x90B, 0, 0), 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL); this->has_met_before = TRUE; subaddie_set_state_forward(this, CH_BLUBBER_STATE_3_UNKNOWN); } @@ -166,7 +166,7 @@ static void __chBlubber_updateFunc(Actor *this){ && !this->unk138_23 ){ if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) { - gcdialog_showDialog(ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD, 0x90C, 0, 0), 4, NULL, NULL, NULL, NULL); } this->unk138_23 = TRUE; diff --git a/src/TTC/ch/clam.c b/src/TTC/ch/clam.c index c06d9e5b..78b27438 100644 --- a/src/TTC/ch/clam.c +++ b/src/TTC/ch/clam.c @@ -106,7 +106,7 @@ static bool __chClam_rotateTowardTarget(Actor *this, s32 arg1) { anctrl_setDuration(this->anctrl, 1.0f); - sp2C = (s32) ((f64) (60.0f / (f32) time_getDeltaReal_frames()) * 0.5); + sp2C = (s32) ((f64) ((float)FRAMERATE / (f32) time_getDeltaReal_frames()) * 0.5); if ((this->unk1C[0] != 0.0f) || !__chClam_updateFuncTarget(this, sp2C)) { if (((f64) anctrl_getAnimTimer(this->anctrl) < 0.1) && ((f64) randf() < 0.5)) { if (this->unk1C[0] != 0.0f) { @@ -235,7 +235,7 @@ static void __chClam_takeDamage(ActorMarker *this_marker, ActorMarker *other_mar __chClam_emitLargeShellParticles(this->position, 2); __chClam_emitEyeParticles(this->position, 2); __chClam_emitSmallShellParticles(this->position, 0xC); - func_803115C4(0xa14); + func_803115C4(VER_SELECT(ASSET_A14_DIALOG_CLAM_TAUNT, 0x914, 0, 0)); marker_despawn(this->marker); } @@ -252,7 +252,7 @@ static void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_ma if(baiFrame_getState() == 3) return; - if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showDialog(ASSET_A14_DIALOG_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){ + if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showDialog(VER_SELECT(ASSET_A14_DIALOG_CLAM_TAUNT, 0x914, 0, 0), 0, NULL, NULL, NULL, NULL)){ mapSpecificFlags_set(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN, TRUE); } diff --git a/src/TTC/ch/leaky.c b/src/TTC/ch/leaky.c index 16e16078..69c44e15 100644 --- a/src/TTC/ch/leaky.c +++ b/src/TTC/ch/leaky.c @@ -60,7 +60,7 @@ static void __chLeaky_updateFunc(Actor *this) { && !this->has_met_before && subaddie_playerIsWithinSphereAndActive(this, 250) && !subaddie_playerIsWithinSphereAndActive(this, 160) && !player_movementGroup() - && gcdialog_showDialog(ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, 0, NULL, NULL, NULL, NULL) + && gcdialog_showDialog(VER_SELECT(ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, 0x91A, 0, 0), 0, NULL, NULL, NULL, NULL) ){ this->has_met_before = TRUE; } @@ -118,6 +118,6 @@ bool chLeaky_eggCollision(ActorMarker *marker){ levelSpecificFlags_set(2, TRUE); levelSpecificFlags_set(5, TRUE); - gcdialog_showDialog(ASSET_A28_DIALOG_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A28_DIALOG_LEAKY_DONE, 0x928, 0, 0), 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL); return TRUE; } diff --git a/src/TTC/ch/lockup.c b/src/TTC/ch/lockup.c index 5b7bddd0..d1a079b6 100644 --- a/src/TTC/ch/lockup.c +++ b/src/TTC/ch/lockup.c @@ -72,7 +72,7 @@ static void chLockup_update(Actor *this) { && subaddie_playerIsWithinSphereAndActive(this, 320) && !subaddie_playerIsWithinSphereAndActive(this, 160) && !player_movementGroup() - && gcdialog_showDialog(ASSET_A15_DIALOG_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)) { + && gcdialog_showDialog(VER_SELECT(ASSET_A15_DIALOG_LOCKUP_SPAWNED, 0x915, 0, 0), 0, NULL, NULL, NULL, NULL)) { this->has_met_before = TRUE; } diff --git a/src/TTC/ch/nipper.c b/src/TTC/ch/nipper.c index 82347e0c..a2315de3 100644 --- a/src/TTC/ch/nipper.c +++ b/src/TTC/ch/nipper.c @@ -156,7 +156,7 @@ static void __chNipper_dieFunc(ActorMarker *this_marker, ActorMarker *other_mark __chNipper_playDeathAnimation(this); this->lifetime_value = 80.0f; - gcdialog_showDialog(ASSET_A10_DIALOG_NIPPER_HURT, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A10_DIALOG_NIPPER_HURT, 0x910, 0, 0), 4, NULL, NULL, NULL, NULL); return; } @@ -177,7 +177,7 @@ static void __chNipper_ow2Func(ActorMarker * this_marker, ActorMarker *other_mar this = marker_getActor(this_marker); if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN) && this->has_met_before - && gcdialog_showDialog(ASSET_A0F_DIALOG_NIPPER_HIT_BY_EGG, 0, NULL, NULL, NULL, NULL) + && gcdialog_showDialog(VER_SELECT(ASSET_A0F_DIALOG_NIPPER_HIT_BY_EGG, 0x90F, 0, 0), 0, NULL, NULL, NULL, NULL) ){ mapSpecificFlags_set(TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN, TRUE); } @@ -188,7 +188,7 @@ static void __chNipper_owFunc(ActorMarker * this_marker, ActorMarker *other_mark Actor *this = marker_getActor(this_marker); if( !this->unk138_23 && this->has_met_before - && gcdialog_showDialog(ASSET_A11_DIALOG_NIPPER_ATTACK, 0, NULL, NULL, NULL, NULL) + && gcdialog_showDialog(VER_SELECT(ASSET_A11_DIALOG_NIPPER_ATTACK, 0x911, 0, 0), 0, NULL, NULL, NULL, NULL) ){ this->unk138_23 = TRUE; } @@ -243,7 +243,7 @@ static void __chNipper_updateFunc(Actor *this){ && player_movement_group != BSGROUP_A_FLYING ){ subaddie_set_state_with_direction(this, CH_NIPPER_STATE_5_SPAWNED, 0.01f, 1); - if(gcdialog_showDialog(ASSET_A0E_DIALOG_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_A0E_DIALOG_NIPPER_SPAWNED, 0x90E, 0, 0), 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){ this->has_met_before = TRUE; } comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300); diff --git a/src/TTC/ch/treasure.c b/src/TTC/ch/treasure.c index d60626b3..e54836ee 100644 --- a/src/TTC/ch/treasure.c +++ b/src/TTC/ch/treasure.c @@ -24,7 +24,7 @@ static void __chTreasure_die(ActorMarker *marker, ActorMarker *otherMarker){ Actor *this = marker_getActor(marker); __spawnQueue_add_4((GenFunction_4) spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); func_802EE278(this, 3, 0xf, 0x3C, 0.2f, 1.2f); - func_803115C4(0xA19); + func_803115C4(VER_SELECT(0xA19, 0x919, 0, 0)); jiggy_spawn(JIGGY_11_TTC_RED_X, this->position); marker_despawn(marker); } diff --git a/src/TTC/ch/treasurehunt.c b/src/TTC/ch/treasurehunt.c index c9b5984d..009223d4 100644 --- a/src/TTC/ch/treasurehunt.c +++ b/src/TTC/ch/treasurehunt.c @@ -116,10 +116,10 @@ static void __chTreasurehunt_spawnActorForNextStep(void) { static void __chTreasurehunt_checkStepProgress(s32 currentStep){ if(chtreasureHunt_puzzleCurrentStep == currentStep && __chTreasurehunt_isActiveHitboxBeakBusterHitbox()){ if(currentStep == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){ - gcdialog_showDialog(ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES, 0x918, 0, 0), 4, NULL, NULL, NULL, NULL); } else if(currentStep == 4){ - gcdialog_showDialog(ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP, 0x919, 0, 0), 4, NULL, NULL, NULL, NULL); } chtreasureHunt_puzzleCurrentStep++; @@ -170,7 +170,7 @@ void chTreasurehunt_checkStepProgress5(NodeProp *this, ActorMarker *arg1){ gcpausemenu_80314AC8(0); timedFunc_set_2(0.1f, (GenFunction_2) func_8028F45C, 9, (s32)&particleTargetPosition); timedFunc_set_1(0.1f, (GenFunction_1) gcpausemenu_80314AC8, 1); - gcdialog_showDialog(ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED, 0x917, 0, 0), 4, NULL, NULL, NULL, NULL); chtreasureHunt_puzzleCurrentStep++; } } diff --git a/src/TTC/code_3040.c b/src/TTC/code_3040.c index 92ef1cac..dbb41ac5 100644 --- a/src/TTC/code_3040.c +++ b/src/TTC/code_3040.c @@ -3,9 +3,9 @@ #include "variables.h" #include "checksums.h" -s32 D_8038C750 = VER_SELECT(0x0016D2FD, 0, 0, 0); // TTC_TEXT_CRC1 -s32 D_8038C754 = VER_SELECT(0xFB70B01D, 0, 0, 0); // TTC_TEXT_CRC2 -s32 D_8038C758 = VER_SELECT(0x0004EFAC, 0, 0, 0); // TTC_DATA_CRC1 +s32 D_8038C750 = VER_SELECT(0x0016D2FD, 0x0016D2D7, 0, 0); // TTC_TEXT_CRC1 +s32 D_8038C754 = VER_SELECT(0xFB70B01D, 0xFCA4DD1E, 0, 0); // TTC_TEXT_CRC2 +s32 D_8038C758 = VER_SELECT(0x0004EFAC, 0x0004FD17, 0, 0); // TTC_DATA_CRC1 /* .code */ #if ANTI_TAMPER diff --git a/src/TTC/ma/castle.c b/src/TTC/ma/castle.c index fe27c2c3..8d42f8e0 100644 --- a/src/TTC/ma/castle.c +++ b/src/TTC/ma/castle.c @@ -167,12 +167,12 @@ static void __maCastle_setupCheatCodeTimer(s32 new_timer_state) if (volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)) { // set timer to 50 seconds - item_set(ITEM_0_HOURGLASS_TIMER, 2999); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(2999, 2499, 0, 0)); } else { // set timer to 100 seconds - item_set(ITEM_0_HOURGLASS_TIMER, 5999); + item_set(ITEM_0_HOURGLASS_TIMER, VER_SELECT(5999, 4999, 0, 0)); } item_set(ITEM_6_HOURGLASS, TRUE); @@ -1031,7 +1031,7 @@ static void __maCastle_eraseGameplayDialogCallback(ActorMarker *caller, enum ass { __maCastle_setNumberOfBannedCheatcodesEntered(3); __maCastle_checkSecretCheatCodeIndex(sThirdForbiddenSecretCheatCodeIndex); - gcdialog_showDialog(ASSET_FBF_DIALOG_ERASED_SAVE, 0xC, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_FBF_DIALOG_ERASED_SAVE, 0xB25, 0, 0), 0xC, NULL, NULL, NULL, NULL); gameFile_clear(gameSelect_getGameNumber()); gameFile_8033CFD4(gameSelect_getGameNumber()); gameSelect_setGameNumber(-1); @@ -1066,11 +1066,11 @@ static void __maCastle_checkIfBannedCheatCodeEntered(s32 secret_cheat_code_index __maCastle_setNumberOfBannedCheatcodesEntered(2); __maCastle_checkSecretCheatCodeIndex(secret_cheat_code_index); __maCastle_resetSecretCheatCodeProgress(); - gcdialog_showDialog(ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING, 0xC, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING, 0xB24, 0, 0), 0xC, NULL, NULL, NULL, NULL); return; case 2: sThirdForbiddenSecretCheatCodeIndex = secret_cheat_code_index; - gcdialog_showDialog(ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION, 0xC, NULL, NULL, __maCastle_eraseGameplayDialogCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION, 0xA7A, 0, 0), 0xC, NULL, NULL, __maCastle_eraseGameplayDialogCallback, NULL); return; } return; diff --git a/src/core2/ch/beehive.c b/src/core2/ch/beehive.c index d56e239f..2189b5bd 100644 --- a/src/core2/ch/beehive.c +++ b/src/core2/ch/beehive.c @@ -35,8 +35,8 @@ void chBeehive_die(ActorMarker *this, ActorMarker *other){ __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2])); actor->marker->propPtr->unk8_3 = 0; - func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET); - func_803115C4(ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES); + func_803115C4(VER_SELECT(ASSET_D96_DIALOG_BEEHIVE_MEET, 0x0A14, 0, 0)); + func_803115C4(VER_SELECT(ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES, 0x0A24, 0, 0)); } void chBeehive_update(Actor *this){ @@ -63,7 +63,7 @@ void chBeehive_update(Actor *this){ ){ if(player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT){ if( player_getTransformation() == TRANSFORM_1_BANJO - && gcdialog_showDialog(ASSET_D96_DIALOG_BEEHIVE_MEET, 0, NULL, NULL, NULL, 0) + && gcdialog_showDialog(VER_SELECT(ASSET_D96_DIALOG_BEEHIVE_MEET, 0xA14, 0, 0), 0, NULL, NULL, NULL, 0) ){ fileProgressFlag_set(FILEPROG_D_BEEHIVE_TEXT, 1); } diff --git a/src/core2/ch/beeswarm.c b/src/core2/ch/beeswarm.c index b8b10348..5a8cc507 100644 --- a/src/core2/ch/beeswarm.c +++ b/src/core2/ch/beeswarm.c @@ -445,7 +445,7 @@ void chBeeSwarm_update(Actor *this) { if (!fileProgressFlag_get(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE) && subaddie_playerIsWithinCylinder(this, 250, 300) && ((player_movementGroup() == BSGROUP_0_NONE) || (player_movementGroup() == BSGROUP_8_TROT)) && (player_getTransformation() == TRANSFORM_1_BANJO) - && (gcdialog_showDialog(0xDA6, 0, NULL, NULL, NULL, NULL) != 0) + && (gcdialog_showDialog(VER_SELECT(0xDA6, 0xA24, 0, 0), 0, NULL, NULL, NULL, NULL) != 0) ) { fileProgressFlag_set(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE, TRUE); } diff --git a/src/core2/ch/bottlesbonus.c b/src/core2/ch/bottlesbonus.c index 629d0755..6f6a559a 100644 --- a/src/core2/ch/bottlesbonus.c +++ b/src/core2/ch/bottlesbonus.c @@ -58,13 +58,13 @@ void chBottlesBonus_update(Actor *this); /* .data */ Struct_core2_560F0_0 D_803681A0[] = { { 0, 0x000, 0, 0x211}, - {99, 0xE27, 0, 0x2C1}, - {99, 0xE29, 0, 0x2C2}, - {99, 0xE2B, 0, 0x2C9}, - {99, 0xE2D, 0, 0x2C3}, - {99, 0xE2F, 0, 0x2C4}, - {99, 0xE31, 0, 0x2C5}, - {75, 0xE34, 0, 0x007} + {99, VER_SELECT(0xE27, 0xA69, 0, 0), 0, 0x2C1}, + {99, VER_SELECT(0xE29, 0xA6B, 0, 0), 0, 0x2C2}, + {99, VER_SELECT(0xE2B, 0xA6D, 0, 0), 0, 0x2C9}, + {99, VER_SELECT(0xE2D, 0xA6F, 0, 0), 0, 0x2C3}, + {99, VER_SELECT(0xE2F, 0xA71, 0, 0), 0, 0x2C4}, + {99, VER_SELECT(0xE31, 0xA73, 0, 0), 0, 0x2C5}, + {75, VER_SELECT(0xE34, 0xA76, 0, 0), 0, 0x007} }; ActorAnimationInfo chBottlesBonusAnimations[] ={ diff --git a/src/core2/ch/collectible.c b/src/core2/ch/collectible.c index cbd23f64..eb2b10b3 100644 --- a/src/core2/ch/collectible.c +++ b/src/core2/ch/collectible.c @@ -100,7 +100,7 @@ s32 chCollectible_collectEgg(ActorProp *arg0){ if(arg0->isActorProp) actPtr = marker_getActor(arg0->marker); } - chCollectible_collectItem(actPtr, FILEPROG_5_BLUE_EGG_TEXT, 0xD9E, COMUSIC_C_EGG_COLLECTED, 0xD, 2.0f); + chCollectible_collectItem(actPtr, FILEPROG_5_BLUE_EGG_TEXT, VER_SELECT(0xD9E, 0xA1C, 0, 0), COMUSIC_C_EGG_COLLECTED, 0xD, 2.0f); } void chCollectible_collectRedFeather(ActorProp *arg0){ @@ -108,7 +108,7 @@ void chCollectible_collectRedFeather(ActorProp *arg0){ fxSparkle_redFeather(&arg0->position_x); if(arg0->isActorProp) actPtr = marker_getActor(arg0->marker); - chCollectible_collectItem(actPtr, FILEPROG_6_RED_FEATHER_TEXT, 0xD9F, COMUSIC_B_RED_FEATHER_COLLECTED, 0xF, 4.0f); + chCollectible_collectItem(actPtr, FILEPROG_6_RED_FEATHER_TEXT, VER_SELECT(0xD9F, 0xA1D, 0, 0), COMUSIC_B_RED_FEATHER_COLLECTED, 0xF, 4.0f); } void chCollectible_collectGoldFeather(ActorProp *arg0){ @@ -116,7 +116,7 @@ void chCollectible_collectGoldFeather(ActorProp *arg0){ fxSparkle_goldFeather(&arg0->position_x); if(arg0->isActorProp) actPtr = marker_getActor(arg0->marker); - chCollectible_collectItem(actPtr, FILEPROG_7_GOLD_FEATHER_TEXT, 0xDA0, COMUSIC_14_GOLD_FEATHER_COLLECTED, ITEM_10_GOLD_FEATHER, 6.0f); + chCollectible_collectItem(actPtr, FILEPROG_7_GOLD_FEATHER_TEXT, VER_SELECT(0xDA0, 0xA1E, 0, 0), COMUSIC_14_GOLD_FEATHER_COLLECTED, ITEM_10_GOLD_FEATHER, 6.0f); } Actor *chCollectible_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){ diff --git a/src/core2/ch/crab.c b/src/core2/ch/crab.c index bacae6c0..bc623e21 100644 --- a/src/core2/ch/crab.c +++ b/src/core2/ch/crab.c @@ -156,7 +156,7 @@ void __chCrab_spawn_mutant_crab_jiggy(void) { } void __chCrab_mutantTextCallback(ActorMarker *caller, enum asset_e text_id, s32 model_id){ - if (text_id == ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT) { + if (text_id == VER_SELECT(ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, 0xA06, 0, 0)) { func_80324E38(0.0f, 3); timed_setStaticCameraToNode(0.0f, 4); timedFunc_set_0(0.1f, __chCrab_spawn_mutant_crab_jiggy); @@ -206,7 +206,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){ jiggy_spawn_position[1] = 3812.0f; jiggy_spawn_position[2] = 0.0f; coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF); - func_80324DBC(2.25f, ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, 0xF, jiggy_spawn_position, NULL, __chCrab_mutantTextCallback, NULL); + func_80324DBC(2.25f, VER_SELECT(ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, 0xA06, 0, 0), 0xF, jiggy_spawn_position, NULL, __chCrab_mutantTextCallback, NULL); } } p_ctrl = partEmitMgr_newEmitter(2); @@ -282,7 +282,7 @@ void chCrab_update(Actor *this) { && !player_movementGroup() ) { if ((this->state != CRAB_STATE_6_FLIP_UPSIDE_DOWN) && (this->state != CRAB_STATE_5_UPSIDE_DOWN)) { - gcdialog_showDialog(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xA05, 0, 0), 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL); mapSpecificFlags_set(0, TRUE); levelSpecificFlags_set(LEVEL_FLAG_E_CC_MUTIE_SNIPPETS, TRUE); this->has_met_before = TRUE; @@ -295,10 +295,10 @@ void chCrab_update(Actor *this) { && !jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE) && subaddie_playerIsWithinSphereAndActive(this, 1600) ) { - gcdialog_showDialog(ASSET_A12_DIALOG_BLACK_SNIPPET_SPAWNED, 4, this->position, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A12_DIALOG_BLACK_SNIPPET_SPAWNED, 0x912, 0, 0), 4, this->position, NULL, NULL, NULL); mapSpecificFlags_set(0, TRUE); } else if (mapSpecificFlags_get(1)) { - gcdialog_showDialog(ASSET_A13_DIALOG_BLACK_SNIPPET_DEFEATED, 4, this->position, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_A13_DIALOG_BLACK_SNIPPET_DEFEATED, 0x913, 0, 0), 4, this->position, NULL, NULL, NULL); mapSpecificFlags_set(1, FALSE); } } diff --git a/src/core2/ch/gloop.c b/src/core2/ch/gloop.c index 555b5af6..d4bdf713 100644 --- a/src/core2/ch/gloop.c +++ b/src/core2/ch/gloop.c @@ -60,7 +60,7 @@ void chgloop_update(Actor *this){ if( !mapSpecificFlags_get(2) && subaddie_playerIsWithinSphereAndActive(this, 350) - && gcdialog_showDialog(ASSET_D34_DIALOG_GLOOP_MEET, 0, NULL, NULL, NULL, NULL) + && gcdialog_showDialog(VER_SELECT(ASSET_D34_DIALOG_GLOOP_MEET, 0xA07, 0, 0), 0, NULL, NULL, NULL, NULL) ){ mapSpecificFlags_set(2, TRUE); } diff --git a/src/core2/ch/jinjo.c b/src/core2/ch/jinjo.c index 12551af8..2391115f 100644 --- a/src/core2/ch/jinjo.c +++ b/src/core2/ch/jinjo.c @@ -45,11 +45,11 @@ enum chjinjo_state_e { /*.code */ enum asset_e __chJinjo_getMeetDialogId(enum marker_e marker_id){ switch(marker_id){ - case MARKER_5A_JINJO_BLUE: return ASSET_D98_DIALOG_JINJO_MEET_BLUE; - case MARKER_5B_JINJO_GREEN: return ASSET_D99_DIALOG_JINJO_MEET_GREEN; - case MARKER_5C_JINJO_ORANGE: return ASSET_D9B_DIALOG_JINJO_MEET_ORANGE; - case MARKER_5D_JINJO_PINK: return ASSET_D9A_DIALOG_JINJO_MEET_PINK; - case MARKER_5E_JINJO_YELLOW: return ASSET_D97_DIALOG_JINJO_MEET_YELLOW; + case MARKER_5A_JINJO_BLUE: return VER_SELECT(ASSET_D98_DIALOG_JINJO_MEET_BLUE, 0x0A16, 0, 0); + case MARKER_5B_JINJO_GREEN: return VER_SELECT(ASSET_D99_DIALOG_JINJO_MEET_GREEN, 0x0A17, 0, 0); + case MARKER_5C_JINJO_ORANGE: return VER_SELECT(ASSET_D9B_DIALOG_JINJO_MEET_ORANGE, 0x0A19, 0, 0); + case MARKER_5D_JINJO_PINK: return VER_SELECT(ASSET_D9A_DIALOG_JINJO_MEET_PINK, 0x0A18, 0, 0); + case MARKER_5E_JINJO_YELLOW: return VER_SELECT(ASSET_D97_DIALOG_JINJO_MEET_YELLOW, 0x0A15, 0, 0); } return 0; } diff --git a/src/core2/ch/mole.c b/src/core2/ch/mole.c index c7066519..6b085064 100644 --- a/src/core2/ch/mole.c +++ b/src/core2/ch/mole.c @@ -54,16 +54,16 @@ ActorInfo gChMole = { }; ChMoleDescription moleTable[] = { - {ASSET_C23_DIALOG_BEAKBOMB_LEARN, ASSET_C24_DIALOG_BEAKBOMB_REFRESHER, 0x0F, ABILITY_1_BEAK_BOMB}, - {ASSET_B47_DIALOG_EGGS_LEARN, ASSET_B4B_DIALOG_EGGS_REFRESHER, 0x16, ABILITY_6_EGGS}, - {ASSET_B48_DIALOG_BEAKBUSTER_LEARN, ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER, 0x17, ABILITY_2_BEAK_BUSTER}, - {ASSET_B49_DIALOG_TALON_TROT_LEARN, ASSET_B4A_DIALOG_TALON_TROT_REFRESHER, 0x18, ABILITY_10_TALON_TROT}, - {ASSET_A1F_DIALOG_SHOCKJUMP_LEARN, ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER, 0x0C, ABILITY_D_SHOCK_JUMP}, - {ASSET_A20_DIALOG_FLY_LEARN, ASSET_A22_DIALOG_FLY_REFRESHER, 0x0D, ABILITY_9_FLIGHT}, - {ASSET_D35_DIALOG_WONDERWING_LEARN, ASSET_D36_DIALOG_WONDERWING_REFRESHER, 0x01, ABILITY_12_WONDERWING}, - {ASSET_C88_DIALOG_WADING_BOOTS_LEARN, ASSET_C89_DIALOG_WADING_BOOTS_REFRESHER, 0x10, ABILITY_E_WADING_BOOTS}, - {ASSET_A84_DIALOG_TURBOTRAINERS_LEARN, ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER, 0x19, ABILITY_11_TURBO_TALON}, - {ASSET_F64_DIALOG_NOTEDOORS_LEARN, ASSET_F65_DIALOG_NOTEDOORS_REFRESHER, 0x0E, ABILITY_13_1ST_NOTEDOOR} + {VER_SELECT(ASSET_C23_DIALOG_BEAKBOMB_LEARN, 0x99D, 0, 0), VER_SELECT(ASSET_C24_DIALOG_BEAKBOMB_REFRESHER, 0x99E, 0, 0), 0x0F, ABILITY_1_BEAK_BOMB}, + {VER_SELECT(ASSET_B47_DIALOG_EGGS_LEARN, 0x965, 0, 0), VER_SELECT(ASSET_B4B_DIALOG_EGGS_REFRESHER, 0x969, 0, 0), 0x16, ABILITY_6_EGGS}, + {VER_SELECT(ASSET_B48_DIALOG_BEAKBUSTER_LEARN, 0x966, 0, 0), VER_SELECT(ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER, 0x96A, 0, 0), 0x17, ABILITY_2_BEAK_BUSTER}, + {VER_SELECT(ASSET_B49_DIALOG_TALON_TROT_LEARN, 0x967, 0, 0), VER_SELECT(ASSET_B4A_DIALOG_TALON_TROT_REFRESHER, 0x968, 0, 0), 0x18, ABILITY_10_TALON_TROT}, + {VER_SELECT(ASSET_A1F_DIALOG_SHOCKJUMP_LEARN, 0x91F, 0, 0), VER_SELECT(ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER, 0x923, 0, 0), 0x0C, ABILITY_D_SHOCK_JUMP}, + {VER_SELECT(ASSET_A20_DIALOG_FLY_LEARN, 0x920, 0, 0), VER_SELECT(ASSET_A22_DIALOG_FLY_REFRESHER, 0x922, 0, 0), 0x0D, ABILITY_9_FLIGHT}, + {VER_SELECT(ASSET_D35_DIALOG_WONDERWING_LEARN, 0xA08, 0, 0), VER_SELECT(ASSET_D36_DIALOG_WONDERWING_REFRESHER, 0xA09, 0, 0), 0x01, ABILITY_12_WONDERWING}, + {VER_SELECT(ASSET_C88_DIALOG_WADING_BOOTS_LEARN, 0x9CB, 0, 0), VER_SELECT(ASSET_C89_DIALOG_WADING_BOOTS_REFRESHER, 0x9CC, 0, 0), 0x10, ABILITY_E_WADING_BOOTS}, + {VER_SELECT(ASSET_A84_DIALOG_TURBOTRAINERS_LEARN, 0x940, 0, 0), VER_SELECT(ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER, 0x941, 0, 0), 0x19, ABILITY_11_TURBO_TALON}, + {VER_SELECT(ASSET_F64_DIALOG_NOTEDOORS_LEARN, 0xACA, 0, 0), VER_SELECT(ASSET_F65_DIALOG_NOTEDOORS_REFRESHER, 0xACB, 0, 0), 0x0E, ABILITY_13_1ST_NOTEDOOR} }; #define MOLE_ID_TO_TABLE_SHIFT 9 @@ -99,19 +99,19 @@ enum asset_e chmole_learnedAllLevelAbilitiesDialog(void){ int learned_all_moves = chmole_learnedAllLevelAbilities(level_id); switch(level_id){ case LEVEL_1_MUMBOS_MOUNTAIN: - return learned_all_moves ? ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0); case LEVEL_2_TREASURE_TROVE_COVE: - return learned_all_moves ? ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? ASSET_A27_DIALOG_BOTTLES_ALL_TTC_MOVES_LEARNED : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0); case LEVEL_3_CLANKERS_CAVERN: - return learned_all_moves ? ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? VER_SELECT(ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED, 0xA0A, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0); case LEVEL_4_BUBBLEGLOOP_SWAMP: - return learned_all_moves ? ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? VER_SELECT(ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED, 0x9CD, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0); case LEVEL_5_FREEZEEZY_PEAK: - return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? VER_SELECT(ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED, 0x9A4, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0); case LEVEL_7_GOBIS_VALLEY: - return learned_all_moves ? ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED : ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; + return learned_all_moves ? VER_SELECT(ASSET_C2A_DIALOG_BOTTLES_ALL_FP_GV_MOVES_LEARNED, 0x9A4, 0, 0) : VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0); default: - return ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED; + return VER_SELECT(ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0xA0B, 0, 0); } } @@ -176,10 +176,10 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){ if( arg1 == moleTable[actor->actorTypeSpecificField - MOLE_ID_TO_TABLE_SHIFT].teach_text_id && item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL) ){ - gcdialog_showDialog(ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); + gcdialog_showDialog(VER_SELECT(ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, 0xA0C, 0, 0), 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions); }//L802D9738 - else if(arg1 == moleTable[actor->actorTypeSpecificField - MOLE_ID_TO_TABLE_SHIFT].teach_text_id || arg1 == ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH){ - gcdialog_showDialog(chmole_learnedAllGameAbilities()? ASSET_A87_DIALOG_BOTTLES_ALL_MOVES_LEARNED : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL); + else if(arg1 == moleTable[actor->actorTypeSpecificField - MOLE_ID_TO_TABLE_SHIFT].teach_text_id || arg1 == VER_SELECT(ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH, 0xA0C, 0, 0)){ + gcdialog_showDialog(chmole_learnedAllGameAbilities()? VER_SELECT(ASSET_A87_DIALOG_BOTTLES_ALL_MOVES_LEARNED, 0x943, 0, 0) : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL); } else{//L802D97BC if(actor->has_met_before){ diff --git a/src/core2/ch/mumbo.c b/src/core2/ch/mumbo.c index 33bfa243..2d94d9ce 100644 --- a/src/core2/ch/mumbo.c +++ b/src/core2/ch/mumbo.c @@ -142,23 +142,23 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3 this = marker_getActor(caller); switch(text_id){ - case ASSET_D8F_DIALOG_MUMBO_MEET: //L802D1A04 - gcdialog_showDialog((this->unk38_0) ? ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS : ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xe, this->position, this->marker, __chMumbo_textCallback, NULL); + case VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0): //L802D1A04 + gcdialog_showDialog((this->unk38_0) ? VER_SELECT(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xA28, 0, 0) : VER_SELECT(ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xA29, 0, 0), 0xe, this->position, this->marker, __chMumbo_textCallback, NULL); return; - case ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR: //L802D1A40 + case VER_SELECT(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xA0E, 0, 0): //L802D1A40 fileProgressFlag_set(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE); - gcdialog_showDialog(ASSET_D8F_DIALOG_MUMBO_MEET + D_8037DDF0, 4, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0) + D_8037DDF0, 4, NULL, NULL, NULL, NULL); gcpausemenu_80314AC8(1); break; - case ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS: //L802D1A7C /* fall-through */ + case VER_SELECT(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xA28, 0, 0): //L802D1A7C /* fall-through */ fileProgressFlag_set(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE, TRUE); - case ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS: //L802D1A88 + case VER_SELECT(ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xA29, 0, 0): //L802D1A88 func_8028F918(0); break; - case ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE: //L802D1A98 + case VER_SELECT(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xA2D, 0, 0): //L802D1A98 this->has_met_before = FALSE; if(this->unk38_31 != 0){ coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000); @@ -168,9 +168,9 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3 subaddie_set_state_with_direction(this, 5, 0.0f, 1); return; - case ASSET_DB0_DIALOG_MUMBO_MISTAKE_0: //L802D1AF8 - case ASSET_DB1_DIALOG_MUMBO_MISTAKE_1: //L802D1AF8 - case ASSET_DB2_DIALOG_MUMBO_MISTAKE_2: //L802D1AF8 + case VER_SELECT(ASSET_DB0_DIALOG_MUMBO_MISTAKE_0, 0xA2E, 0, 0): //L802D1AF8 + case VER_SELECT(ASSET_DB1_DIALOG_MUMBO_MISTAKE_1, 0xA2F, 0, 0): //L802D1AF8 + case VER_SELECT(ASSET_DB2_DIALOG_MUMBO_MISTAKE_2, 0xA30, 0, 0): //L802D1AF8 D_8037DDF0 = this->unk10_12; this->unk10_12 = 1; if(this->unk38_31){ @@ -178,7 +178,7 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3 item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31); } - case ASSET_DAE_DIALOG_MUMBO_TREX_START: //L802D1B48 + case VER_SELECT(ASSET_DAE_DIALOG_MUMBO_TREX_START, 0xA2C, 0, 0): //L802D1B48 subaddie_set_state_with_direction(this, 5, 0.0f, 1); return; @@ -191,16 +191,16 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3 void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) { if (this->unk10_12 != 0) { - gcdialog_showDialog(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + VER_SELECT(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xA2D, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); return; } if (fileProgressFlag_get(FILEPROG_12_HAS_TRANSFORMED_BEFORE)) { if (this->velocity[0] == 0.0f) { - gcdialog_showDialog(transform_id + ASSET_D8F_DIALOG_MUMBO_MEET, 6, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(transform_id + VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0), 6, this->position, this->marker, __chMumbo_textCallback, NULL); return; } if (gsworld_getMap() == MAP_7A_GL_CRYPT && transform_id == TRANSFORM_3_PUMPKIN && !fileProgressFlag_get(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT)) { - gcdialog_showDialog(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 6, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 0xA2B, 0, 0), 6, this->position, this->marker, __chMumbo_textCallback, NULL); fileProgressFlag_set(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT, TRUE); return; } @@ -208,7 +208,7 @@ void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) { subaddie_set_state(this, 4U); return; } - gcdialog_showDialog(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xA0E, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); } void chMumbo_update(Actor *this) { @@ -281,7 +281,7 @@ void chMumbo_update(Actor *this) { && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) ) { subaddie_set_state(this, 3); - gcdialog_showDialog(ASSET_D8F_DIALOG_MUMBO_MEET, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_D8F_DIALOG_MUMBO_MEET, 0xA0D, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); fileProgressFlag_set(FILEPROG_11_HAS_MET_MUMBO, TRUE); break; } @@ -292,7 +292,7 @@ void chMumbo_update(Actor *this) { && this->unk38_0 ){ subaddie_set_state(this, 3); - gcdialog_showDialog(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xA28, 0, 0), 0xE, this->position, this->marker, __chMumbo_textCallback, NULL); fileProgressFlag_set(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE, TRUE); break; } @@ -330,7 +330,7 @@ void chMumbo_update(Actor *this) { && randf() < 0.01 && sp48 ) { - gcdialog_showDialog(ASSET_DAE_DIALOG_MUMBO_TREX_START, 6, NULL, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_DAE_DIALOG_MUMBO_TREX_START, 0xA2C, 0, 0), 6, NULL, this->marker, __chMumbo_textCallback, NULL); fileProgressFlag_set(FILEPROG_BA_HAS_SEEN_TREX_TEXT, 1); this->has_met_before = TRUE; subaddie_set_state(this, 3); @@ -359,7 +359,7 @@ void chMumbo_update(Actor *this) { break; } coMusicPlayer_playMusic(COMUSIC_2C_BUZZER, 22000); - if ((levelSpecificFlags_get(LEVEL_FLAG_3E_UNKNOWN) == FALSE) && (gcdialog_showDialog(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0, NULL, NULL, NULL, NULL) != 0)) { + if ((levelSpecificFlags_get(LEVEL_FLAG_3E_UNKNOWN) == FALSE) && (gcdialog_showDialog(VER_SELECT(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0xA2A, 0, 0), 0, NULL, NULL, NULL, NULL) != 0)) { levelSpecificFlags_set(LEVEL_FLAG_3E_UNKNOWN, 1); } } @@ -417,7 +417,7 @@ void chMumbo_update(Actor *this) { } if (this->has_met_before) { subaddie_set_state(this, 3); - gcdialog_showDialog(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xA2D, 0, 0), 6, NULL, this->marker, __chMumbo_textCallback, NULL); break; } gcpausemenu_80314AC8(1); @@ -434,7 +434,7 @@ void chMumbo_update(Actor *this) { sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC); } if (sp48 != 0) { - gcdialog_showDialog(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 7, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 0xA25, 0, 0), 7, NULL, NULL, NULL, NULL); volatileFlag_set(VOLATILE_FLAG_11, TRUE); } } @@ -450,7 +450,7 @@ void chMumbo_update(Actor *this) { sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC); } if (sp48 != 0) { - gcdialog_showDialog(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 7, NULL, NULL, NULL, NULL); + gcdialog_showDialog(VER_SELECT(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 0xA26, 0, 0), 7, NULL, NULL, NULL, NULL); volatileFlag_set(VOLATILE_FLAG_12, TRUE); } } @@ -511,7 +511,7 @@ void chMumbo_detransformWarn(NodeProp *arg0, ActorMarker *arg1){ if(D_8037DDF3) return; - gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV : ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xe, NULL, NULL, NULL, NULL); + gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? VER_SELECT(ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV, 0xAC2, 0, 0) : VER_SELECT(ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xAC1, 0, 0), 0xe, NULL, NULL, NULL, NULL); } void chMumbo_detransformTrigger(NodeProp *arg0, ActorMarker *arg1){ @@ -519,7 +519,7 @@ void chMumbo_detransformTrigger(NodeProp *arg0, ActorMarker *arg1){ xform = player_getTransformation(); if(xform == TRANSFORM_1_BANJO || xform == TRANSFORM_7_WISHWASHY || D_8037DDF1) return; - gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV: ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xe, NULL, NULL, NULL, NULL); + gcdialog_showDialog(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? VER_SELECT(ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV, 0xAC4, 0, 0): VER_SELECT(ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xAC3, 0, 0), 0xe, NULL, NULL, NULL, NULL); D_8037DDF1++; player_transform(TRANSFORM_1_BANJO); } diff --git a/src/core2/ch/snacker.c b/src/core2/ch/snacker.c index b400f6b2..0b7c2a02 100644 --- a/src/core2/ch/snacker.c +++ b/src/core2/ch/snacker.c @@ -80,7 +80,7 @@ static void __chsnacker_start_dialog(Actor *this) { text_index = mapSpecificFlags_getN(8, 3); if( !this->has_met_before ) { if(text_index < 4) { - if(gcdialog_showDialog(ASSET_A1B_DIALOG_SNACKER_SPAWNED_1 + text_index, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_A1B_DIALOG_SNACKER_SPAWNED_1, 0x91B, 0, 0) + text_index, 0, NULL, NULL, NULL, NULL)){ text_index++; mapSpecificFlags_setN(8, text_index, 3); this->has_met_before = TRUE; diff --git a/src/core2/ch/trainers.c b/src/core2/ch/trainers.c index 51680a18..96b37ebc 100644 --- a/src/core2/ch/trainers.c +++ b/src/core2/ch/trainers.c @@ -82,7 +82,7 @@ void chtrainers_update(Actor *this){ && !volatileFlag_get(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES) && player_getTransformation() == TRANSFORM_1_BANJO ){ - if(gcdialog_showDialog(0xda4, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(0xda4, 0xA22, 0, 0), 0, NULL, NULL, NULL, NULL)){ volatileFlag_set(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES, TRUE); } }//L802CA620 diff --git a/src/core2/ch/wadingboots.c b/src/core2/ch/wadingboots.c index 00c72cd9..31f2c7b9 100644 --- a/src/core2/ch/wadingboots.c +++ b/src/core2/ch/wadingboots.c @@ -70,7 +70,7 @@ void chwadingboots_update(Actor *this){ if(!subaddie_playerIsWithinSphereAndActive(this, 250)) break; if(player_getTransformation() != TRANSFORM_1_BANJO) break; - if(gcdialog_showDialog(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){ + if(gcdialog_showDialog(VER_SELECT(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0xA23, 0, 0), 0, NULL, NULL, NULL, NULL)){ volatileFlag_set(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS, TRUE); } diff --git a/src/core2/code_53A10.c b/src/core2/code_53A10.c index ef822fa7..3ecdbd5c 100644 --- a/src/core2/code_53A10.c +++ b/src/core2/code_53A10.c @@ -71,13 +71,13 @@ void func_802DAA14(Actor *this){ if(!this->has_met_before){ if(level_get() == LEVEL_A_MAD_MONSTER_MANSION){ - text_id = ASSET_ADC_DIALOG_GRUNTY_ENTER_SHED; + text_id = VER_SELECT(ASSET_ADC_DIALOG_GRUNTY_ENTER_SHED, 0x94E, 0, 0); } else{ if(gsworld_getMap() == MAP_69_GL_MM_LOBBY) - tmp = ASSET_F66_DIALOG_UNKNOWN; + tmp = VER_SELECT(ASSET_F66_DIALOG_UNKNOWN, 0xACC, 0, 0); else - tmp = ASSET_F67_DIALOG_UNKNOWN; + tmp = VER_SELECT(ASSET_F67_DIALOG_UNKNOWN, 0xACD, 0, 0); text_id = tmp; } gcdialog_showDialog(text_id, 4, NULL, this->marker, func_802DA9A0, NULL); diff --git a/src/core2/code_5C870.c b/src/core2/code_5C870.c index 11a359bd..6acff0c3 100644 --- a/src/core2/code_5C870.c +++ b/src/core2/code_5C870.c @@ -422,7 +422,7 @@ void func_802E4384(void){ else{ func_8033DC18(); ; - time_setDeltaReal_frames((s32)(func_8033DC20()*60.0f + 0.5)); + time_setDeltaReal_frames((s32)(func_8033DC20()*(float)FRAMERATE + 0.5)); } func_8033DC10(); diff --git a/src/core2/code_A5BC0.c b/src/core2/code_A5BC0.c index 28d31bfc..37f7d126 100644 --- a/src/core2/code_A5BC0.c +++ b/src/core2/code_A5BC0.c @@ -2276,7 +2276,7 @@ void func_80332894(void) { s32 size; s32 i; - size = 0x579; + size = VER_SELECT(0x579, 0x391, 0, 0); D_8036E7C4 = malloc(size); i = 0; do{ diff --git a/src/core2/code_B3A80.c b/src/core2/code_B3A80.c index 4bb07859..f4ff6cca 100644 --- a/src/core2/code_B3A80.c +++ b/src/core2/code_B3A80.c @@ -222,8 +222,13 @@ void func_8033B1BC(void){ } void func_8033B268(void){ +#if VERSION == VERSION_USA_1_0 D_80383CE0[0] = (vector(struct21s) *)defrag(D_80383CE0[0]); D_80383CE0[1] = (vector(struct21s) *)defrag(D_80383CE0[1]); +#else + D_80383CE0[0] = (vector(struct21s) *)vector_defrag(D_80383CE0[0]); + D_80383CE0[1] = (vector(struct21s) *)vector_defrag(D_80383CE0[1]); +#endif } void func_8033B2A4(s32 arg0) { diff --git a/src/core2/levelcollectible.c b/src/core2/levelcollectible.c index 55e95b9a..07a36c31 100644 --- a/src/core2/levelcollectible.c +++ b/src/core2/levelcollectible.c @@ -126,21 +126,21 @@ void __chLevelCollectible_collide(ActorMarker *marker, ActorMarker *other_marker levelSpecificFlags_set(LEVEL_FLAG_2A_FP_UNKNOWN, TRUE); coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 0x7FFF); __chLevelCollectible_presentCollectEmitSparkles(this->position, ASSET_711_SPRITE_SPARKLE_DARK_BLUE); - dialog_id = ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE; + dialog_id = VER_SELECT(ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE, 0x99A, 0, 0); break; case MARKER_1FE_GREEN_PRESENT_COLLECTIBLE: levelSpecificFlags_set(LEVEL_FLAG_2B_FP_UNKNOWN, TRUE); coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 0x7FFF); __chLevelCollectible_presentCollectEmitSparkles(this->position, ASSET_712_SPRITE_SPARKLE_GREEN); - dialog_id = ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN; + dialog_id = VER_SELECT(ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN, 0x99B, 0, 0); break; case MARKER_1FF_RED_PRESENT_COLLECTIBLE: levelSpecificFlags_set(LEVEL_FLAG_2C_FP_UNKNOWN, TRUE); coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 0x7FFF); __chLevelCollectible_presentCollectEmitSparkles(this->position, ASSET_715_SPRITE_SPARKLE_RED); - dialog_id = ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED; + dialog_id = VER_SELECT(ASSET_C22_DIALOG_PRESENT_COLLECTIBLE_MEET_RED, 0x99C, 0, 0); break; default: