kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mtroyer/all' into 'master'

Browse Source 
All Changes

See merge request banjo.decomp/banjo-kazooie!127
This commit is contained in:
Banjo Kazooie
2025-08-16 17:15:50 +00:00
parent fd208f77ca c2dd933d22
commit b47170c745
389 changed files with 7824 additions and 6965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -65,6 +65,7 @@ ctx.c
nonmatchings/
undefined_syms_auto*
undefined_funcs_auto*
.DS_STORE
#progress reports
*.csv

66
decompressed.pal.yaml
View File

@@ -181,7 +181,7 @@ segments:
- [0xF54BE0, c, ucode]
- [0xF54CE0, c, lookup]
- [0xF54D20, c, ml]
- [0xF58860, c, code_1BE90]
- [0xF58860, c, musicplayer]
- [0xF59F60, c, stub_1D590]
- [0xF59F90, hasm, code_1D5C0]
- [0xF59FA0, c, code_1D5D0]
@@ -385,7 +385,7 @@ segments:
- [0xF75640, .data, memory]
- [0xF75670, .data, lookup]
- [0xF75D60, .data, ml]
- [0xF75EE0, .data, code_1BE90]
- [0xF75EE0, .data, musicplayer]
- [0xF75EF0, .data, code_1D5D0]
- [0xF75F10, .data, sns]
- [0xF75F20, .data, data_1E820]
@@ -423,7 +423,7 @@ segments:
- [0xF77230, .rodata, overlaymanager]
- [0xF772B0, .rodata, mlmtx]
- [0xF772D0, .rodata, ml]
- [0xF773D0, .rodata, code_1BE90]
- [0xF773D0, .rodata, musicplayer]
- [0xF77400, .rodata, code_1D5D0]
- [0xF77460, .rodata, audio/n_synthesizer]
- [0xF77470, .rodata, audio/n_csplayer]
@@ -543,7 +543,7 @@ segments:
# - [0xF647A0, c, code_EE40] #DONE
# - [0xF648B0, c, code_EF50] #DONE
# - [0xF656C0, c, ba/physics] #DONE
# - [0xF66630, c, code_10CD0] #DONE
# - [0xF66630, c, bs/iFrame] #DONE
# - [0xF66700, c, pitch] #DONE
# - [0xF669A0, c, code_11040] #DONE
# - [0xF66BB0, c, climb] #DONE
@@ -563,7 +563,7 @@ segments:
# - [0xF69920, c, bastick] #DONE
# - [0xF69D80, c, code_14420] #DONE
# - [0xF6B880, c, code_15F20] #DONE
# - [0xF6B970, c, code_16010] #DONE
# - [0xF6B970, c, hazards] #DONE
# - [0xF6C5C0, c, code_16C60] #DONE
# - [0xF6CB50, c, batimer] #DONE
# - [0xF6CDB0, c, bs/ant] #DONE
@@ -651,7 +651,7 @@ segments:
# - [0xF914E0, c, spawnqueue] #DONE
# - [0xF92D30, c, ch/gameSelect] #DONE
# - [0xF94430, c, code_3EAD0] #DONE
# - [0xF94590, c, code_3EC30] #DONE
# - [0xF94590, c, ch/explosionripple] #DONE
# - [0xF94640, c, ch/bubble] #DONE
# - [0xF94850, c, ch/bigbutt] #DONE
# - [0xF95A50, c, code_400F0] #DONE
@@ -685,7 +685,7 @@ segments:
# - [0xFA5DF0, c, code_50490] #DONE
# - [0xFA60B0, c, ch/climbBase] #DONE
# - [0xFA6330, c, code_509D0] #DONE
# - [0xFA7100, c, code_517A0] #DONE
# - [0xFA7100, c, ch/piranhaWaterParticles] #DONE
# - [0xFA72B0, c, code_51950] #DONE
# - [0xFA75F0, c, ch/collectible] #DONE
# - [0xFA7BF0, c, ch/mole] #DONE
@@ -730,9 +730,9 @@ segments:
# - [0xFBC6F0, c, code_66D90] #DONE
# - [0xFBC910, c, code_66FB0] #DONE
# - [0xFBCDF0, c, gc/bound] #DONE
# - [0xFBCFB0, c, code_67650] #DONE
# - [0xFBCFB0, c, dustemitter] #DONE
# - [0xFBD300, c, particle] #DONE
# - [0xFBF8C0, c, code_69F60] #DONE
# - [0xFBF8C0, c, particleemittermanager] #DONE
# - [0xFBFE10, c, code_6A4B0]
# - [0xFC0850, c, code_6AEF0] #DONE
# - [0xFC0990, c, code_6B030] #DONE
@@ -823,7 +823,7 @@ segments:
# - [0x100C030, c, string] #DONE
# - [0x100C5C0, c, code_B6C60] #DONE
# - [0x100C640, c, time] #DONE
# - [0x100C800, c, code_B6EA0] #DONE
# - [0x100C800, c, commonParticle] #DONE
# - [0x100D480, c, coords] #DONE
# - [0x100D8A0, c, code_B7F40] #DONE
# - [0x100D980, c, code_B8020] #DONE
@@ -865,7 +865,7 @@ segments:
# - [0x101F860, c, code_C9F00] #DONE
# - [0x10209B0, c, code_CB050] #DONE
# - [0x1020F70, c, code_CB610] #DONE
# - [0x1021200, c, code_CB8A0] #DONE
# - [0x1021200, c, commonParticleTypeMap] #DONE
# - [0x1021550, c, code_CBBF0] #DONE
# - [0x1021670, c, code_CBD10] #DONE
# - [0x1021B40, c, code_CC1E0] #DONE
@@ -874,7 +874,7 @@ segments:
# - [0x1023040, c, code_CD6E0] #DONE
# - [0x1024630, c, code_CECD0] #DONE
# - [0x10249F0, c, code_CF090] #DONE
# - [0x1024D40, c, code_CF3E0] #DONE
# - [0x1024D40, c, progressDialog] #DONE
# - [0x1024F50, c, code_CF5F0] #DONE
# - [0x1025140, c, ch/clankerwhipcrack] #DONE
# - [0x10253C0, c, ch/code_CFA60] #DONE
@@ -950,7 +950,7 @@ segments:
# - [0x1034790, .data, spawnqueue]
# - [0x10347A0, .data, ch/gameSelect]
# - [0x1034900, .data, code_3EAD0]
# - [0x1034980, .data, code_3EC30]
# - [0x1034980, .data, ch/explosionripple]
# - [0x10349B0, .data, ch/bubble]
# - [0x10349E0, .data, ch/bigbutt]
# - [0x1034AC0, .data, code_400F0]
@@ -984,7 +984,7 @@ segments:
# - [0x1036450, .data, code_50490]
# - [0x10364F0, .data, ch/climbBase]
# - [0x1036520, .data, code_509D0]
# - [0x1036630, .data, code_517A0]
# - [0x1036630, .data, ch/piranhaWaterParticles]
# - [0x1036660, .data, code_51950]
# - [0x10366D0, .data, ch/collectible]
# - [0x1036740, .data, ch/mole]
@@ -1014,7 +1014,7 @@ segments:
# - [0x1037220, .data, code_66D90]
# - [0x1037230, .data, code_66FB0]
# - [0x10372B0, .data, gc/bound]
# - [0x1037300, .data, code_67650]
# - [0x1037300, .data, dustemitter]
# - [0x1037310, .data, particle]
# - [0x10373A0, .data, code_6A4B0]
# - [0x1037470, .data, code_6AEF0]
@@ -1078,7 +1078,7 @@ segments:
# - [0x103F3F0, .data, code_B5040]
# - [0x103F490, .data, code_B62B0]
# - [0x10407F0, .data, time]
# - [0x1040800, .data, code_B6EA0]
# - [0x1040800, .data, commonParticle]
# - [0x1040830, .data, code_B7F40]
# - [0x1040840, .data, code_B9770]
# - [0x1040890, .data, code_BD100]
@@ -1096,7 +1096,7 @@ segments:
# - [0x1041090, .data, code_CD6E0]
# - [0x10410C0, .data, code_CECD0]
# - [0x10410D0, .data, code_CF090]
# - [0x1041100, .data, code_CF3E0]
# - [0x1041100, .data, progressDialog]
# - [0x10411C0, .data, code_CF5F0]
# - [0x10411E0, .data, ch/clankerwhipcrack]
# - [0x1041210, .data, ch/code_CFA60]
@@ -1144,7 +1144,7 @@ segments:
# - [0x1043180, .rodata, abilityprogress]
# - [0x10431B0, .rodata, code_EF50]
# - [0x1043350, .rodata, ba/physics]
# - [0x10433B0, .rodata, code_10CD0]
# - [0x10433B0, .rodata, bs/iFrame]
# - [0x10433C0, .rodata, pitch]
# - [0x10433F0, .rodata, code_11040]
# - [0x1043400, .rodata, climb]
@@ -1157,7 +1157,7 @@ segments:
# - [0x10436C0, .rodata, code_12F30]
# - [0x10436E0, .rodata, bastick]
# - [0x10436F0, .rodata, code_14420]
# - [0x1043770, .rodata, code_16010]
# - [0x1043770, .rodata, hazards]
# - [0x1043BD0, .rodata, code_16C60]
# - [0x1043C70, .rodata, bs/ant]
# - [0x1043CA0, .rodata, bs/bBarge]
@@ -1247,7 +1247,7 @@ segments:
# - [0x1045710, .rodata, ch/badShad]
# - [0x1045720, .rodata, code_50490]
# - [0x1045730, .rodata, code_509D0]
# - [0x1045770, .rodata, code_517A0]
# - [0x1045770, .rodata, ch/piranhaWaterParticles]
# - [0x1045780, .rodata, code_51950]
# - [0x1045790, .rodata, ch/mole]
# - [0x1045830, .rodata, code_53C10]
@@ -1269,7 +1269,7 @@ segments:
# - [0x1045AE0, .rodata, code_5C870]
# - [0x1045B50, .rodata, code_5FD90]
# - [0x1045B60, .rodata, code_66FB0]
# - [0x1045B70, .rodata, code_67650]
# - [0x1045B70, .rodata, dustemitter]
# - [0x1045B80, .rodata, particle]
# - [0x1045BA0, .rodata, code_6A4B0]
# - [0x1045BB0, .rodata, code_6B030]
@@ -1407,7 +1407,7 @@ segments:
# - [0x0106C980, .bss, code_EE40]
# - [0x0106C980, .bss, code_EF50]
# - [0x0106C980, .bss, ba/physics]
# - [0x0106C980, .bss, code_10CD0]
# - [0x0106C980, .bss, bs/iFrame]
# - [0x0106C980, .bss, pitch]
# - [0x0106C980, .bss, code_11040]
# - [0x0106C980, .bss, climb]
@@ -1427,7 +1427,7 @@ segments:
# - [0x0106C980, .bss, bastick]
# - [0x0106C980, .bss, code_14420]
# - [0x0106C980, .bss, code_15F20]
# - [0x0106C980, .bss, code_16010]
# - [0x0106C980, .bss, hazards]
# - [0x0106C980, .bss, code_16C60]
# - [0x0106C980, .bss, batimer]
# - [0x0106C980, .bss, bs/ant]
@@ -1530,9 +1530,9 @@ segments:
# - [0x0106C980, .bss, code_654C0]
# - [0x0106C980, .bss, code_66D90]
# - [0x0106C980, .bss, gc/bound]
# - [0x0106C980, .bss, code_67650]
# - [0x0106C980, .bss, dustemitter]
# - [0x0106C980, .bss, particle]
# - [0x0106C980, .bss, code_69F60]
# - [0x0106C980, .bss, particleemittermanager]
# - [0x0106C980, .bss, code_6AEF0]
# - [0x0106C980, .bss, code_6B030]
# - [0x0106C980, .bss, fx/ripple]
@@ -1606,7 +1606,7 @@ segments:
# - [0x0106C980, .bss, code_B62B0]
# - [0x0106C980, .bss, code_B6C60]
# - [0x0106C980, .bss, time]
# - [0x0106C980, .bss, code_B6EA0]
# - [0x0106C980, .bss, commonParticle]
# - [0x0106C980, .bss, code_B8020]
# - [0x0106C980, .bss, code_B8860]
# - [0x0106C980, .bss, code_B9770]
@@ -1624,7 +1624,7 @@ segments:
# - [0x0106C980, .bss, code_C97F0]
# - [0x0106C980, .bss, code_C9E70]
# - [0x0106C980, .bss, code_C9F00]
# - [0x0106C980, .bss, code_CB8A0]
# - [0x0106C980, .bss, commonParticleTypeMap]
# - [0x0106C980, .bss, code_CBBF0]
# - [0x0106C980, .bss, code_CD0A0]
# - [0x0106C980, .bss, code_CD6E0]
@@ -1913,7 +1913,7 @@ segments:
# # - [0x106EAA0, c, ch/frogminigame] #DONE
# # - [0x106F160, c, ch/yellowflibbit] #DONE
# # - [0x10709B0, c, ch/mudhut] #DONE
# # - [0x1070DD0, c, ch/code_8A60] #DONE
# # - [0x1070DD0, c, ch/swampswitch] #DONE
# # - [0x1071160, c, code_8DF0] #DONE
# # - [0x10713F0, c, ch/tanktup]
# # - [0x1071AC0, c, code_9750] #DONE
@@ -1931,7 +1931,7 @@ segments:
# # - [0x1072A60, .data, ch/yellowflibbit]
# # - [0x1072AA0, .data, crc]
# # - [0x1072AB0, .data, ch/mudhut]
# # - [0x1072B10, .data, ch/code_8A60]
# # - [0x1072B10, .data, ch/swampswitch]
# # - [0x1072BA0, .data, ch/tanktup]
# # - [0x1072BD0, .data, code_9750]
# # - [0x1072CF0, .data, ch/bigalligator]
@@ -1946,7 +1946,7 @@ segments:
# # - [0x1073010, .rodata, ch/frogminigame]
# # - [0x1073020, .rodata, ch/yellowflibbit]
# # - [0x1073110, .rodata, ch/mudhut]
# # - [0x1073120, .rodata, ch/code_8A60]
# # - [0x1073120, .rodata, ch/swampswitch]
# # - [0x1073130, .rodata, ch/tanktup]
# # - [0x1073140, .rodata, code_9750]
# # - [0x1073150, .rodata, ch/leafboat]
@@ -2194,7 +2194,7 @@ segments:
# # - [0x109C310, c, ch/cauldron] #DONE
# # - [0x109D6B0, c, ch/brentilda] #DONE
# # - [0x109DF40, c, code_5ED0] #DONE
# # - [0x10A0760, c, code_86F0] #DONE
# # - [0x10A0760, c, jigsawpicture] #DONE
# # - [0x10A1CB0, c, code_9C40] #DONE
# # - [0x10A21E0, c, code_A170] #DONE
# # - [0x10A24A0, c, code_A430] #DONE
@@ -2208,7 +2208,7 @@ segments:
# # - [0x10A51A0, .data, ch/cauldron]
# # - [0x10A5390, .data, ch/brentilda]
# # - [0x10A53E0, .data, code_5ED0]
# # - [0x10A6430, .data, code_86F0]
# # - [0x10A6430, .data, jigsawpicture]
# # - [0x10A64E0, .data, code_9C40]
# # - [0x10A6560, .data, code_A170]
# # - [0x10A6600, .data, code_A430]
@@ -2222,7 +2222,7 @@ segments:
# # - [0x10A6C80, .rodata, ch/cauldron]
# # - [0x10A6D10, .rodata, ch/brentilda]
# # - [0x10A6D40, .rodata, code_5ED0]
# # - [0x10A6E50, .rodata, code_86F0]
# # - [0x10A6E50, .rodata, jigsawpicture]
# # - [0x10A6EC0, .rodata, code_9C40]
# # - [0x10A6EF0, .rodata, code_A4A0]
# # - [0x10A6F30, .rodata, code_A810]

72
decompressed.us.v10.yaml
View File

@@ -161,7 +161,7 @@ segments:
- [0xF20500, c, code_72B0]
- [0xF211B0, c, code_7F60]
- [0xF21EA0, c, code_8C50]
- [0xF22F80, c, code_9D30]
- [0xF22F80, c, debugtext]
- [0xF23E00, c, framebufferdraw]
- [0xF260B0, c, code_CE60]
- [0xF275B0, c, vimgr]
@@ -182,7 +182,7 @@ segments:
- [0xF31460, c, ucode]
- [0xF31560, c, lookup]
- [0xF315A0, c, ml]
- [0xF350E0, c, code_1BE90]
- [0xF350E0, c, musicplayer]
- [0xF367E0, c, stub_1D590]
- [0xF36810, hasm, code_1D5C0]
- [0xF36820, c, code_1D5D0]
@@ -373,7 +373,7 @@ segments:
- [0xF51120, bin, data_37ED0] #unreferenced
- [0xF51130, .data, code_7F60]
- [0xF51140, .data, code_8C50]
- [0xF51280, .data, code_9D30]
- [0xF51280, .data, debugtext]
- [0xF51430, .data, framebufferdraw]
- [0xF51440, .data, code_CE60]
- [0xF514B0, .data, vimgr]
@@ -386,7 +386,7 @@ segments:
- [0xF51DC0, .data, memory]
- [0xF51DF0, .data, lookup]
- [0xF524E0, .data, ml]
- [0xF52660, .data, code_1BE90]
- [0xF52660, .data, musicplayer]
- [0xF52670, .data, code_1D5D0]
- [0xF52690, .data, sns]
- [0xF526A0, .data, data_1E820]
@@ -416,7 +416,7 @@ segments:
- [0xF52E90, .rodata, code_5650]
- [0xF52EF0, .rodata, code_72B0]
- [0xF52F10, .rodata, code_7F60]
- [0xF52F30, .rodata, code_9D30]
- [0xF52F30, .rodata, debugtext]
- [0xF52F50, .rodata, code_CE60]
- [0xF53220, .rodata, viewport]
- [0xF532A0, .rodata, pfsmanager]
@@ -425,7 +425,7 @@ segments:
- [0xF539D0, .rodata, overlaymanager]
- [0xF53A50, .rodata, mlmtx]
- [0xF53A70, .rodata, ml]
- [0xF53B70, .rodata, code_1BE90]
- [0xF53B70, .rodata, musicplayer]
- [0xF53BA0, .rodata, code_1D5D0]
- [0xF53C00, .rodata, audio/n_synthesizer]
- [0xF53C10, .rodata, audio/n_csplayer]
@@ -543,7 +543,7 @@ segments:
- [0xF647A0, c, code_EE40]
- [0xF648B0, c, code_EF50]
- [0xF656C0, c, ba/physics]
- [0xF66630, c, code_10CD0]
- [0xF66630, c, bs/iFrame]
- [0xF66700, c, pitch]
- [0xF669A0, c, code_11040]
- [0xF66BB0, c, climb]
@@ -563,7 +563,7 @@ segments:
- [0xF69920, c, bastick]
- [0xF69D80, c, code_14420]
- [0xF6B880, c, code_15F20]
- [0xF6B970, c, code_16010] # baswamp?
- [0xF6B970, c, hazards] # baswamp?
- [0xF6C5C0, c, code_16C60]
- [0xF6CB50, c, batimer]
- [0xF6CDB0, c, bs/ant]
@@ -651,7 +651,7 @@ segments:
- [0xF914E0, c, spawnqueue]
- [0xF92D30, c, ch/gameSelect]
- [0xF94430, c, code_3EAD0]
- [0xF94590, c, code_3EC30]
- [0xF94590, c, ch/explosionripple]
- [0xF94640, c, ch/bubble]
- [0xF94850, c, ch/bigbutt]
- [0xF95A50, c, code_400F0]
@@ -685,7 +685,7 @@ segments:
- [0xFA5DF0, c, code_50490]
- [0xFA60B0, c, ch/climbBase]
- [0xFA6330, c, code_509D0]
- [0xFA7100, c, code_517A0]
- [0xFA7100, c, ch/piranhaWaterParticles]
- [0xFA72B0, c, code_51950]
- [0xFA75F0, c, ch/collectible]
- [0xFA7BF0, c, ch/mole]
@@ -730,9 +730,9 @@ segments:
- [0xFBC6F0, c, code_66D90]
- [0xFBC910, c, code_66FB0]
- [0xFBCDF0, c, gc/bound]
- [0xFBCFB0, c, code_67650]
- [0xFBCFB0, c, dustemitter]
- [0xFBD300, c, particle]
- [0xFBF8C0, c, code_69F60]
- [0xFBF8C0, c, particleemittermanager]
- [0xFBFE10, c, code_6A4B0]
- [0xFC0850, c, code_6AEF0]
- [0xFC0990, c, code_6B030]
@@ -823,7 +823,7 @@ segments:
- [0x100C030, c, string]
- [0x100C5C0, c, code_B6C60]
- [0x100C640, c, time]
- [0x100C800, c, code_B6EA0]
- [0x100C800, c, commonParticle]
- [0x100D480, c, coords]
- [0x100D8A0, c, code_B7F40]
- [0x100D980, c, code_B8020]
@@ -865,7 +865,7 @@ segments:
- [0x101F860, c, code_C9F00]
- [0x10209B0, c, code_CB050]
- [0x1020F70, c, code_CB610]
- [0x1021200, c, code_CB8A0]
- [0x1021200, c, commonParticleTypeMap]
- [0x1021550, c, code_CBBF0]
- [0x1021670, c, code_CBD10]
- [0x1021B40, c, code_CC1E0]
@@ -874,7 +874,7 @@ segments:
- [0x1023040, c, code_CD6E0]
- [0x1024630, c, code_CECD0]
- [0x10249F0, c, code_CF090]
- [0x1024D40, c, code_CF3E0]
- [0x1024D40, c, progressDialog]
- [0x1024F50, c, code_CF5F0]
- [0x1025140, c, ch/clankerwhipcrack]
- [0x10253C0, c, ch/code_CFA60]
@@ -949,7 +949,7 @@ segments:
- [0x1034790, .data, spawnqueue]
- [0x10347A0, .data, ch/gameSelect]
- [0x1034900, .data, code_3EAD0]
- [0x1034980, .data, code_3EC30]
- [0x1034980, .data, ch/explosionripple]
- [0x10349B0, .data, ch/bubble]
- [0x10349E0, .data, ch/bigbutt]
- [0x1034AC0, .data, code_400F0]
@@ -983,7 +983,7 @@ segments:
- [0x1036450, .data, code_50490]
- [0x10364F0, .data, ch/climbBase]
- [0x1036520, .data, code_509D0]
- [0x1036630, .data, code_517A0]
- [0x1036630, .data, ch/piranhaWaterParticles]
- [0x1036660, .data, code_51950]
- [0x10366D0, .data, ch/collectible]
- [0x1036740, .data, ch/mole]
@@ -1013,7 +1013,7 @@ segments:
- [0x1037220, .data, code_66D90]
- [0x1037230, .data, code_66FB0]
- [0x10372B0, .data, gc/bound]
- [0x1037300, .data, code_67650]
- [0x1037300, .data, dustemitter]
- [0x1037310, .data, particle]
- [0x10373A0, .data, code_6A4B0]
- [0x1037470, .data, code_6AEF0]
@@ -1077,7 +1077,7 @@ segments:
- [0x103F3F0, .data, code_B5040]
- [0x103F490, .data, code_B62B0]
- [0x10407F0, .data, time]
- [0x1040800, .data, code_B6EA0]
- [0x1040800, .data, commonParticle]
- [0x1040830, .data, code_B7F40]
- [0x1040840, .data, code_B9770]
- [0x1040890, .data, code_BD100]
@@ -1095,7 +1095,7 @@ segments:
- [0x1041090, .data, code_CD6E0]
- [0x10410C0, .data, code_CECD0]
- [0x10410D0, .data, code_CF090]
- [0x1041100, .data, code_CF3E0]
- [0x1041100, .data, progressDialog]
- [0x10411C0, .data, code_CF5F0]
- [0x10411E0, .data, ch/clankerwhipcrack]
- [0x1041210, .data, ch/code_CFA60]
@@ -1142,7 +1142,7 @@ segments:
- [0x1043180, .rodata, abilityprogress]
- [0x10431B0, .rodata, code_EF50]
- [0x1043350, .rodata, ba/physics]
- [0x10433B0, .rodata, code_10CD0]
- [0x10433B0, .rodata, bs/iFrame]
- [0x10433C0, .rodata, pitch]
- [0x10433F0, .rodata, code_11040]
- [0x1043400, .rodata, climb]
@@ -1155,7 +1155,7 @@ segments:
- [0x10436C0, .rodata, code_12F30]
- [0x10436E0, .rodata, bastick]
- [0x10436F0, .rodata, code_14420]
- [0x1043770, .rodata, code_16010]
- [0x1043770, .rodata, hazards]
- [0x1043BD0, .rodata, code_16C60]
- [0x1043C70, .rodata, bs/ant]
- [0x1043CA0, .rodata, bs/bBarge]
@@ -1245,7 +1245,7 @@ segments:
- [0x1045710, .rodata, ch/badShad]
- [0x1045720, .rodata, code_50490]
- [0x1045730, .rodata, code_509D0]
- [0x1045770, .rodata, code_517A0]
- [0x1045770, .rodata, ch/piranhaWaterParticles]
- [0x1045780, .rodata, code_51950]
- [0x1045790, .rodata, ch/mole]
- [0x1045830, .rodata, code_53C10]
@@ -1267,7 +1267,7 @@ segments:
- [0x1045AE0, .rodata, code_5C870]
- [0x1045B50, .rodata, code_5FD90]
- [0x1045B60, .rodata, code_66FB0]
- [0x1045B70, .rodata, code_67650]
- [0x1045B70, .rodata, dustemitter]
- [0x1045B80, .rodata, particle]
- [0x1045BA0, .rodata, code_6A4B0]
- [0x1045BB0, .rodata, code_6B030]
@@ -1405,7 +1405,7 @@ segments:
- [0x1048560, .bss, code_EE40]
- [0x1048560, .bss, code_EF50]
- [0x1048560, .bss, ba/physics]
- [0x1048560, .bss, code_10CD0]
- [0x1048560, .bss, bs/iFrame]
- [0x1048560, .bss, pitch]
- [0x1048560, .bss, code_11040]
- [0x1048560, .bss, climb]
@@ -1425,7 +1425,7 @@ segments:
- [0x1048560, .bss, bastick]
- [0x1048560, .bss, code_14420]
- [0x1048560, .bss, code_15F20]
- [0x1048560, .bss, code_16010]
- [0x1048560, .bss, hazards]
- [0x1048560, .bss, code_16C60]
- [0x1048560, .bss, batimer]
- [0x1048560, .bss, bs/ant]
@@ -1528,9 +1528,9 @@ segments:
- [0x1048560, .bss, code_654C0]
- [0x1048560, .bss, code_66D90]
- [0x1048560, .bss, gc/bound]
- [0x1048560, .bss, code_67650]
- [0x1048560, .bss, dustemitter]
- [0x1048560, .bss, particle]
- [0x1048560, .bss, code_69F60]
- [0x1048560, .bss, particleemittermanager]
- [0x1048560, .bss, code_6AEF0]
- [0x1048560, .bss, code_6B030]
- [0x1048560, .bss, fx/ripple]
@@ -1604,7 +1604,7 @@ segments:
- [0x1048560, .bss, code_B62B0]
- [0x1048560, .bss, code_B6C60]
- [0x1048560, .bss, time]
- [0x1048560, .bss, code_B6EA0]
- [0x1048560, .bss, commonParticle]
- [0x1048560, .bss, code_B8020]
- [0x1048560, .bss, code_B8860]
- [0x1048560, .bss, code_B9770]
@@ -1622,7 +1622,7 @@ segments:
- [0x1048560, .bss, code_C97F0]
- [0x1048560, .bss, code_C9E70]
- [0x1048560, .bss, code_C9F00]
- [0x1048560, .bss, code_CB8A0]
- [0x1048560, .bss, commonParticleTypeMap]
- [0x1048560, .bss, code_CBBF0]
- [0x1048560, .bss, code_CD0A0]
- [0x1048560, .bss, code_CD6E0]
@@ -1911,7 +1911,7 @@ segments:
- [0x106EAA0, c, ch/frogminigame]
- [0x106F160, c, ch/yellowflibbit]
- [0x10709B0, c, ch/mudhut]
- [0x1070DD0, c, ch/code_8A60]
- [0x1070DD0, c, ch/swampswitch]
- [0x1071160, c, code_8DF0]
- [0x10713F0, c, ch/tanktup]
- [0x1071AC0, c, code_9750]
@@ -1929,7 +1929,7 @@ segments:
- [0x1072A60, .data, ch/yellowflibbit]
- [0x1072AA0, .data, crc]
- [0x1072AB0, .data, ch/mudhut]
- [0x1072B10, .data, ch/code_8A60]
- [0x1072B10, .data, ch/swampswitch]
- [0x1072BA0, .data, ch/tanktup]
- [0x1072BD0, .data, code_9750]
- [0x1072CF0, .data, ch/bigalligator]
@@ -1944,7 +1944,7 @@ segments:
- [0x1073010, .rodata, ch/frogminigame]
- [0x1073020, .rodata, ch/yellowflibbit]
- [0x1073110, .rodata, ch/mudhut]
- [0x1073120, .rodata, ch/code_8A60]
- [0x1073120, .rodata, ch/swampswitch]
- [0x1073130, .rodata, ch/tanktup]
- [0x1073140, .rodata, code_9750]
- [0x1073150, .rodata, ch/leafboat]
@@ -2192,7 +2192,7 @@ segments:
- [0x109C310, c, ch/cauldron]
- [0x109D6B0, c, ch/brentilda]
- [0x109DF40, c, code_5ED0]
- [0x10A0760, c, code_86F0]
- [0x10A0760, c, jigsawpicture]
- [0x10A1CB0, c, code_9C40]
- [0x10A21E0, c, code_A170]
- [0x10A24A0, c, code_A430]
@@ -2206,7 +2206,7 @@ segments:
- [0x10A51A0, .data, ch/cauldron]
- [0x10A5390, .data, ch/brentilda]
- [0x10A53E0, .data, code_5ED0]
- [0x10A6430, .data, code_86F0]
- [0x10A6430, .data, jigsawpicture]
- [0x10A64E0, .data, code_9C40]
- [0x10A6560, .data, code_A170]
- [0x10A6600, .data, code_A430]
@@ -2220,7 +2220,7 @@ segments:
- [0x10A6C80, .rodata, ch/cauldron]
- [0x10A6D10, .rodata, ch/brentilda]
- [0x10A6D40, .rodata, code_5ED0]
- [0x10A6E50, .rodata, code_86F0]
- [0x10A6E50, .rodata, jigsawpicture]
- [0x10A6EC0, .rodata, code_9C40]
- [0x10A6EF0, .rodata, code_A4A0]
- [0x10A6F30, .rodata, code_A810]

2
include/bsint.h
View File

@@ -39,7 +39,7 @@ enum bs_interrupt_e {
BS_INTR_1C,
BS_INTR_1D,
BS_INTR_1E,
BS_INTR_1F,
BS_INTR_1F_HAZARD,
BS_INTR_20,
BS_INTR_21,
BS_INTR_22,

2
include/core1/pfsmanager.h
View File

@@ -36,7 +36,7 @@ f32 func_8024E420(s32 arg0, s32 arg1, s32 arg2);
void controller_copyFaceButtons(s32 controller_index, s32 dst[6]);
void pfsManager_getFirstControllerFaceButtonState(s32 controller_index, s32 dst[6]);
s32 func_8024E5E8(s32 arg0, s32 arg1);
s32 func_8024E60C(s32 controller_index, s32 dst[3]);
s32 controller_copySideButtons(s32 controller_index, s32 dst[3]);
s32 func_8024E640(s32 controller_index, s32 dst[3]);
f32 func_8024E668(s32 controller_index);
s32 controller_getStartButton(s32 controller_index);

15
include/core2/abilityprogress.h Normal file
View File

@@ -0,0 +1,15 @@
enum ability_used {
ABILITY_USED_JUMP = 0x0,
ABILITY_USED_FLAP = 0x1,
ABILITY_USED_FLIP = 0x2,
ABILITY_USED_SWIM = 0x3,
ABILITY_USED_CLIMB = 0x4,
ABILITY_USED_BEAK_BARGE = 0x5,
ABILITY_USED_SLIDE = 0x6,
ABILITY_USED_EGG = 0x7,
ABILITY_USED_FLY = 0x8,
ABILITY_USED_SHOCK = 0x9,
ABILITY_USED_PECK = 0xA,
ABILITY_USED_CLAW = 0xB,
ABILITY_USED_TWIRL = 0xC
};

75
include/core2/commonParticle.h Normal file
View File

@@ -0,0 +1,75 @@
#ifndef CORE2_COMMON_PARTICLE_H
#define CORE2_COMMON_PARTICLE_H
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "core2/anim/sprite.h"
#define PARTICLE_LIMIT 40
typedef s32 (*FuncUnk40)(ActorMarker *, s32, f32[3]);
enum common_particle_e {
COMMON_PARTICLE_1_EGG_HEAD = 1,
COMMON_PARTICLE_2 = 2,
COMMON_PARTICLE_3 = 3,
COMMON_PARTICLE_4_EGG_ASS = 4,
COMMON_PARTICLE_5 = 5,
COMMON_PARTICLE_6 = 6,
COMMON_PARTICLE_7 = 7,
COMMON_PARTICLE_8_JIGGY_SHINE = 8,
COMMON_PARTICLE_9 = 9,
COMMON_PARTICLE_A = 10,
COMMON_PARTICLE_B = 11,
COMMON_PARTICLE_C = 12,
COMMON_PARTICLE_D = 13,
COMMON_PARTICLE_E = 14,
COMMON_PARTICLE_F = 15,
COMMON_PARTICLE_10 = 16,
COMMON_PARTICLE_11 = 17
};
typedef struct particle_struct_s {
f32 unk0;
f32 unk4;
f32 unk8;
f32 unkC;
f32 unk10;
f32 unk14;
u8 pad18[8];
s32 unk20;
s32 unk24;
s32 unk28;
u8 pad24[0x4];
ActorMarker *marker_30;
AnimSprite *animSprite;
ActorMarker *actorMarker;
s32 unk3C;
FuncUnk40 unk40;
u8 isInUse;
u8 projectileIndex;
u8 typeMapIndex;
u8 unk47;
} CommonParticle;
ActorMarker *commonParticle_getCurrentActorMarker(void);
FuncUnk40 func_8033E888(void);
u8 commonParticle_getCurrentProjectileIndex(void);
AnimSprite *commonParticle_getCurrentAnimSprite(void);
CommonParticle *commonParticle_getCurrentParticle(void);
void commonParticle_setCurrentInUseFalse(void);
void projectile_setSprite(u8, enum asset_e);
void func_8033FC34(u8, s32);
void projectile_setColor(u8, s32, s32, s32);
void func_8033FCD8(u8, s32);
void projectile_setRotation(u8, f32[3]);
void projectile_addRoll(u8, f32);
void projectile_setPosition(u8, f32[3]);
void func_8033FFE4(u8, s32, s32);
void func_80344E18(u8, s32);
void func_80344E3C(u8, f32[3]);
void func_80344D94(u8, f32[3]);
void func_80344EE4(u8, f32, f32);
#endif

10
include/core2/dustemitter.h Normal file
View File

@@ -0,0 +1,10 @@
#define EMITTER_COUNT 3
#define EMITTER_CAPACITY 0x20
enum dust_emitter_type_e {
DUST_EMITTER_TYPE_DUST = 0,
DUST_EMITTER_TYPE_BREAK_DUST = 1
};
extern void dustEmitter_empty(ParticleEmitter *);
extern void dustEmitter_emit(f32[3], f32[3], s32[4], bool, f32, f32, s32, s32, enum dust_emitter_type_e);

2
include/core2/particle.h
View File

@@ -12,7 +12,7 @@ void particleEmitter_setAlpha(ParticleEmitter *this, s32 alpha);
void particleEmitter_setSfx(ParticleEmitter *this, enum sfx_e sfx_id, s32 arg2);
void func_802EFA04(ParticleEmitter *this, f32);
void particleEmitter_setParticleCallback(ParticleEmitter *this, void (*arg1)(ParticleEmitter *this, f32 pos[3]));
void func_802EFA20(ParticleEmitter *this, f32, f32);
void particleEmitter_func_802EFA20(ParticleEmitter *this, f32, f32);
void func_802EFA34(ParticleEmitter *this, f32);
void func_802EFA40(ParticleEmitter *this, f32 (*)[3]);
void particleEmitter_func_802EFA78(ParticleEmitter *this, s32 arg1);

20
include/core2/particleemittermanager.h Normal file
View File

@@ -0,0 +1,20 @@
#define MAX_EMITTER_COUNT 16 // Effectively reduced by 1, as 0 is saved for an in-progress initialization and empty
typedef struct {
f32 freeTime;
ParticleEmitter *emitter;
u32 isActive: 1;
u32 capacity: 10;
u32 padding: 21;
} EmitterData;
ParticleEmitter *pem_getEmitterByIndex(u8 index);
u8 pem_newEmitter(s32 count);
void pem_freeAll(void);
void pem_setAllInactive(void);
void pem_free(u8 arg0);
void pem_updateAll(void);
void pem_freeEmitters(void);
void pem_defragAll(void);
void pem_freeDependencies(void);
void pem_initDependencies(void);

2
include/core2/statetimer.h
View File

@@ -9,7 +9,7 @@ enum state_timer_e{
STATE_TIMER_1_THROW = 1,
STATE_TIMER_2_LONGLEG,
STATE_TIMER_3_TURBO_TALON,
STATE_TIMER_4_UNKNOWN,
STATE_TIMER_4_IFRAME,
STATE_TIMER_5_UNKNOWN, //slide timer
STATE_TIMER_6_UNKNOWN //trot slide timer
};

5
include/core2/staticcamera.h Normal file
View File

@@ -0,0 +1,5 @@
enum static_camera_id_s {
MM_ORANGE_PAD_JIGGY_SPAWN_TOP = 0xE,
MM_ORANGE_PAD_JIGGY_SPAWN_LEFT = 0xF,
MM_ORANGE_PAD_JIGGY_SPAWN_RIGHT = 0x10
};

334
include/enums.h
View File

@@ -29,7 +29,7 @@ enum file_progress_e {
FILEPROG_C_EXTRA_LIFE_TEXT,
FILEPROG_D_BEEHIVE_TEXT,
FILEPROG_E_JINJO_TEXT,
FILEPROG_F_HAS_TOUCHED_PIRAHANA_WATER,
FILEPROG_F_HAS_TOUCHED_PIRANHA_WATER,
FILEPROG_10_HAS_TOUCHED_SAND_EEL_SAND,
FILEPROG_11_HAS_MET_MUMBO,
FILEPROG_12_HAS_TRANSFORMED_BEFORE,
@@ -129,7 +129,7 @@ enum file_progress_e {
FILEPROG_92_PAID_WALRUS_COST,
FILEPROG_93_PAID_CROC_COST,
FILEPROG_94_PAID_BEE_COST,
FILEPROG_95_UNKNOWN,
FILEPROG_95_UNUSED_UNKNOWN_ITEM_COLLECT,
FILEPROG_96_MET_BRENTILDA,
FILEPROG_97_ENTERED_LAIR_TEXT,
FILEPROG_98_EXITED_LEVEL_TEXT,
@@ -438,15 +438,17 @@ enum level_flags_e
LEVEL_FLAG_19_FP_UNKNOWN = 0x19,
LEVEL_FLAG_1A_UNKNOWN,
LEVEL_FLAG_1B_MMM_UNKNOWN,
LEVEL_FLAG_1C_MM_UNKNOWN,
LEVEL_FLAG_1D_TTC_UNKNOWN,
LEVEL_FLAG_1E_CC_UNKNOWN,
LEVEL_FLAG_1F_BGS_UNKNOWN,
LEVEL_FLAG_20_FP_UNKNOWN,
LEVEL_FLAG_21_GV_UNKNOWN,
LEVEL_FLAG_22_MMM_UNKNOWN,
LEVEL_FLAG_23_RBB_UNKNOWN,
LEVEL_FLAG_24_CCW_UNKNOWN,
LEVEL_FLAG_1C_MM_OPEN = 0x1C, // See jigsawpicture.c
LEVEL_FLAG_1D_TTC_OPEN,
LEVEL_FLAG_1E_CC_OPEN,
LEVEL_FLAG_1F_BGS_OPEN,
LEVEL_FLAG_20_FP_OPEN,
LEVEL_FLAG_21_GV_OPEN,
LEVEL_FLAG_22_MMM_OPEN,
LEVEL_FLAG_23_RBB_OPEN,
LEVEL_FLAG_24_CCW_OPEN,
LEVEL_FLAG_25_CCW_UNKNOWN,
LEVEL_FLAG_26_FP_UNKNOWN,
LEVEL_FLAG_27_RBB_UNKNOWN,
@@ -464,12 +466,14 @@ enum level_flags_e
LEVEL_FLAG_33_MMM_UNKNOWN,
LEVEL_FLAG_34_UNKNOWN,
LEVEL_FLAG_35_UNKNOWN = 0x35,
LEVEL_FLAG_38_CCW_UNKNOWN = 0x38,
LEVEL_FLAG_3C_LAIR_UNKNOWN = 0x3C,
LEVEL_FLAG_3D_LAIR_UNKNOWN,
LEVEL_FLAG_3E_UNKNOWN,
LEVEL_FLAG_3F_LAIR_UNKNOWN
LEVEL_FLAG_3F_LAIR_GRUNTY_DOOR_OPEN
};
enum transformation_e
@@ -1446,10 +1450,10 @@ enum sfx_e
SFX_191_STATIC,
SFX_3E9_UNKNOWN = 0x3e9, //bsbwhirl
SFX_3EA_UNKNOWN, //chjig
SFX_3EA_BANJO_GUH_HUH, //chjig
SFX_3EB_UNKNOWN, //bstimeout
SFX_3EC_CCW_DOOR_OPENING, //ccw and GV opening
SFX_3ED,
SFX_3ED_BUBBLE_POP,
SFX_3EE,
SFX_3EF,
SFX_3F0_FLIBBIT_TALKING,
@@ -1481,7 +1485,7 @@ enum sfx_e
SFX_414_XMAS_GIFT_TALKING,
SFX_415_UNKNOWN, //xmas tree
SFX_416,
SFX_417_UNKNOWN, //lair/func_8038EB94, double health
SFX_417_DOUBLE_HEALTH_UPGRADE,
SFX_419_UNKNOWN = 0x419,
SFX_41A_UNKNOWN = 0x41a
@@ -1890,7 +1894,7 @@ enum actor_e
ACTOR_F0_PINK_EGG_SMALLEST,
ACTOR_F1_LEAF_BOAT,
ACTOR_F2_BLACK_SNIPPET,
ACTOR_F3_EXPLOSION_RIPPLE,
ACTOR_F4_BURIED_TREASURE = 0xF4,
ACTOR_F5_MUTIE_SNIPPET,
ACTOR_F6_BIG_ALLIGATOR,
@@ -1993,6 +1997,8 @@ enum actor_e
ACTOR_181_SCARF_SLED = 0x181,
ACTOR_182_RACE_SLED = 0x182,
ACTOR_188_PIRANHA_WATER_PARTICLES = 0x188,
ACTOR_198_BANJOS_BED = 0x198,
ACTOR_199_BANJOS_CHAIR,
ACTOR_19A_BANJOS_STOVE,
@@ -2276,7 +2282,7 @@ enum bundle_e {
BUNDLE_1D__HONEYCOMB,
BUNDLE_1E__JIGGY,
BUNDLE_1F_SM_EMPTY_HONEYCOMB,
BUNDLE_20__UNKOWN,
BUNDLE_20__UNKNOWN,
BUNDLE_21__ICECUBE_B,
BUNDLE_22__HONEYCOMB,
BUNDLE_23__HONEYCOMB,
@@ -2285,46 +2291,45 @@ enum bundle_e {
BUNDLE_26__HONEYCOMB
};
enum bs_e
{
BS_0_NONE = 0,
enum bs_e {
BS_0_NONE = 0x0,
BS_1_IDLE = 0x1,
BS_2_WALK_SLOW,
BS_2_WALK_SLOW = 0x2,
BS_WALK = 0x3,
BS_4_WALK_FAST = 0x4,
BS_5_JUMP,
BS_5_JUMP = 0x5,
BS_CLAW = 0x6,
BS_CROUCH = 0x7,
BS_8_BTROT_JUMP,
BS_9_EGG_HEAD,
BS_A_EGG_ASS,
BS_B_UNKOWN,
BS_8_BTROT_JUMP = 0x8,
BS_9_EGG_HEAD = 0x9,
BS_A_EGG_ASS = 0xA,
BS_B_UNKOWN = 0xB,
BS_SKID = 0xC,
BS_D_TIMEOUT,
BS_E_OW,
BS_F_BBUSTER,
BS_D_TIMEOUT = 0xD,
BS_E_OW = 0xE,
BS_F_BBUSTER = 0xF,
BS_BFLAP = 0x10,
BS_11_BPECK,
BS_12_BFLIP,
BS_11_BPECK = 0x11,
BS_12_BFLIP = 0x12,
BS_BBARGE = 0x13,
BS_14_BTROT_ENTER,
BS_15_BTROT_IDLE,
BS_16_BTROT_WALK,
BS_17_BTROT_EXIT ,
BS_18_FLY_KNOCKBACK,
BS_14_BTROT_ENTER = 0x14,
BS_15_BTROT_IDLE = 0x15,
BS_16_BTROT_WALK = 0x16,
BS_17_BTROT_EXIT = 0x17,
BS_18_FLY_KNOCKBACK = 0x18,
BS_1A_WONDERWING_ENTER = 0x1A,
BS_1B_WONDERWING_IDLE,
BS_1C_WONDERWING_WALK,
BS_1D_WONDERWING_JUMP,
BS_1E_WONDERWING_EXIT,
BS_1B_WONDERWING_IDLE = 0x1B,
BS_1C_WONDERWING_WALK = 0x1C,
BS_1D_WONDERWING_JUMP = 0x1D,
BS_1E_WONDERWING_EXIT = 0x1E,
BS_WALK_CREEP = 0x1F,
BS_20_LANDING = 0x20,
BS_BSHOCK_CHARGE = 0x21,
BS_BSHOCK_JUMP = 0x22,
BS_23_FLY_ENTER,
BS_24_FLY,
BS_25_LONGLEG_ENTER,
BS_23_FLY_ENTER = 0x23,
BS_24_FLY = 0x24,
BS_25_LONGLEG_ENTER = 0x25,
BS_26_LONGLEG_IDLE = 0x26,
BS_LONGLEG_WALK = 0x27,
BS_LONGLEG_JUMP = 0x28,
@@ -2338,48 +2343,49 @@ enum bs_e
BS_30_DIVE_ENTER = 0x30,
BS_ROLL = 0x31,
BS_SLIDE = 0x32,
//unk33,
BS_34_JIG_NOTEDOOR = 0x34,
BS_35_ANT_IDLE,
BS_35_ANT_IDLE = 0x35,
BS_ANT_WALK = 0x36,
BS_ANT_JUMP = 0x37,
BS_38_ANT_FALL,
BS_39_DIVE_A,
BS_3A_CARRY_IDLE,
BS_3B_CARRY_WALK,
BS_3C_TALK,
BS_3D_FALL_TUMBLING,
BS_3E_ANT_OW,
BS_3F,
BS_40_PUMPKIN_FLUSH,
BS_41_DIE,
BS_42_DINGPOT,
BS_43_ANT_DIE,
BS_44_JIG_JIGGY,
BS_45_BTROT_SLIDE,
//unk46
//unk47
BS_38_ANT_FALL = 0x38,
BS_39_DIVE_A = 0x39,
BS_3A_CARRY_IDLE = 0x3A,
BS_3B_CARRY_WALK = 0x3B,
BS_3C_TALK = 0x3C,
BS_3D_FALL_TUMBLING = 0x3D,
BS_3E_ANT_OW = 0x3E,
BS_3F = 0x3F,
BS_40_PUMPKIN_FLUSH = 0x40,
BS_41_DIE = 0x41,
BS_42_DINGPOT = 0x42,
BS_43_ANT_DIE = 0x43,
BS_44_JIG_JIGGY = 0x44,
BS_45_BTROT_SLIDE = 0x45,
BS_48_PUMPKIN_IDLE = 0x48,
BS_49_PUMPKIN_WALK = 0x49,
BS_4A_PUMPKIN_JUMP = 0x4A,
BS_4B_PUMPKIN_FALL = 0x4B,
BS_4C_LANDING_IN_WATER = 0x4c,
BS_4C_LANDING_IN_WATER = 0x4C,
BS_4D_PUMPKIN_OW = 0x4D,
BS_4E_PUMPKIN_DIE = 0x4E,
BS_4F_CLIMB_IDLE,
BS_50_CLIMB_MOVE,
BS_51_CLIMB_EXIT,
//unk52 //tumblar??? a.k.a bssurf
BS_4F_CLIMB_IDLE = 0x4F,
BS_50_CLIMB_MOVE = 0x50,
BS_51_CLIMB_EXIT = 0x51,
BS_52_UNKNOWN = 0x52, //tumblar??? a.k.a bssurf
BS_53_TIMEOUT = 0x53,
BS_54_SWIM_DIE = 0x54,
BS_LONGLEG_SLIDE = 0x55,
BS_56_RECOIL = 0x56,
BS_57_BOMB_END = 0x57,
BS_58_BEAKBOMB_CRASH,
BS_58_BEAKBOMB_CRASH = 0x58,
BS_59_BFLY_UNK59 = 0x59,
BS_5A_LOADZONE = 0x5A,
BS_CARRY_THROW = 0x5B,
BS_5E_CROC_IDLE = 0x5E,
BS_CROC_WALK = 0x5F,
BS_CROC_JUMP = 0x60,
@@ -2393,34 +2399,31 @@ enum bs_e
BS_WALRUS_WALK = 0x68,
BS_WALRUS_JUMP = 0x69,
BS_6A_WALRUS_FALL = 0x6A,
BS_6B_BEE_LOCKED,
//unk0x6B //[107] = "Locked", -- Bee, Mumbo Transform Cutscene
BS_6B_BEE_LOCKED = 0x6B, //[107] = "Locked", -- Bee, Mumbo Transform Cutscene
BS_WALRUS_OW = 0x6C,
BS_WALRUS_DIE = 0x6D,
BS_6E_CROC_BITE = 0x6E,
BS_CROC_EAT_BAD = 0x6F,
BS_70_CROC_EAT_GOOD = 0x70,
BS_71_BTROT_FALL = 0x71,
BS_SPLAT = 0x72, //get up after fall damage
BS_73_UNKNOWN = 0x73,
BS_74_UNKNOWN = 0x74,
BS_75_UNKNOWN = 0x75,
//0x73 locked_cutscene
//0x74 locked jiggypad, xform, bottles
//0x75 locked bottles
BS_SPLAT = 0x72, // Getting up after fall damage
BS_73_UNKNOWN = 0x73, // locked_cutscene
BS_74_UNKNOWN = 0x74, // locked jiggypad, xform, bottles
BS_75_UNKNOWN = 0x75, // locked bottles
BS_76_BFLY_LOCKED = 0x76,
BS_77_SWIM_LOCKED = 0x77, //0x77 locked swim
BS_78_DIVE_LOCKED = 0x78,//0x78 locked dive
BS_79_BTROT_LOCKED,
BS_WALK_MUD,
BS_BTROT_OW,
BS_7C_SLED,
BS_7D_WALRUS_SLED,
BS_7E_WALRUS_SLED,
BS_77_SWIM_LOCKED = 0x77,
BS_78_DIVE_LOCKED = 0x78,
BS_79_BTROT_LOCKED = 0x79,
BS_WALK_MUD = 0x7A,
BS_BTROT_OW = 0x7B,
BS_7C_SLED = 0x7C,
BS_7D_WALRUS_SLED = 0x7D,
BS_7E_WALRUS_SLED = 0x7E,
BS_7F_DIVE_OW = 0x7F,
BS_80_WALRUS_SLED_LOSE,
BS_80_WALRUS_SLED_LOSE = 0x80,
BS_81_WALRUS_SLED_LOCKED = 0x81,
BS_82_WALRUS_SLED_LOSE_IN_AIR,
BS_82_WALRUS_SLED_LOSE_IN_AIR = 0x82,
BS_85_BEE_IDLE = 0x85,
BS_BEE_WALK = 0x86,
@@ -2429,32 +2432,32 @@ enum bs_e
BS_BEE_OW = 0x89,
BS_BEE_DIE = 0x8A,
BS_BEE_FLY = 0x8c,
BS_BEE_FLY = 0x8C,
BS_8D_CROC_LOCKED = 0x8D,
BS_8E_ANT_LOCKED = 0x8E, //"Locked", -- Jiggy podium, Bottles' text outside Mumbo's
BS_8E_ANT_LOCKED = 0x8E, // "Locked", -- Jiggy podium, Bottles' text outside Mumbo's
BS_8F_PUMPKIN_LOCKED = 0x8F,
BS_FLY_OW = 0x91,
BS_92_ANT_DRONE,
BS_93_PUMPKIN_DRONE,
BS_94_CROC_DRONE,
BS_95_WALRUS_DRONE,
BS_96_SWIM_LOCKED,
BS_97_DIVE_LOCKED,
BS_98_WALK_DRONE,
BS_99_BFLY_DRONE,
BS_9A_BTROT_DRONE,
BS_92_ANT_DRONE = 0x92,
BS_93_PUMPKIN_DRONE = 0x93,
BS_94_CROC_DRONE = 0x94,
BS_95_WALRUS_DRONE = 0x95,
BS_96_SWIM_LOCKED = 0x96,
BS_97_DIVE_LOCKED = 0x97,
BS_98_WALK_DRONE = 0x98,
BS_99_BFLY_DRONE = 0x99,
BS_9A_BTROT_DRONE = 0x9A,
BS_9B_LONGLEG_DRONE = 0x9B,
BS_9C_WALRUS_SLED_DRONE = 0x9C,
BS_9D_BEE_DRONE = 0x9D,
BS_9E_CLIMB_LOCKED,
BS_9E_CLIMB_LOCKED = 0x9E,
BS_ANT_BOUNCE = 0x9F,
BS_PUMPKIN_BOUNCE = 0xA0,
BS_CROC_BOUNCE = 0xA1,
BS_WALRUS_BOUNCE = 0xA2,
BS_BEE_BOUNCE = 0xA3,
BS_A4_WONDERWING_DRONE = 0xA4,
BS_A5_WONDERWING_UNKA5
BS_A5_WONDERWING_UNKA5 = 0xA5
};
enum sm_specific_flags {
@@ -2467,7 +2470,7 @@ enum sm_specific_flags {
SM_SPECIFIC_FLAG_7 = 0x7, // cauliflower dead?
SM_SPECIFIC_FLAG_8_ABILITY_HOLD_A_JUMP_HIGHER_UNLOCKED,
SM_SPECIFIC_FLAG_9_ABILITY_FEATHERY_UNLOCKED,
SM_SPECIFIC_FLAG_A,
SM_SPECIFIC_FLAG_A_ABILITY_FLIP_UNLOCKED,
SM_SPECIFIC_FLAG_C = 0xC, // learned all attack moves
@@ -2483,7 +2486,7 @@ enum mm_specific_flags {
MM_SPECIFIC_FLAG_3_CHIMPY_HAS_LEAVED,
MM_SPECIFIC_FLAG_4_SHAKE,
MM_SPECIFIC_FLAG_6_UNKNOWN = 0x6,
MM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS = 0x6,
MM_SPECIFIC_FLAG_8_HIT_WITH_ORANGE = 0x8,
MM_SPECIFIC_FLAG_9_JUJU_HAS_HALF_TURNED,
@@ -2501,6 +2504,21 @@ enum ttc_specific_flags {
TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN = 0x7
};
enum bgs_specific_flags {
BGS_SPECIFIC_FLAG_1 = 1,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_RESET = 2,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_TIMER_RUNNING = 3,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY = 4,
BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_SWITCH_PRESSED = 5,
BGS_SPECIFIC_FLAG_7 = 7,
BGS_SPECIFIC_FLAG_8 = 8,
BGS_SPECIFIC_FLAG_MAZE_JIGGY_SWITCH_PRESSED = 9,
BGS_SPECIFIC_FLAG_A = 0xA,
BGS_SPECIFIC_FLAG_MAZE_JIGGY_RESET = 0xB,
BGS_SPECIFIC_FLAG_MAZE_JIGGY_TIMER_RUNNING = 0xC,
BGS_SPECIFIC_FLAG_MAZE_JIGGY = 0xD
};
enum mmm_specific_flags {
MMM_SPECIFIC_FLAG_0_UNKNOWN,
MMM_SPECIFIC_FLAG_TUMBLAR_BROKEN,
@@ -2508,7 +2526,7 @@ enum mmm_specific_flags {
MMM_SPECIFIC_FLAG_3_UNKNOWN,
MMM_SPECIFIC_FLAG_4_UNKNOWN,
MMM_SPECIFIC_FLAG_5_UNKNOWN,
MMM_SPECIFIC_FLAG_6_UNKNOWN,
MMM_SPECIFIC_FLAG_CONGA_WARNED_BLOCKS,
MMM_SPECIFIC_FLAG_7_UNKNOWN
};
@@ -4203,6 +4221,8 @@ enum asset_e
ASSET_89D_ZOOMBOX_SPRITE = 0x89D,
ASSET_89F_MODEL_ORANGE_PARTICLE = 0x89F,
ASSET_8A0_SPRITE_WATER_DROP = 0x8A0,
ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET = 0xA0B,
@@ -4222,7 +4242,7 @@ enum asset_e
ASSET_A1F_DIALOG_SHOCKJUMP_LEARN = VER_SELECT(0xa1f, 0x91f, 0, 0),
ASSET_A20_DIALOG_FLY_LEARN,
ASSET_A21_DIALOG_BLUBBER_MEET,
ASSET_A21_DIALOG_BLUBBER_TREASURE_MEET,
ASSET_A22_DIALOG_FLY_REFRESHER,
ASSET_A23_DIALOG_SHOCKJUMP_REFRESHER,
ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED,
@@ -4257,6 +4277,8 @@ enum asset_e
ASSET_A84_DIALOG_TURBOTRAINERS_LEARN,
ASSET_A85_DIALOG_TURBOTRAINERS_REFRESHER,
ASSET_A88_DIALOG_GRUNTY_GV_MISS_TRAPDOOR = 0xA88,
ASSET_AD3_DIALOG_UNKNOWN = 0xad3,
ASSET_AD4_DIALOG_UNKNOWN,
ASSET_AD5_DIALOG_UNKNOWN,
@@ -4269,6 +4291,8 @@ enum asset_e
ASSET_ADE_DIALOG_LOGGO_AS_BEAR,
ASSET_ADF_DIALOG_ENTER_LOGGO,
ASSET_AE0_DIALOG_EXIT_LOGGO,
ASSET_AE1_DIALOG_GRUNTY_MMM_THORNS,
ASSET_AE2_DIALOG_GRUNTY_MMM_MISS_CHRUCH_DOOR,
ASSET_B37_DIALOG_CONGA_SAFE_UP_HERE = 0xb37,
ASSET_B38_DIALOG_CONGA_DEFEAT,
@@ -4276,7 +4300,7 @@ enum asset_e
ASSET_B3A_DIALOG_CONGA_HITS_PLAYER,
ASSET_B3B_DIALOG_CONGA_ORANGE_PAD_JIGGY,
ASSET_B3C_DIALOG_CONGA_MEET,
ASSET_B3D_DIALOG_CONGA_DONT_TOUCH_BLOCKS,
ASSET_B3E_DIALOG_CONGA_MEET_AS_TERMITE = VER_SELECT(0xb3e, 0x95c, 0, 0),
ASSET_B3F_DIALOG_CHIMPY_MEET,
ASSET_B40_DIALOG_CHIMPY_COMPLETE,
@@ -4285,20 +4309,25 @@ enum asset_e
ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR,
ASSET_B44_DIALOG_JUJU_MEET,
ASSET_B45_DIALOG_JIGGY_COLLECT_10,
ASSET_B47_DIALOG_EGGS_LEARN = 0xb47,
ASSET_B46_DIALOG_COLLECT_ORANGE,
ASSET_B47_DIALOG_EGGS_LEARN = 0xB47,
ASSET_B48_DIALOG_BEAKBUSTER_LEARN,
ASSET_B49_DIALOG_TALON_TROT_LEARN,
ASSET_B4A_DIALOG_TALON_TROT_REFRESHER,
ASSET_B4B_DIALOG_EGGS_REFRESHER,
ASSET_B4C_DIALOG_BEAKBUSTER_REFRESHER,
ASSET_B4D_DIALOG_UNKNOWN,
ASSET_B4D_DIALOG_BOTTLES_SLIPPERY,
ASSET_B4E_DIALOG_BOTTLES_ALL_MM_MOVES_LEARNED = 0xB4E,
ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL = 0xb51,
ASSET_B50_DIALOG_BOTTLES_UNUSED_UNKNOWN_ITEM_COLLECT = 0xB50,
ASSET_B51_DIALOG_BOTTLES_HOW_TO_EXIT_LEVEL = 0xB51,
ASSET_B9F_DIALOG_UNKNOWN = 0xb9f,
ASSET_BA0_DIALOG_GRUNTY_RBB_RED_HOT_OVENS = 0xBA0,
ASSET_BA1_DIALOG_GRUNTY_RBB_WATER_SWIM = 0xBA1,
ASSET_BA2_DIALOG_GRUNTY_RBB_WATER_DIVE = 0xBA2,
ASSET_BA3_DIALOG_GRUNTY_RBB_OILY_SCUM_UNUSED = 0xBA3,
ASSET_BFF_DIALOG_UNKNOWN = 0xbff,
@@ -4311,6 +4340,8 @@ enum asset_e
ASSET_C09_DIALOG_UNKNOWN,
ASSET_C0A_DIALOG_UNKNOWN,
ASSET_C11_DIALOG_FREEZING_WATER = 0xC11,
ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST = 0xc15,
ASSET_C17_DIALOG_UNKNOWN = 0xC17,
@@ -4318,8 +4349,8 @@ enum asset_e
ASSET_C19_DIALOG_UNKNOWN,
ASSET_C1A_DIALOG_UNKNOWN,
ASSET_C1E_DIALOG_UNKNOWN = 0xc1e,
ASSET_C1F_DIALOG_UNKNOWN,
ASSET_C1E_DIALOG_BOGGY_LOOK_FOR_PRESENTS = 0xc1e,
ASSET_C1F_DIALOG_BOGGY_NEEDS_SLEEP,
ASSET_C20_DIALOG_PRESENT_COLLECTIBLE_MEET_BLUE = 0xC20,
ASSET_C21_DIALOG_PRESENT_COLLECTIBLE_MEET_GREEN,
@@ -4358,11 +4389,14 @@ enum asset_e
text_flibbits_defeat = 0xc82,
text_flibbits_return = 0xc83,
ASSET_C85_DIALOG_PIRANHA_WATER = 0xC85,
ASSET_C86_DIALOG_UNKNOWN = 0xc86,
ASSET_C88_DIALOG_LONGLEG_LEARN = 0xC88,
ASSET_C89_DIALOG_LONGLEG_REFRESHER,
ASSET_C8A_DIALOG_BOTTLES_ALL_BGS_MOVES_LEARNED,
ASSET_C8B_DIALOG_GRUNTY_BGS_MISS_WALKWAY_JIGGY,
ASSET_C8C_DIALOG_GRUNTY_BGS_MISS_MAZE_JIGGY,
ASSET_C8D_DIALOG_MR_VILE_EXTRA_CHALLENGE_INTRO = 0xC8D,
ASSET_C8E_DIALOG_MR_VILE_WINS_EXTRA_CHALLENGE_1,
@@ -4379,6 +4413,10 @@ enum asset_e
ASSET_CC7_DIALOG_UNKNOWN = 0xcc7,
ASSET_CE6_DIALOG_GRUNTY_MMM_BRAMBLES = 0xCE6,
ASSET_CE7_DIALOG_GRUNTY_CCW_ICY_WATER_SWIM = 0xCE7,
ASSET_CE8_DIALOG_GRUNTY_CCW_ICY_WATER_UNUSED = 0xCE8,
ASSET_D2B_DIALOG_UNKNOWN = 0xd2b,
ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32,
@@ -4387,7 +4425,7 @@ enum asset_e
ASSET_D35_DIALOG_WONDERWING_LEARN,
ASSET_D36_DIALOG_WONDERWING_REFRESHER,
ASSET_D37_DIALOG_BOTTLES_ALL_CC_MOVES_LEARNED,
ASSET_D38_DIALOG_BOTTLES_ALL_MOVES_LEARNED,
ASSET_D38_DIALOG_EMPTY,
ASSET_D39_DIALOG_BOTTLES_REFILL_HEALTH,
ASSET_D8F_DIALOG_MUMBO_MEET = 0xD8F,
@@ -4403,6 +4441,14 @@ enum asset_e
ASSET_D99_DIALOG_JINJO_MEET_GREEN,
ASSET_D9A_DIALOG_JINJO_MEET_PINK,
ASSET_D9B_DIALOG_JINJO_MEET_ORANGE,
ASSET_D9C_DIALOG_MUSIC_NOTE_MEET,
ASSET_D9D_DIALOG_MUMBO_TOKEN_MEET,
ASSET_D9E_DIALOG_BLUE_EGG_MEET,
ASSET_D9F_DIALOG_RED_FEATHER_MEET,
ASSET_DA0_DIALOG_GOLD_FEATHER_MEET,
ASSET_DA1_DIALOG_HONEYCOMB_MEET,
ASSET_DA2_DIALOG_EMPTY_HONEYCOMB_MEET,
ASSET_DA3_DIALOG_EXTRA_LIFE_MEET,
ASSET_DA5_DIALOG_WADINGBOOTS_MEET = 0xDA5,
ASSET_DA6_DIALOG_BEEHIVE_WITH_BEES,
@@ -4421,6 +4467,7 @@ enum asset_e
ASSET_DB3_DIALOG_SNS_EGG_1_TEXT = VER_SELECT(0xdb3, 0xa31, 0, 0),
ASSET_DB4_DIALOG_SNS_EGG_2_TEXT,
ASSET_DB5_DIALOG_ICE_KEY_TEXT,
ASSET_DB6_DIALOG_MUMBO_WISHYWASHY,
ASSET_DF3_DIALOG_BOTTLES_INTRODUCTION = 0xDF3,
ASSET_DF4_DIALOG_BOTTLES_CAMERA_CONTROL_LEARN,
@@ -4431,16 +4478,16 @@ enum asset_e
ASSET_DF9_DIALOG_BOTTLES_UNKNOWN,
ASSET_DFA_DIALOG_BOTTLES_JUMP_REFRESHER,
ASSET_DFB_DIALOG_BOTTLES_DIVE_LEARN,
ASSET_DFC_DIALOG_UNKNOWN,
ASSET_DFC_BOTTLES_UNDERWATER_TUTORIAL,
ASSET_DFD_DIALOG_BOTTLES_SWIM_LEARN,
ASSET_DFE_DIALOG_BOTTLES_DIVE_REFRESHER,
ASSET_DFF_DIALOG_BOTTLES_CLAW_SWIPE_LEARN,
ASSET_E00_DIALOG_BOTTLES_ATTACK_REFRESHER = 0xE00,
ASSET_E01_DIALOG_BOTTLES_CLIMB_LEARN,
ASSET_E02_DIALOG_UNKNOWN,
ASSET_E02_DIALOG_BOTTLES_CLIMB_OTHER,
ASSET_E03_DIALOG_BOTTLES_CLIMB_REFRESHER,
ASSET_E04_DIALOG_BOTTLES_BEAK_BARGE_LEARN,
ASSET_E05_DIALOG_UNKNOWN,
ASSET_E05_DIALOG_BOTTLES_KAZOOIE_BARGE,
ASSET_E06_DIALOG_BOTTLES_BEAK_BARGE_REFRESHER,
ASSET_E07_DIALOG_BOTTLES_UNKNOWN,
ASSET_E08_DIALOG_BOTTLES_FIND_ANOTHER_MOLEHILL,
@@ -4473,11 +4520,14 @@ enum asset_e
ASSET_E24_DIALOG_UNKNOWN = 0xE24,
ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0),
ASSET_E36_DIALOG_BOTTLES_NO_BONUS = 0xE36,
ASSET_E37_DIALOG_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
ASSET_E38_DIALOG_CHEATING_ERASE_SAVE_CONFIRMATION,
ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
ASSET_F58_DIALOG_FIRST_PICTURE_INSTRUCTION = 0xF58,
ASSET_F59_DIALOG_FIRST_PICTURE_FIRST_PIECE_ALREADY_OBTAINED = 0xF59,
ASSET_F5A_DIALOG_FIRST_PICTURE_FIRST_PIECE_OBTAINED_AFTER = 0xF5A,
ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL = 0xF5b,
ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV,
@@ -4491,16 +4541,48 @@ enum asset_e
ASSET_F79_DIALOG_UNKNOWN = 0xf79,
ASSET_F7A_DIALOG_UNKNOWN,
ASSET_F7B_DIALOG_BOTTLES_JIGSAW_PICTURE_MEET,
ASSET_FAD_DIALOG_UNKNOWN = 0xfad,
ASSET_FA8_EGG_CHEAT_ACTIVATION = 0xFA8,
ASSET_FA9_RED_FEATHER_CHEAT_ACTIVATION,
ASSET_FAA_GOLD_FEATHER_CHEAT_ACTIVATION,
ASSET_F7C_DIALOG_BOTTLES_REMOVE_PIECE_INSTRUCTIONS = 0xF7C,
ASSET_F7D_DIALOG_BOTTLES_EXPLAINS_PLACE_ALL = 0xF7D,
ASSET_FAB_DIALOG_GRUNTY_DOOR_NEED_JIGGIES = 0xFAB,
ASSET_FAD_DIALOG_DINGPOT_MEET = 0xFAD,
ASSET_FBC_DIALOG_BOTTLES_OUT_OF_JIGGIES = 0xFBC,
ASSET_FBD_DIALOG_GRUNTY_NOT_ENOUGH_NOTES = 0xFBD,
ASSET_FBE_DIALOG_CHEATING_ERASE_SAVE_WARNING = 0xFBE,
ASSET_FBF_DIALOG_ERASED_SAVE,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_DIALOG_UNKNOWN,
ASSET_FC0_DIALOG_GRUNTY_DOOR_HAVE_JIGGIES = 0xFC0,
ASSET_10E7_DIALOG_UNKNOWN = 0x10E7,
ASSET_1032_DIALOG_FF_FIRST_ANSWER_CORRECT = 0x1032,
ASSET_1033_DIALOG_FF_NEXT_ANSWER_CORRECT,
ASSET_1034_DIALOG_FF_GRUNTY_ANSWER_CORRECT,
ASSET_1035_DIALOG_FF_FIRST_ANSWER_WRONG,
ASSET_1036_DIALOG_FF_NEXT_ANSWER_WRONG,
ASSET_1037_DIALOG_FF_CHOICE_IS_YOURS_UNUSED,
ASSET_1038_DIALOG_FF_GET_HONEYCOMB,
ASSET_1039_DIALOG_FF_GET_EXTRA_LIFE,
ASSET_103A_DIALOG_FF_GET_JOKER,
ASSET_103B_DIALOG_FF_USE_JOKER,
ASSET_103C_DIALOG_FF_LOW_HEALTH,
ASSET_103D_DIALOG_FF_LOW_HEALTH_ON_SKULL,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_DIALOG_BRENTILDA_HEAL,
ASSET_10E7_DIALOG_FINALBOSS_ENTERING_1 = 0x10E7,
ASSET_10E8_DIALOG_FINALBOSS_ENTERING_2 = 0x10E8,
ASSET_10E9_DIALOG_FINALBOSS_ENTERING_3 = 0x10E9,
ASSET_10EA_DIALOG_FINALBOSS_ENTERING_4 = 0x10E9,
ASSET_10EB_DIALOG_FINALBOSS_ENTERING_5 = 0x10E9,
ASSET_10EC_DIALOG_FINALBOSS_ENTERING_6 = 0x10EC,
ASSET_10ED_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_1 = 0x10ED,
ASSET_10EE_DIALOG_FINALBOSS_PHASE_1_HIT_PLAYER_OPTION_2,
@@ -5320,11 +5402,6 @@ enum ff_question_type_e{
FFQT_4_MINIGAME
};
enum common_particle_e{
COMMON_PARTICLE_1_EGG_HEAD = 1,
COMMON_PARTICLE_4_EGG_ASS = 4
};
enum bsgroup_e {
BSGROUP_0_NONE,
BSGROUP_1_INTR,
@@ -5400,4 +5477,13 @@ enum vegetable_e {
VEGETABLE_3_COLLY_WOBBLE
};
enum static_camera_id_e {
STATIC_CAMERA_D_WALKWAY_JIGGY_DESTROY = 0xD,
STATIC_CAMERA_1E_MAZE_JIGGY_DESTROY = 0x1E
};
enum ba_timer_id {
BA_TIMER_HAZARDS = 4
};
#endif

30
include/functions.h
View File

@@ -31,7 +31,7 @@ extern f32 fabsf(f32);
_SHIFTL((vol*1023), 21, 11) + _SHIFTL(sample_rate >> 5, 11, 10) + _SHIFTL(sfx_e, 0, 11)\
)
#define FUNC_8030E8B4(sfx_e, vol, sample_rate, position, e, f) func_8030E8B4(\
#define sfx_playFadeShorthandDefault(sfx_e, vol, sample_rate, position, e, f) sfx_playFadeShorthand(\
_SHIFTL((vol*1023), 21, 11) + _SHIFTL(sample_rate >> 5, 11, 10) + _SHIFTL(sfx_e, 0, 11), \
position, \
_SHIFTL(e, 0, 16) + _SHIFTL(f, 16, 16)\
@@ -90,7 +90,7 @@ s32 bs_getState(void);
s32 bs_getNextState(void);
void bs_updateState(void);
s32 bs_checkInterrupt(enum bs_interrupt_e arg0);
void func_8029A86C(s32 arg0);
void bs_setInterruptResponse(s32 arg0);
enum bs_interrupt_e bs_getInterruptType(void);
/* vla - variable length array*/
@@ -216,7 +216,7 @@ OSMesgQueue *pfsManager_getFrameReplyQ(void);
void baMotor_80250D94(f32, f32, f32);
void func_8025A6EC(enum comusic_e, s32);
void coMusicPlayer_playMusic(enum comusic_e, s32);
void comusic_playTrack(enum comusic_e);
void comusic_8025AB44(enum comusic_e comusic_id, s32 arg1, s32 arg2);
@@ -251,13 +251,13 @@ void baeyes_openSingleEye(s32, f32);
void bafalldamage_start(void);
void func_80293D48(f32, f32);
f32 func_80294438(void);
f32 func_80294500(void);
f32 floor_getCurrentFloorYPosition(void);
BKCollisionTri *func_802946F0(void);
void func_80294980(f32 arg0[3]);
f32 get_slope_timer(void);
f32 get_turbo_duration(void);
void func_80295C08(void (* arg0)(void));
void func_80297CCC(f32);
void bsiFrame_startWithValue(f32);
f32 pitch_getIdeal(void);
void pitch_setAngVel(f32, f32);
void func_80298528(f32);
@@ -314,7 +314,7 @@ void func_802D6264(f32, enum map_e, s32, s32, s32, enum file_progress_e);
Actor *func_802DC7E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void particleEmitter_emitN(ParticleEmitter *, int);
void func_802EFA20(ParticleEmitter *, f32, f32);
void particleEmitter_func_802EFA20(ParticleEmitter *, f32, f32);
ParticleEmitter *partEmitMgr_defragEmitter(ParticleEmitter *);
ParticleEmitter *func_802F4094(f32[3], f32);
@@ -330,28 +330,28 @@ BKModelBin *func_8030A428(s32);
u8 sfxsource_createSfxsourceAndReturnIndex(void);
void sfxsource_setSfxId(u8 indx, enum sfx_e uid);
void sfxsource_playSfxAtVolume(u8, f32);
void func_8030DD14(u8, int);
void sfxSource_setunk43_7ByIndex(u8, int);
void sfxsource_set_position(u8, f32[3]);
void func_8030DFF0(u8, s32);
void func_8030E04C(u8, f32, f32, f32);
void func_8030E0FC(u8, f32, f32, f32);
f32 func_8030E200(u8);
void func_8030E2C4(u8);
void func_8030E394(u8 indx);
void sfxSource_func_8030E2C4(u8);
void sfxSource_triggerCallbackByIndex(u8 indx);
void sfxsource_playHighPriority(enum sfx_e uid);
void func_8030E4E4(enum sfx_e uid);
void sfxsource_play(enum sfx_e uid, s32 sample_rate);
void func_8030E540(enum sfx_e uid);
void gcsfx_playAtSampleRate(enum sfx_e uid, s32 sample_rate);
void gcsfx_play(enum sfx_e uid);
void func_8030E560(enum sfx_e uid, s32 arg1);
void func_8030E58C(enum sfx_e uid, f32 arg1);
void func_8030E5F4(enum sfx_e uid, f32 arg1);
void func_8030E624(u32);
void func_8030E6A4(enum sfx_e uid, f32 arg1, s32 arg2);
void gcsfx_playWithPitch(enum sfx_e uid, f32 pitch, s32 arg2);
void func_8030E6D4(enum sfx_e uid);
void func_8030E704(enum sfx_e uid);
void func_8030E760(enum sfx_e uid, f32 arg1, s32 arg2);
void func_8030E878(enum sfx_e uid, f32 arg1, u32 arg2, f32 arg3[3], f32 arg4, f32 arg5);
void func_8030E8B4(u32,f32 [3], u32);
void sfx_playFadeShorthand(u32,f32 [3], u32);
void func_8030E988(enum sfx_e uid, f32 arg1, u32 arg2, f32 arg3[3], f32 arg4, f32 arg5);
void func_8030E9C4(enum sfx_e uid, f32 arg1, u32 arg2, f32 arg3[3], f32 arg4, f32 arg5);
void func_8030EAAC(enum sfx_e uid, f32 arg1, s32 arg2, s32 arg3);
@@ -450,7 +450,7 @@ void sfxsource_set_fade_distances(u8, f32, f32);
void func_8030DB04(u8, s32, f32 position[3], f32, f32);
void func_802E4078(enum map_e map, s32 exit, s32 transition);
void transitionToMap(enum map_e map, s32 exit, s32 transition);
void levelSpecificFlags_set(s32, s32);
void func_803228D8(void);
@@ -479,7 +479,7 @@ void __spawnQueue_add_1(GenFunction_1, s32);
void func_802FAD64(enum item_e);
void nodeprop_getPosition(NodeProp *, f32[3]);
bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32));
bool gcdialog_showDialog(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32));
void ability_unlock(enum ability_e);
extern void func_802EE278(Actor *, s32, s32, s32, f32, f32);

9
include/music.h
View File

@@ -11,7 +11,7 @@ typedef struct struct_B_s{
f32 unk10;
} structBs;
typedef struct music_track_s{
typedef struct music_track_s {
s16 unk0;
u8 unk2;
u8 unk3;
@@ -25,10 +25,9 @@ typedef struct music_track_s{
u8 unk192[0xE];
} MusicTrack;
typedef struct music_track_meta_s{
typedef struct music_track_meta_s {
char *name;
u16 unk4;
// u8 pad6[2];
}MusicTrackMeta;
u16 volume;
} MusicTrackMeta;
#endif

11
include/prop.h
View File

@@ -87,7 +87,7 @@ typedef struct actorMarker_s{
MarkerCollisionFunc dieFunc;
s32 unk20;
ActorUpdateFunc actorUpdateFunc;
s32 unk28;
s32 commonParticleIndex;
u32 actrArrayIdx:11; //unk2C
u32 pitch:9;
u32 roll:9;
@@ -99,7 +99,7 @@ typedef struct actorMarker_s{
s16 unk38[3];
u16 pad3E_15:1;
u16 modelId:13;
u16 unk3E_1:1;
u16 isBanjoOnTop: TRUE;
u16 unk3E_0:1; //scaled
u32 unk40_31:4;
u32 unk40_27:4;
@@ -200,7 +200,7 @@ typedef struct actor_s{
f32 unk74;
u32 unk78_31:9;
u32 unk78_22:9;
u32 unk78_13:12; //default_spawn_yaw?
u32 secondaryId:12; //default_spawn_yaw? This seems to be a different ID to differentiate actors that are the same- IE orange switches or tolls
u32 stored_anctrl_forwards:1; //animCtrlDirection
u32 stored_anctrl_smoothTransistion:1; //animCtrlSmoothTransition
union
@@ -230,12 +230,13 @@ typedef struct actor_s{
u32 unkF4_22:1;
u32 initialized:1; //unkF4_21;
u32 unkF4_20:12;
u32 unkF4_8:9; /* jinjo id in final fight.
u32 actorTypeSpecificField:9; /* jinjo id in final fight.
* Is used to determine file progress related stuff, can also be a file_progress_e
* Also related to jigsaw pictures, as an id for each
*/
f32 stored_anctrl_subrangeMin; //animCtrl_SubRangeStart
f32 stored_anctrl_subrangeMax; //animCtrl_SubRangeEnd
ActorMarker *unk100; // child actor marker ?
ActorMarker *partnerActor; // child actor marker ? Calling this "partner" since it seems to relate to actors that are "paired" and not necessarily parent/child
ActorMarker *unk104;
Struct62s *unk108;
// void ( *unk108)(struct actorMarker_s *, s32); //saved from marker->collisionFunc

6
include/structs.h
View File

@@ -252,7 +252,7 @@ typedef struct struct_8_s{
typedef struct struct_11_s{
f32 unk0;
f32 unk4;
s32 unk8;
s32 volume;
s32 unkC;
s16 track_id; //trackId
s16 unk12;
@@ -268,10 +268,10 @@ typedef struct struct_12_s{
s32 unk1;
} struct12s;
typedef struct struct_13_s{
typedef struct dialog_s {
s32 cmd;
u8* str;
}struct13s;
} BKDialog;
typedef struct struct_14_s{
s16 unk0;

34
manual_syms.pal.txt
View File

@@ -65,11 +65,11 @@ func_80293F0C = 0x80293d2c;
func_80294438 = 0x80294258;
func_80294480 = 0x802942a0;
func_80294500 = 0x80294320;
floor_getCurrentFloorYPosition = 0x80294320;
func_8029453C = 0x8029435c;
func_80294548 = 0x80294368;
func_80294554 = 0x80294374;
func_80294574 = 0x80294394;
floor_isCurrentFloorunk59 = 0x80294394;
func_80294610 = 0x80294430;
func_802946F0 = 0x80294510;
bacarry_reset_marker = 0x80294700;
@@ -104,7 +104,7 @@ baphysics_set_target_horizontal_velocity = 0x802977b0;
baphysics_get_velocity = 0x802978c8;
baphysics_get_vertical_velocity = 0x802978ec;
baphysics_set_goto_position = 0x80297a04;
func_80297C6C = 0x80297aac;
bsiFrame_getState = 0x80297aac;
pitch_setIdeal = 0x80297d7c;
pitch_applyIdeal = 0x80297dc4;
pitch_get = 0x80297dd8;
@@ -145,7 +145,7 @@ func_8029C0D0 = 0x8029bf10;
func_8029C834 = 0x8029c674;
func_8029CDA0 = 0x8029cbe0;
func_8029CF20 = 0x8029cd60;
func_8029D66C = 0x8029d4ac;
isPlayerInHazard = 0x8029d4ac;
bsant_inSet = 0x8029e3d8;
bsbbarge_hitboxActive = 0x8029f484;
bsbbuster_hitboxActive = 0x8029fa98;
@@ -168,7 +168,7 @@ bsswim_inset = 0x802b5594;
bstwirl_hitboxActive = 0x802b68b0;
func_802B6F9C = 0x802b6e0c;
bswalrus_inSledSet = 0x802b8000;
func_802BAFE4 = 0x802bae54;
gcStaticCamera_activate = 0x802bae54;
func_802BB360 = 0x802bb1d0;
func_802BB378 = 0x802bb1e8;
func_802BB3AC = 0x802bb21c;
@@ -182,7 +182,7 @@ spawnQueue_func_802C3A18 = 0x802C3898;
spawnQueue_flush = 0x802c38b8;
__spawnQueue_add_4 = 0x802c3d84;
spawnQueue_actor_s16 = 0x802c400c;
func_802C5A30 = 0x802c5b20;
gameSelect_getGameNumber = 0x802c5b20;
chjiggy_getJiggyId = 0x802c8248;
func_802C9C14 = 0x802c9dd4;
func_802CA1C4 = 0x802ca384;
@@ -214,7 +214,7 @@ func_802E3580 = 0x802E3770;
dummy_func_802E35D0 = 0x802E37C0;
func_802E35D8 = 0x802E37c8;
game_draw = 0x802E417c;
func_802E4078 = 0x802e4268;
transitionToMap = 0x802e4268;
func_802E4170 = 0x802E4360;
func_802E4214 = 0x802E4404;
func_802E4384 = 0x802e4574;
@@ -246,8 +246,8 @@ freelist_new = 0x802ede64;
freelist_freeElement = 0x802edebc;
freelist_defrag = 0x802edee0;
func_802EE354 = 0x802ee534;
func_802EE6CC = 0x802ee8ac;
func_802F1294 = 0x802f1474;
dustEmitter_emit = 0x802ee8ac;
pem_freeEmitters = 0x802f1474;
fxSparkle_emptyHoneycomb = 0x802f38bc;
fxSparkle_honeycomb = 0x802f391c;
fxSparkle_musicNote = 0x802f397c;
@@ -282,18 +282,18 @@ sfxsource_freeSfxsourceByIndex = 0x8030dbe4;
sfxsource_setSfxId = 0x8030dc20;
sfxsource_setSampleRate = 0x8030dc5c;
sfxsource_playSfxAtVolume = 0x8030dd54;
func_8030E2C4 = 0x8030e464;
sfxSource_func_8030E2C4 = 0x8030e464;
sfxsource_playHighPriority = 0x8030e624;
func_8030E58C = 0x8030e72c;
func_8030E624 = 0x8030e7c4;
func_8030E6A4 = 0x8030e844;
gcsfx_playWithPitch = 0x8030e844;
func_8030E6D4 = 0x8030e874;
func_8030ED70 = 0x8030ef10;
func_8030E394 = 0x8030e534;
sfxSource_triggerCallbackByIndex = 0x8030e534;
func_803012F8 = 0x803014d8;
fxairscore_count_to_time = 0x80301f5c;
gcdialog_showText = 0x803116cc;
func_803114B0 = 0x803116fc;
gcdialog_showDialog = 0x803116cc;
gcdialog_hasCurrentTextId = 0x803116fc;
gcpausemenu_80314AC8 = 0x80314e1c;
func_8031B908 = 0x8031bce8;
@@ -395,9 +395,9 @@ func_8034B9BC = 0x8034be20;
func_8034BB48 = 0x8034bfac;
func_8034C630 = 0x8034ca90;
func_8034E698 = 0x8034eaf8;
func_8035644C = 0x803568ac;
func_8035646C = 0x803568cc;
volatileFlag_setAndTriggerDialog_4 = 0x803569a0;
progressDialog_showDialogMaskZero = 0x803568ac;
progressDialog_showDialogMaskFour = 0x803568cc;
progressDialog_setAndTriggerDialog_4 = 0x803569a0;
core2_TEXT_END = 0x80363a00;

18
src/BGS/ch/code_2270.c
View File

@@ -65,11 +65,11 @@ void chTiptup_activateTimer(ActorMarker *this){
}
void chTiptup_sfxCorrectHit(void){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
void chTiptup_sfxIncorrectHit(void){
func_8025A6EC(COMUSIC_2C_BUZZER, 28000);
coMusicPlayer_playMusic(COMUSIC_2C_BUZZER, 28000);
}
void chTiptup_textEvent(ActorMarker *this, enum asset_e text_id, s32 arg2){
@@ -147,14 +147,14 @@ void chTiptup_setState(Actor *this, s32 arg1){
this->has_met_before = TRUE;
if (unqPtr->unkA == 0) {
gcdialog_showText(ASSET_C72_DIALOG_UNKNOWN, 0xe, this->position, this->marker, chTiptup_textEvent, 0);
gcdialog_showDialog(ASSET_C72_DIALOG_UNKNOWN, 0xe, this->position, this->marker, chTiptup_textEvent, 0);
}
else {
gcdialog_showText(ASSET_C74_DIALOG_UNKNOWN, 0xf, this->position, this->marker, chTiptup_textEvent, 0);
gcdialog_showDialog(ASSET_C74_DIALOG_UNKNOWN, 0xf, this->position, this->marker, chTiptup_textEvent, 0);
}
}
else {
gcdialog_showText(D_80390854[unqPtr->unkA], 0xf, this->position, this->marker, chTiptup_textEvent, 0);
gcdialog_showDialog(D_80390854[unqPtr->unkA], 0xf, this->position, this->marker, chTiptup_textEvent, 0);
}
}
if(this->state == 3){
@@ -206,7 +206,7 @@ void chTiptup_setState(Actor *this, s32 arg1){
}//L80388D8C
if(this->state == 6){
if(unqPtr->unkA == 3){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
func_80324E38(0.5f, 3);
timed_setStaticCameraToNode(1.5f, 1);
@@ -235,7 +235,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){
thisActor = marker_getActor(this);
unqPtr = (ActorLocal_Tiptup *)&thisActor->local;
if((s32)unqPtr->unk0 >= (s32) vector_size(unqPtr->unk4)){
if(!mapSpecificFlags_get(0) && gcdialog_showText(ASSET_C76_DIALOG_UNKNOWN, 0, 0, 0, 0, 0))
if(!mapSpecificFlags_get(0) && gcdialog_showDialog(ASSET_C76_DIALOG_UNKNOWN, 0, 0, 0, 0, 0))
mapSpecificFlags_set(0,1);
}else{
tmp = (Struct_BGS_2270_0s *)vector_at(unqPtr->unk4, unqPtr->unk0);
@@ -245,7 +245,7 @@ void chTiptup_choirHitReaction(ActorMarker *this, s32 arg1){
else{
func_8028F55C(1, thisActor->marker);
timedFunc_set_0(0.5f, chTiptup_sfxIncorrectHit);
if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && gcdialog_showText(0xc75, 0, NULL, NULL, NULL, NULL))
if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME) && gcdialog_showDialog(0xc75, 0, NULL, NULL, NULL, NULL))
mapSpecificFlags_set(1,TRUE);
}
}
@@ -342,7 +342,7 @@ void chTiptup_update(Actor *this){
if(this->state == 6){
if(ml_vec3f_distance(this->position, player_position) < 300.0f && !unqPtr->unk8){
unqPtr->unk8 = 1;
gcdialog_showText(0xc7d, 4, 0, 0, 0, 0);
gcdialog_showDialog(0xc7d, 4, 0, 0, 0, 0);
}
}
}

108
src/BGS/ch/code_8A60.c
View File

@@ -1,108 +0,0 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
extern void timedFunc_set_0(f32, void (*)(void));
void chLongSwampSwitch_update(Actor *this);
void chShortSwampSwitch_update(Actor *this);
ActorAnimationInfo chSwampSwitchAnimations[] = {
{0x00, 0.0f},
{0x00, 0.0f},
{ASSET_D4_ANIM_SWITCH_DOWN, 0.15f},
{ASSET_D5_ANIM_SWITCH_UP, 0.5f},
{0x00, 0.0f},
{0x00, 0.0f},
{ASSET_D4_ANIM_SWITCH_DOWN, 0.15f},
{ASSET_D5_ANIM_SWITCH_UP, 0.5f},
{ASSET_D5_ANIM_SWITCH_UP, 1e+8f}
};
ActorInfo chLongSwampSwitch = {MARKER_F5_BGS_ELEVATED_WALKWAY_SWITCH, ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH, 1, chSwampSwitchAnimations, chLongSwampSwitch_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
ActorInfo chShortSwampSwitch = {MARKER_FD_BGS_MAZE_SWITCH, ACTOR_1FB_BGS_MAZE_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH, 1, chSwampSwitchAnimations, chShortSwampSwitch_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
void chLongSwampSwitch_jiggySpawn(void){
f32 sp24[3];
if(nodeProp_findPositionFromActorId(0x14d, sp24)){
jiggy_spawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2])
);
}
}
void chLongSwampSwitch_update(Actor *this){
func_8038EA90();
if(mapSpecificFlags_get(7)){
mapSpecificFlags_set(7, 0);
if(!mapSpecificFlags_get(3) || (item_getCount(0) > 0)){
func_802D68F0(45);
}
}
if(!mapSpecificFlags_get(5)){
func_802D4928(this, 1, 6, 7); //something with switch collision
}
if(mapSpecificFlags_get(2)){
this->velocity_x = 0.0f;
mapSpecificFlags_set(3,0);
mapSpecificFlags_set(4,0);
mapSpecificFlags_set(1,0);
mapSpecificFlags_set(2,0);
}
if( this->velocity_x == 0.0f && mapSpecificFlags_get(1)){
this->velocity_x = 1.0f;
func_802BAFE4(0xc);
timedFunc_set_0(1.2f, chLongSwampSwitch_jiggySpawn);
} //L8038EFB4
if( this->velocity_x != 0.0f && !mapSpecificFlags_get(3) && func_802BB270()){
mapSpecificFlags_set(3,1);
func_802D68F0(45); //adjusts timer
item_set(ITEM_6_HOURGLASS,1);
} //L8038EFB4
}
void chShortSwampSwitch_jiggySpawn(void){
f32 sp24[3];
if(nodeProp_findPositionFromActorId(0x1fc, sp24)){
jiggy_spawn(JIGGY_25_BGS_MAZE, sp24);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2])
);
}
}
void chShortSwampSwitch_update(Actor *this){
func_8038EA90();
if(mapSpecificFlags_get(8)){
mapSpecificFlags_set(8, 0);
if(!mapSpecificFlags_get(0xC) || (item_getCount(0) > 0)){
func_802D68F0(10);
}
}
if(!mapSpecificFlags_get(9)){
func_802D4928(this, 0xA, 6, 7);
}
if(mapSpecificFlags_get(0xB)){
this->velocity_x = 0.0f;
mapSpecificFlags_set(0xC,0);
mapSpecificFlags_set(0xD,0);
mapSpecificFlags_set(0xA,0);
mapSpecificFlags_set(0xB,0);
}
if( this->velocity_x == 0.0f && mapSpecificFlags_get(0xA)){
this->velocity_x = 1.0f;
func_802BAFE4(0x1D);
timedFunc_set_0(1.2f, chShortSwampSwitch_jiggySpawn);
} //L8038EFB4
if( this->velocity_x != 0.0f && !mapSpecificFlags_get(0xC) && func_802BB270()){
mapSpecificFlags_set(0xC,1);
func_802D68F0(10); //adjusts timer
item_set(ITEM_6_HOURGLASS,1);
} //L8038EFB4
}

44
src/BGS/ch/croctus.c
View File

@@ -9,7 +9,7 @@ extern void func_803289EC(Actor *, f32, s32);
extern void func_80326310(Actor *);
extern void actor_setOpacity(Actor *, s32);
extern void __spawnQueue_add_2(void (*)(s32, s32), s32, s32);
extern void func_802BAFE4(s32 arg0);
extern void gcStaticCamera_activate(s32 arg0);
@@ -37,7 +37,7 @@ ActorInfo D_80390804 ={MARKER_FC_CROCTUS, ACTOR_1FA_CROCTUS, ASSET_425_MODEL_CRO
/* .code */
void func_80387C90(Actor *arg0){
anctrl_setDuration(arg0->anctrl, 0.4 + 0.9999999999999999 * ((f32)(5 - arg0->unkF4_8) * 0.25));
anctrl_setDuration(arg0->anctrl, 0.4 + 0.9999999999999999 * ((f32)(5 - arg0->actorTypeSpecificField) * 0.25));
}
void func_80387D18(ActorMarker * arg0, u32 arg1){
@@ -47,7 +47,7 @@ void func_80387D18(ActorMarker * arg0, u32 arg1){
this = marker_getActor(arg0);
nextActPtr = spawn_child_actor(0x6A, &this);
nextActPtr->state = 2;
nextActPtr->unkF4_8 = 0x8C;
nextActPtr->actorTypeSpecificField = 0x8C;
nextActPtr->lifetime_value = 3.0f;
nextActPtr->unk38_31 = arg1;
if(arg0);
@@ -64,9 +64,9 @@ void *func_80387D90(ActorMarker * arg0){
spawnPos[1] = this->position_y;
spawnPos[2] = this->position_z;
marker->propPtr->unk8_3 = 0;
func_802BAFE4(0x19);
gcStaticCamera_activate(0x19);
jiggy_spawn(JIGGY_22_CROCTUS, spawnPos);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
}
void func_80387E00(s32 arg0){
@@ -94,8 +94,8 @@ void func_80387E68(ActorMarker *caller, enum asset_e text_id, s32 arg2){
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
func_80326310(this); //did not disappear when moved, after cutscene still there with collision but broken
bgs_D_803907B8[this->unkF4_8]->propPtr->unk8_4 = TRUE;
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->unkF4_8]));
bgs_D_803907B8[this->actorTypeSpecificField]->propPtr->unk8_4 = 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, 0xC87, 0xE, NULL, NULL, func_80387E68, NULL);
__spawnQueue_add_2((GenFunction_2) func_80387D18, reinterpret_cast(s32, this->marker), 0x46);
@@ -115,16 +115,16 @@ void func_80387FD4(Actor *this){
return;
}
this->volatile_initialized = TRUE;
if(bgs_D_803907B8[this->unkF4_8 - 1] == 0){
bgs_D_803907B8[this->unkF4_8 - 1] = this->marker;
for(j = this->unkF4_8; j < 6; j++){
if(bgs_D_803907B8[this->actorTypeSpecificField - 1] == 0){
bgs_D_803907B8[this->actorTypeSpecificField - 1] = this->marker;
for(j = this->actorTypeSpecificField; j < 6; j++){
if(bgs_D_803907B8[j] != NULL){
bgs_D_803907B8[j]->propPtr->unk8_4 = FALSE;
actor_setOpacity(marker_getActor(bgs_D_803907B8[j]), 0);
}
}//L803880C8
for( j = this->unkF4_8 - 2; j >= 0 && bgs_D_803907B8[j] == NULL; j--);
for( j = this->actorTypeSpecificField - 2; j >= 0 && bgs_D_803907B8[j] == NULL; j--);
if(j >= 0){
@@ -140,10 +140,10 @@ void func_80387FD4(Actor *this){
if(this->unk38_31){
if ((this->state != 5) && (this->state != 6)) {
func_8025A6EC(COMUSIC_2B_DING_B, 28000); //TODO ISSUE HERE
if (this->unkF4_8 == 1) {
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
if (this->actorTypeSpecificField == 1) {
func_8028F94C(2, this->position);
gcdialog_showText(ASSET_C86_DIALOG_UNKNOWN, 0xE, this->position, this->marker, func_80387E68, NULL);
gcdialog_showDialog(ASSET_C86_DIALOG_UNKNOWN, 0xE, this->position, this->marker, func_80387E68, NULL);
subaddie_set_state_with_direction(this, 6, 0.79f, 1);
} else {
timed_playSfx(0.4f, SFX_C9_PAUSEMENU_ENTER, 1.0f, 32000); //0.4f
@@ -151,15 +151,15 @@ void func_80387FD4(Actor *this){
func_80324CFC(0.4f, COMUSIC_43_ENTER_LEVEL_GLITTER, 22000);
func_80324D2C(4.5f, COMUSIC_43_ENTER_LEVEL_GLITTER);
subaddie_set_state_with_direction(this, 5, 0.79f, 1);
if (this->unkF4_8 == 5) {
if (this->actorTypeSpecificField == 5) {
timedFunc_set_1(0.9f, (GenFunction_1) func_80387E40, (s32) this->marker);
} else {
func_80326310(this);
}
if (this->unkF4_8 < 5) {
bgs_D_803907B8[this->unkF4_8]->propPtr->unk8_4 = TRUE;
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->unkF4_8]));
func_802BAFE4(D_803907B0[this->unkF4_8-1]);
if (this->actorTypeSpecificField < 5) {
bgs_D_803907B8[this->actorTypeSpecificField]->propPtr->unk8_4 = TRUE;
timedFunc_set_1(1.1f, (GenFunction_1)func_80387E00, reinterpret_cast(s32, bgs_D_803907B8[this->actorTypeSpecificField]));
gcStaticCamera_activate(D_803907B0[this->actorTypeSpecificField-1]);
} else {
timedFunc_set_1(0.8f, (GenFunction_1)func_80387D90, (s32) this->marker);
}
@@ -187,7 +187,7 @@ void func_80387FD4(Actor *this){
case 3:// L80388434
this->lifetime_value += time_getDelta();
if( this->lifetime_value >= 0.13 + 0.7/4 * (5 - this->unkF4_8)){
if( this->lifetime_value >= 0.13 + 0.7/4 * (5 - this->actorTypeSpecificField)){
subaddie_set_state_with_direction(this, 4, 0.62f, 1);
func_80387C90(this);
this->lifetime_value = 0.0f;
@@ -207,7 +207,7 @@ void func_80387FD4(Actor *this){
&& !anctrl_isPlayedForwards(this->anctrl)
&& func_802BB270()
){
func_8030E6A4(SFX_C8_CRUNCH, randf2(0.93f, 1.07f), 22000);
gcsfx_playWithPitch(SFX_C8_CRUNCH, randf2(0.93f, 1.07f), 22000);
}
break;
@@ -227,6 +227,6 @@ void BGS_func_803885DC(void){
Actor *func_8038860C(ActorMarker *this, Gfx** gdl, Mtx ** mptr, Vtx **vtx){
Actor *thisActor;
thisActor = marker_getActor(this);
func_8033A45C(1, thisActor->unkF4_8);
func_8033A45C(1, thisActor->actorTypeSpecificField);
return actor_draw(this, gdl, mptr, vtx);
}

6
src/BGS/ch/flibbit.c
View File

@@ -215,7 +215,7 @@ void func_80386AEC(Actor *this, s32 next_state) {
}
if (next_state == 5) {
FUNC_8030E8B4(SFX_8E_GRUNTLING_DAMAGE, 1.5f, 32200, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_8E_GRUNTLING_DAMAGE, 1.5f, 32200, this->position, 500, 2500);
skeletalAnim_set(this->unk148, ASSET_288_ANIM_FLIBBIT_OW, 0.1f, 0.65f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
this->position[1] = mapModel_getFloorY(this->position);
@@ -224,7 +224,7 @@ void func_80386AEC(Actor *this, s32 next_state) {
if (next_state == 6) {
skeletalAnim_set(this->unk148, ASSET_112_ANIM_FLIBBIT_DIE, 0.2f, 0.4f);
FUNC_8030E8B4(SFX_115_BUZZBOMB_DEATH, 1.0f, 32200, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_115_BUZZBOMB_DEATH, 1.0f, 32200, this->position, 500, 2500);
this->marker->collidable = FALSE;
this->unk10_1 = FALSE;
local->unk14 = 1000.0f;
@@ -232,7 +232,7 @@ void func_80386AEC(Actor *this, s32 next_state) {
if (next_state == 7) {
skeletalAnim_set(this->unk148, ASSET_113_ANIM_FLIBBIT_DEAD, 0.2f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 0.8f, 32200, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_2F_ORANGE_SPLAT, 0.8f, 32200, this->position, 500, 2500);
}
if (next_state == 8) {
func_80326310(this);

8
src/BGS/ch/frogminigame.c
View File

@@ -56,10 +56,10 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
mapSpecificFlags_set(0x10, 1);
if(!fileProgressFlag_get(FILEPROG_1B_MET_YELLOW_FLIBBITS)){
fileProgressFlag_set(FILEPROG_1B_MET_YELLOW_FLIBBITS, 1);
gcdialog_showText(text_flibbits_meet, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(text_flibbits_meet, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}else{
if(!arg0->bgs_6730.unk8){
gcdialog_showText(text_flibbits_return, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(text_flibbits_return, 0x4, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}
else{
__chFrogMinigame_textCallback(arg0->marker, text_flibbits_return, 0);
@@ -71,7 +71,7 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
s0->unk0 = 1;
if(!s0->unk4){
func_8025A58C(0, 400);
func_8025A6EC(MUSIC_BGS_FLIBBIT_FIGHT, 30000);
coMusicPlayer_playMusic(MUSIC_BGS_FLIBBIT_FIGHT, 30000);
s0->unk4 = 1;
}
else{
@@ -93,7 +93,7 @@ void chFrogMinigame_setState(Actor * arg0, u32 next_state){
}
if (next_state == 4) {
gcdialog_showText(text_flibbits_defeat, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
gcdialog_showDialog(text_flibbits_defeat, 0xf, arg0->position, arg0->marker, __chFrogMinigame_textCallback, 0);
}
if(next_state == 5){

6
src/BGS/ch/leafboat.c
View File

@@ -41,7 +41,7 @@ Actor *chLeafBoat_draw(ActorMarker *this, Gfx** gdl, Mtx** mtx, Vtx **vtx){
}
void func_8038FD88(ActorMarker *this, ActorMarker *other){
this->unk3E_1 = 1;
this->isBanjoOnTop = 1;
}
void chLeafBoat_update(Actor *this){
@@ -155,7 +155,7 @@ void chLeafBoat_update(Actor *this){
_player_getPosition(player_position);
if( func_80294660() == 0x100
&& func_8028F20C()
&& this->marker->unk3E_1
&& this->marker->isBanjoOnTop
){
sp44 = local->unk54[0] - player_position[0];
sp40 = local->unk54[2] - player_position[2];
@@ -184,7 +184,7 @@ void chLeafBoat_update(Actor *this){
}
this->unk10_12 = 0;
}
this->marker->unk3E_1 = 0;
this->marker->isBanjoOnTop = 0;
local->unk18[1] = 10 * sinf((((this->lifetime_value * local->unk6C) / 180.0) * BAD_PI));
this->unk1C[0] = 4.5 * cosf((((this->lifetime_value * local->unk6C) / 180.0) * BAD_PI));

4
src/BGS/ch/mudhut.c
View File

@@ -103,12 +103,12 @@ void chMudHut_update(Actor *this){
diffPos[2] = this->position_z;
diffPos[1] += 130.0;
FUNC_8030E8B4(SFX_5B_HEAVY_STUFF_FALLING, 1.0f, 28000, this->position, 0x12C, 0xBB8);
sfx_playFadeShorthandDefault(SFX_5B_HEAVY_STUFF_FALLING, 1.0f, 28000, this->position, 0x12C, 0xBB8);
subaddie_set_state(this, 2);
this->marker->propPtr->unk8_3 = 0;
actor_playAnimationOnce(this);
if(tmp == 5){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
__spawnQueue_add_1((GenFunction_1)chMudHut_spawnExplosion, reinterpret_cast(s32, this->marker));

4
src/BGS/ch/pinkegg.c
View File

@@ -84,7 +84,7 @@ void chPinkEgg_collision(ActorMarker *this, ActorMarker *other_marker){
thisActor = marker_getActor(this);
this->propPtr->unk8_3 = 0;
sfxsource_play(SFX_AA_BGS_EGG_BREAKING_1, 28000);
gcsfx_playAtSampleRate(SFX_AA_BGS_EGG_BREAKING_1, 28000);
subaddie_set_state(thisActor, 3);
actor_playAnimationOnce(thisActor);
this->collidable = FALSE;
@@ -93,7 +93,7 @@ void chPinkEgg_collision(ActorMarker *this, ActorMarker *other_marker){
__spawnQueue_add_2(chPinkEgg_spawnNext, thisActor->marker, tmp->unk0);
} else {
jiggy_spawn(JIGGY_21_BGS_PINKEGG, thisActor->position);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
}

128
src/BGS/ch/swampswitch.c Normal file
View File

@@ -0,0 +1,128 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
extern void timedFunc_set_0(f32, void (*)(void));
void chLongSwampSwitch_update(Actor *this);
void chShortSwampSwitch_update(Actor *this);
ActorAnimationInfo chSwampSwitchAnimations[] = {
{ 0x00, 0.0f },
{ 0x00, 0.0f },
{ ASSET_D4_ANIM_SWITCH_DOWN, 0.15f },
{ ASSET_D5_ANIM_SWITCH_UP, 0.5f },
{ 0x00, 0.0f },
{ 0x00, 0.0f },
{ ASSET_D4_ANIM_SWITCH_DOWN, 0.15f },
{ ASSET_D5_ANIM_SWITCH_UP, 0.5f },
{ ASSET_D5_ANIM_SWITCH_UP, 1e+8f }
};
ActorInfo chLongSwampSwitch = {
MARKER_F5_BGS_ELEVATED_WALKWAY_SWITCH, ACTOR_14E_BGS_ELEVATED_WALKWAY_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH,
1, chSwampSwitchAnimations, chLongSwampSwitch_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0 };
ActorInfo chShortSwampSwitch = { MARKER_FD_BGS_MAZE_SWITCH, ACTOR_1FB_BGS_MAZE_SWITCH, ASSET_3F5_BGS_JIGGY_SWITCH,
1, chSwampSwitchAnimations, chShortSwampSwitch_update, actor_update_func_80326224, actor_draw, 0, 0, 0.0f, 0};
void chLongSwampSwitch_jiggySpawn(void) {
f32 sp24[3];
if (!nodeProp_findPositionFromActorId(0x14d, sp24)) {
return;
}
jiggy_spawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2])
);
}
void chLongSwampSwitch_update(Actor *this){
func_8038EA90();
// If the switch has been pressed, hitting it again resets the timer
if (mapSpecificFlags_get(BGS_SPECIFIC_FLAG_7)) {
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_7, FALSE);
if (!mapSpecificFlags_get(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_TIMER_RUNNING) || (item_getCount(ITEM_0_HOURGLASS_TIMER) > 0)) {
func_802D68F0(45);
}
}
if (!mapSpecificFlags_get(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_SWITCH_PRESSED)) {
func_802D4928(this, BGS_SPECIFIC_FLAG_1, 6, 7); //something with switch collision
}
if (mapSpecificFlags_get(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_RESET)) {
this->velocity_x = 0.0f;
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_TIMER_RUNNING, FALSE);
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY, FALSE);
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_1, FALSE);
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_RESET, FALSE);
}
if (this->velocity_x == 0.0f && mapSpecificFlags_get(BGS_SPECIFIC_FLAG_1)) {
this->velocity_x = 1.0f;
gcStaticCamera_activate(0xc);
timedFunc_set_0(1.2f, chLongSwampSwitch_jiggySpawn);
} //L8038EFB4
if (this->velocity_x != 0.0f && !mapSpecificFlags_get(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_TIMER_RUNNING) && func_802BB270()) {
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_WALKWAY_JIGGY_TIMER_RUNNING, TRUE);
func_802D68F0(45); //adjusts timer
item_set(ITEM_6_HOURGLASS, 1);
} //L8038EFB4
}
void chShortSwampSwitch_jiggySpawn(void){
f32 sp24[3];
if (!nodeProp_findPositionFromActorId(0x1fc, sp24)) {
return;
}
jiggy_spawn(JIGGY_25_BGS_MAZE, sp24);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2])
);
}
void chShortSwampSwitch_update(Actor *this){
func_8038EA90();
if (mapSpecificFlags_get(BGS_SPECIFIC_FLAG_8)) {
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_8, 0);
if (!mapSpecificFlags_get(BGS_SPECIFIC_FLAG_MAZE_JIGGY_TIMER_RUNNING) || (item_getCount(ITEM_0_HOURGLASS_TIMER) > 0)) {
func_802D68F0(10);
}
}
if (!mapSpecificFlags_get(BGS_SPECIFIC_FLAG_MAZE_JIGGY_SWITCH_PRESSED)) {
func_802D4928(this, BGS_SPECIFIC_FLAG_A, 6, 7);
}
if (mapSpecificFlags_get(BGS_SPECIFIC_FLAG_MAZE_JIGGY_RESET)) {
this->velocity_x = 0.0f;
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_MAZE_JIGGY_TIMER_RUNNING, FALSE);
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_MAZE_JIGGY, FALSE);
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_A, FALSE);
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_MAZE_JIGGY_RESET, FALSE);
}
if (this->velocity_x == 0.0f && mapSpecificFlags_get(BGS_SPECIFIC_FLAG_A)) {
this->velocity_x = 1.0f;
gcStaticCamera_activate(0x1D);
timedFunc_set_0(1.2f, chShortSwampSwitch_jiggySpawn);
} //L8038EFB4
if (this->velocity_x != 0.0f && !mapSpecificFlags_get(BGS_SPECIFIC_FLAG_MAZE_JIGGY_TIMER_RUNNING) && func_802BB270()) {
mapSpecificFlags_set(BGS_SPECIFIC_FLAG_MAZE_JIGGY_TIMER_RUNNING, TRUE);
func_802D68F0(10); //adjusts timer
item_set(ITEM_6_HOURGLASS,1);
} //L8038EFB4
}

8
src/BGS/ch/tanktup.c
View File

@@ -142,7 +142,7 @@ void func_8038F6A4(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_showText(0xC7E, 0, 0, 0, 0, 0);
gcdialog_showDialog(0xC7E, 0, 0, 0, 0, 0);
this->has_met_before = TRUE;
}
}
@@ -163,7 +163,7 @@ void func_8038F6A4(Actor *this)
if ((!this->unk138_23) && (!local->unk14))
{
if (gcdialog_showText(0xC80, 0, 0, 0, 0, 0))
if (gcdialog_showDialog(0xC80, 0, 0, 0, 0, 0))
{
this->unk138_23 = 1;
}
@@ -175,7 +175,7 @@ void func_8038F6A4(Actor *this)
func_8038F610(this);
if (actor_animationIsAt(this, 0.6f) && local->unk14)
{
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_8028F94C(2, local->unk18);
}
if (actor_animationIsAt(this, 0.99f))
@@ -214,7 +214,7 @@ void func_8038F6A4(Actor *this)
func_8028F918(0);
if (jiggyscore_isCollected(JIGGY_26_BGS_TANKTUP) == 0)
{
gcdialog_showText(0xC7F, 0xF, this->position, this->marker, func_8038F5E4, 0);
gcdialog_showDialog(0xC7F, 0xF, this->position, this->marker, func_8038F5E4, 0);
}
else
{

8
src/BGS/ch/yellowflibbit.c
View File

@@ -45,7 +45,7 @@ void func_8038D1E0(Actor *this) {
particleEmitter_setParticleVelocityRange(temp_s0, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f);
particleEmitter_setParticleLifeTimeRange(temp_s0, 3.0f, 4.0f);
particleEmitter_emitN(temp_s0, 4);
FUNC_8030E8B4(SFX_30_MAGIC_POOF, 1.0f, 25000, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_30_MAGIC_POOF, 1.0f, 25000, this->position, 500, 2500);
}
s32 func_8038D2F4(Actor *this, f32 *arg1, bool arg2) {
@@ -239,7 +239,7 @@ void func_8038D9D0(Actor *this, s32 next_state) {
local->unk1C = 1.0f;
}
if (next_state == 8) {
FUNC_8030E8B4(SFX_8E_GRUNTLING_DAMAGE, 1.5f, 32200, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_8E_GRUNTLING_DAMAGE, 1.5f, 32200, this->position, 500, 2500);
skeletalAnim_set(this->unk148, ASSET_288_ANIM_FLIBBIT_OW, 0.1f, 0.65f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
this->position[1] = mapModel_getFloorY(this->position);
@@ -247,7 +247,7 @@ void func_8038D9D0(Actor *this, s32 next_state) {
}
if (next_state == 9) {
skeletalAnim_set(this->unk148, ASSET_112_ANIM_FLIBBIT_DIE, 0.2f, 0.4f);
FUNC_8030E8B4(SFX_115_BUZZBOMB_DEATH, 1.0f, 32200, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_115_BUZZBOMB_DEATH, 1.0f, 32200, this->position, 500, 2500);
this->marker->collidable = FALSE;
this->unk10_1 = FALSE;
func_8038CEA0();
@@ -256,7 +256,7 @@ void func_8038D9D0(Actor *this, s32 next_state) {
if (next_state == 0xA) {
skeletalAnim_set(this->unk148, ASSET_113_ANIM_FLIBBIT_DEAD, 0.2f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 0.8f, 32200, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_2F_ORANGE_SPLAT, 0.8f, 32200, this->position, 500, 2500);
}
if (next_state == 0xB) {
func_80326310(this);

2
src/BGS/ch/yumblie.c
View File

@@ -74,7 +74,7 @@ void chyumblie_set_state(Actor* this, enum chyumblie_state_e next_state){
skeletalAnim_set(this->unk148, (s0->unk4)? ASSET_12A_ANIM_GRUMBLIE_IDLE : ASSET_127_ANIM_YUMBLIE_IDLE, 0.1f, randf2(0.5f, 1.0f));
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_1_LOOP);
if(s0->unk4){
func_8030E6A4(SFX_C4_TWINKLY_MUNCHER_GRR,randf2(1.0f, 1.2), 30000);
gcsfx_playWithPitch(SFX_C4_TWINKLY_MUNCHER_GRR,randf2(1.0f, 1.2), 30000);
}else{
func_8030E878(SFX_C3_HEGH,randf2(1.0f, 1.2), 30000, this->position, 500.0f, 3000.0f);
}

2
src/BGS/code_3030.c
View File

@@ -41,7 +41,7 @@ void chChoirTurtle_setState(Actor *this, s32 next_state) {
timed_playSfx(0.8333333, SFX_86_TIPTUP_CHORUS_AH, local->unk8, 0x7FFF);
}
if (next_state == 3) {
func_8030E6A4(SFX_86_TIPTUP_CHORUS_AH, local->unk8, 0x7FFF);
gcsfx_playWithPitch(SFX_86_TIPTUP_CHORUS_AH, local->unk8, 0x7FFF);
skeletalAnim_set(this->unk148, ASSET_12F_ANIM_CHOIR_TURTLE_HURT, 0.1f, 1.75f);
skeletalAnim_setCallback_1(this->unk148, 0.9f, (GenFunction_1)chChoirTurtle_returnState, (s32)this->marker);
if (local->tiptup_marker != NULL) {

36
src/BGS/code_3420.c
View File

@@ -221,7 +221,7 @@ void func_80389C58(ActorMarker *marker) {
this = marker_getActor(marker);
local = (ActorLocal_BGS_3420 *)&this->local;
BGS_func_80389850(this, 0);
gcdialog_showText(D_80390984[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389BF8, NULL);
gcdialog_showDialog(D_80390984[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389BF8, NULL);
}
void BGS_func_80389CD8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -241,9 +241,9 @@ void func_80389D20(ActorMarker *marker) {
local = (ActorLocal_BGS_3420 *)&this->local;
BGS_func_80389850(this, 0);
if (local->unkC == local->unkD) {
gcdialog_showText(D_803909A4[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL);
gcdialog_showDialog(D_803909A4[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL);
} else {
gcdialog_showText(D_803909C0[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL);
gcdialog_showDialog(D_803909C0[local->unkC], 0xF, chVile_getPostion(local->vile_marker), this->marker, BGS_func_80389CD8, NULL);
}
func_80347A14(0);
}
@@ -265,7 +265,7 @@ void func_80389E40(ActorMarker *marker) {
local = (ActorLocal_BGS_3420 *)&this->local;
BGS_func_80389850(this, 1);
gcdialog_showText(0xC6B, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389DF8, NULL);
gcdialog_showDialog(0xC6B, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389DF8, NULL);
}
void func_80389EAC(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -293,7 +293,7 @@ void func_80389F08(ActorMarker *marker) {
var_s2 = actorArray_actorCount(ACTOR_49_EXTRA_LIFE);
vile = marker_getActor(local->vile_marker);
if (var_s2 > 0) {
func_8025A6EC(COMUSIC_15_EXTRA_LIFE_COLLECTED, 0x7FF8);
coMusicPlayer_playMusic(COMUSIC_15_EXTRA_LIFE_COLLECTED, 0x7FF8);
}
for(i = 0; i < 3; i++){
if (var_s2 < 3) {
@@ -305,7 +305,7 @@ void func_80389F08(ActorMarker *marker) {
item_inc(ITEM_16_LIFE);
}
}
gcdialog_showText(0xC98, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389EAC, NULL);
gcdialog_showDialog(0xC98, 0xF, chVile_getPostion(local->vile_marker), this->marker, func_80389EAC, NULL);
}
@@ -327,22 +327,22 @@ void func_8038A068(Actor *this, s32 next_state) {
func_8038C3B0(local->vile_marker);
if (local->unkC == 3) {
if (local->unkD >= 4) {
gcdialog_showText(0xC91, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL);
gcdialog_showDialog(0xC91, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL);
} else {
gcdialog_showText((local->unkC == local->unkD) ? 0xC8D : 0xC90, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL);
gcdialog_showDialog((local->unkC == local->unkD) ? 0xC8D : 0xC90, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL);
}
} else {
gcdialog_showText((local->unkC == local->unkD) ? 0xC63 : 0xC6C, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL);
gcdialog_showDialog((local->unkC == local->unkD) ? 0xC63 : 0xC6C, 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389B48, NULL);
}
}
if (next_state == 3) {
gcdialog_showText(D_803909DC[local->unkC], 4, chVile_getPostion(local->vile_marker), this->marker, func_80389B98, NULL);
gcdialog_showDialog(D_803909DC[local->unkC], 4, chVile_getPostion(local->vile_marker), this->marker, func_80389B98, NULL);
}
if (next_state == 4) {
if (local->unkC == local->unkD) {
gcdialog_showText(BGS_D_803909F8[local->unkC], 0xE | ((BGS_D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL);
gcdialog_showDialog(BGS_D_803909F8[local->unkC], 0xE | ((BGS_D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL);
} else {
gcdialog_showText(D_80390A18[local->unkC], 0xF , chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL);
gcdialog_showDialog(D_80390A18[local->unkC], 0xF , chVile_getPostion(local->vile_marker), this->marker, func_80389BC8, NULL);
}
func_80347A14(0);
}
@@ -367,7 +367,7 @@ void func_8038A068(Actor *this, s32 next_state) {
mapSpecificFlags_set(6, TRUE);
func_8038C3DC(local->vile_marker);
func_8025A58C(0, 4000);
timedFunc_set_2(1.0f, (GenFunction_2)func_8025A6EC, COMUSIC_55_BGS_MR_VILE, 28000);
timedFunc_set_2(1.0f, (GenFunction_2)coMusicPlayer_playMusic, COMUSIC_55_BGS_MR_VILE, 28000);
}
}
if (this->state == 5) {
@@ -383,28 +383,28 @@ void func_8038A068(Actor *this, s32 next_state) {
if (next_state == 6) {
func_8038C3B0(local->vile_marker);
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (GenFunction_2)func_8025A6EC, COMUSIC_3C_MINIGAME_LOSS, 28000);
timedFunc_set_2(1.0f, (GenFunction_2)coMusicPlayer_playMusic, COMUSIC_3C_MINIGAME_LOSS, 28000);
timedFunc_set_0(4.0f, (GenFunction_0)func_8038A044);
timedFunc_set_1(4.0f, (GenFunction_1)func_80389C58, (s32) this->marker);
}
if (next_state == 8) {
func_8038C3B0(local->vile_marker);
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (GenFunction_2)func_8025A6EC, COMUSIC_3B_MINIGAME_VICTORY, 28000);
timedFunc_set_2(1.0f, (GenFunction_2)coMusicPlayer_playMusic, COMUSIC_3B_MINIGAME_VICTORY, 28000);
timedFunc_set_0(3.0f, (GenFunction_0)func_8038A044);
timedFunc_set_1(3.0f, (GenFunction_1)func_80389D20, (s32) this->marker);
}
if (next_state == 9) {
func_8038C3B0(local->vile_marker);
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (GenFunction_2)func_8025A6EC, COMUSIC_3B_MINIGAME_VICTORY, 28000);
timedFunc_set_2(1.0f, (GenFunction_2)coMusicPlayer_playMusic, COMUSIC_3B_MINIGAME_VICTORY, 28000);
timedFunc_set_0(3.0f, (GenFunction_0)func_8038A044);
timedFunc_set_1(3.0f, (GenFunction_1)func_80389E40, (s32) this->marker);
}
if (next_state == 0xA) {
func_8038C3B0(local->vile_marker);
func_80324E38(0.5f, 3);
timedFunc_set_2(1.0f, (GenFunction_2) func_8025A6EC, COMUSIC_3B_MINIGAME_VICTORY, 28000);
timedFunc_set_2(1.0f, (GenFunction_2) coMusicPlayer_playMusic, COMUSIC_3B_MINIGAME_VICTORY, 28000);
timedFunc_set_1(3.0f, (GenFunction_1) func_80389F08, (s32) this->marker);
}
if (next_state == 7) {
@@ -434,7 +434,7 @@ void chvilegame_player_consume_piece(Actor *this) {
local->player_score++;
if (local->player_score == 35) {
item_inc(ITEM_16_LIFE);
func_8025A6EC(COMUSIC_15_EXTRA_LIFE_COLLECTED, 0x7FF8);
coMusicPlayer_playMusic(COMUSIC_15_EXTRA_LIFE_COLLECTED, 0x7FF8);
}
timedFunc_set_1(0.0f, (GenFunction_1)func_802FDCB8, ITEM_1A_PLAYER_VILE_SCORE);
timedFunc_set_1(0.5f, (GenFunction_1)func_802FDCB8, ITEM_1A_PLAYER_VILE_SCORE);

4
src/BGS/code_9750.c
View File

@@ -71,7 +71,7 @@ void BGS_func_8038FB84(ActorMarker *this, ActorMarker *other_marker){
Actor *thisActor;
thisActor = marker_getActor(this);
FUNC_8030E8B4( SFX_87_TANKTUP_OOOHW, 1.0f, 32750, thisActor->position, 1000, 3000);
sfx_playFadeShorthandDefault( SFX_87_TANKTUP_OOOHW, 1.0f, 32750, thisActor->position, 1000, 3000);
timedFunc_set_2(0.65f, (GenFunction_2) func_8038FB40, (s32) this, (s32) other_marker);
func_8038F51C(thisActor);
this->collidable = FALSE;
@@ -85,7 +85,7 @@ void func_8038FBF8(Actor *this){
}
if(this->state == 2){
if(anctrl_isAt(this->anctrl, 0.65f)){
func_8030E540(SFX_7C_CHEBOOF);
gcsfx_play(SFX_7C_CHEBOOF);
}
if(anctrl_isStopped(this->anctrl)){
marker_despawn(this->marker);

2
src/CC/code_0.c
View File

@@ -97,7 +97,7 @@ void func_803864D4(Actor *this){
{//L80386734
sp2C = local->unk8/1.0;
if(local->unkC && 0.6 < sp2C){
FUNC_8030E8B4(SFX_91_METALLIC_SOUND, 1.0, 32000, this->position, 100, 6000);
sfx_playFadeShorthandDefault(SFX_91_METALLIC_SOUND, 1.0, 32000, this->position, 100, 6000);
local->unkC = 0;
}//L80386798
sin_result = sinf(((sp2C*90.0)/180.0)*BAD_PI);

8
src/CC/code_1B90.c
View File

@@ -47,10 +47,10 @@ void func_8038803C(s32 arg0){
func_80387FE8();
D_80389F90.unk8 = 1.0f;
}
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
else{//L803880BC
func_8025A6EC(COMUSIC_2C_BUZZER, 28000);
coMusicPlayer_playMusic(COMUSIC_2C_BUZZER, 28000);
}
}
@@ -84,7 +84,7 @@ void func_8038817C(void){
D_80389F90.unk4 += sp20;
player_getPosition(sp24);
if(ml_timer_update(&D_80389F90.unk8, sp20)){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(2.0f, 0);
timedJiggySpawn(2.1f, JIGGY_1C_CC_RINGS, D_80389BF0);
@@ -104,7 +104,7 @@ void func_8038817C(void){
|| (D_80389F90.unk0 < 9 && item_empty(ITEM_6_HOURGLASS))
){
func_80387FE8();
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
coMusicPlayer_playMusic(COMUSIC_3C_MINIGAME_LOSS, 28000);
func_803880D4();
func_80388104();
}

16
src/CC/code_1F70.c
View File

@@ -78,7 +78,7 @@ void func_803884A8(s32 arg0, f32 arg1, s32 arg2, s32 arg3){
void func_80388518(s32 arg0){
s32 sp24;
if(D_80389FA0.unk21 == 2){
func_8030E394(D_80389FA0.sfxsourceIdx);
sfxSource_triggerCallbackByIndex(D_80389FA0.sfxsourceIdx);
func_8030E760(SFX_7F_HEAVYDOOR_SLAM, 0.6f, 20000);
func_8030E760(SFX_7F_HEAVYDOOR_SLAM, 0.8f, 20000);
func_8030E760(SFX_7F_HEAVYDOOR_SLAM, 0.9f, 20000);
@@ -94,9 +94,9 @@ void func_80388518(s32 arg0){
func_8030DD90(D_80389FA0.sfxsourceIdx, 0);
sfxsource_playSfxAtVolume(D_80389FA0.sfxsourceIdx, 1.0f);
sfxsource_setSfxId(D_80389FA0.sfxsourceIdx, SFX_7D_ANCHOR_LIFTING);
func_8030DD14(D_80389FA0.sfxsourceIdx, 3);
sfxSource_setunk43_7ByIndex(D_80389FA0.sfxsourceIdx, 3);
sfxsource_setSampleRate(D_80389FA0.sfxsourceIdx, 27000);
func_8030E2C4(D_80389FA0.sfxsourceIdx);
sfxSource_func_8030E2C4(D_80389FA0.sfxsourceIdx);
}
if(D_80389FA0.unk21 == 3){
@@ -308,10 +308,10 @@ void func_80388ED4(s32 arg0){
f32 sp1C[3];
func_8034A174(D_80389FA0.unk34, 5, sp1C);
if(arg0 != 0){
FUNC_8030E8B4(SFX_91_METALLIC_SOUND, 0.7f, 32675, sp1C, 100, 6000);
sfx_playFadeShorthandDefault(SFX_91_METALLIC_SOUND, 0.7f, 32675, sp1C, 100, 6000);
}
else{
FUNC_8030E8B4(SFX_82_METAL_BREAK, 0.9f, 24000, sp1C, 100, 6000);
sfx_playFadeShorthandDefault(SFX_82_METAL_BREAK, 0.9f, 24000, sp1C, 100, 6000);
}
D_80389FA0.unk8 = 1.0f;
}
@@ -338,11 +338,11 @@ void CC_func_80388F4C(void){
if(D_80389FA0.unk21 == 3){
func_8034A174(D_80389FA0.unk34, 5, sp54);
if(sp60 < sp64){
FUNC_8030E8B4(SFX_7E_CREAKY_DOOR_OPENING, 0.6f, 32300, sp54, 1000, 5000);
sfx_playFadeShorthandDefault(SFX_7E_CREAKY_DOOR_OPENING, 0.6f, 32300, sp54, 1000, 5000);
}//L80389058
if(sp64 < 0.3 && 0.3 <= sp60){
FUNC_8030E8B4(SFX_7E_CREAKY_DOOR_OPENING, 0.5f, 32300, sp54, 1000, 5000);
sfx_playFadeShorthandDefault(SFX_7E_CREAKY_DOOR_OPENING, 0.5f, 32300, sp54, 1000, 5000);
}
}//L8038909C
@@ -360,7 +360,7 @@ void CC_func_80388F4C(void){
if(D_80389FA0.unk20 && skeletalAnim_getAnimId(D_80389FA0.unk0) != ASSET_C4_ANIM_CLANKER_BITE){
skeletalAnim_set(D_80389FA0.unk0, ASSET_C4_ANIM_CLANKER_BITE, 1.0f, 10.0f);
if(!D_80389FA0.unk48){
gcdialog_showText(ASSET_D2B_DIALOG_UNKNOWN, 0xE, D_80389FA0.unk28, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_D2B_DIALOG_UNKNOWN, 0xE, D_80389FA0.unk28, NULL, NULL, NULL);
D_80389FA0.unk48 = TRUE;
}
}//L8038918C

4
src/CC/code_3400.c
View File

@@ -42,7 +42,7 @@ void func_803897F0(Actor *this, s32 next_state){
FUNC_8030E624(SFX_1E_HITTING_AN_ENEMY_2, 1.0f, 25000);
if(next_state == 2){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, -1);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, -1);
FUNC_8030E624(SFX_3F6_RUBBING, 0.9f, 29000);
local->unk4 = 0.0f;
}
@@ -55,7 +55,7 @@ void func_803897F0(Actor *this, s32 next_state){
}
void func_80389890(ActorMarker *marker, ActorMarker *other_marker){
func_8025A6EC(COMUSIC_2B_DING_B, -1);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, -1);
}
void func_803898BC(ActorMarker *marker, ActorMarker *other_marker){

10
src/CC/code_530.c
View File

@@ -37,20 +37,20 @@ void CC_func_80386920(Actor *this, s32 next_state){
local->unk14 = 0.0f;
if(this->state == 2 || this->state == 3 || this->state == 4){
func_8030E394(local->sfxsourceIdx);
sfxSource_triggerCallbackByIndex(local->sfxsourceIdx);
}
if(next_state == 2 || next_state == 3 || next_state == 4){
func_8030DD90(local->sfxsourceIdx, 1);
sfxsource_playSfxAtVolume(local->sfxsourceIdx, 0.3f);
sfxsource_setSfxId(local->sfxsourceIdx, 0x3ec);
func_8030DD14(local->sfxsourceIdx, 3);
sfxSource_setunk43_7ByIndex(local->sfxsourceIdx, 3);
sfxsource_setSampleRate(local->sfxsourceIdx, 28000);
func_8030E2C4(local->sfxsourceIdx);
sfxSource_func_8030E2C4(local->sfxsourceIdx);
}
if(next_state == 2 || next_state == 4){
func_8025A6EC(COMUSIC_2B_DING_B, 0x7fff);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 0x7fff);
player_getPosition(sp28);
TUPLE_COPY(sp20, sp28);
fxSparkle_giantGoldFeather(&sp20);
@@ -58,7 +58,7 @@ void CC_func_80386920(Actor *this, s32 next_state){
if(next_state == 4){
CC_func_8038868C();
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
}
if(this->state == 4)

6
src/CC/code_BF0.c
View File

@@ -35,7 +35,7 @@ void CC_func_80386FE0(Actor *this, s32 next_state){
this->state = next_state;
local->unk8 = 0.0f;
if(this->state == 2){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
else if(this->state == 3){
if(prev_state == 2){
@@ -121,13 +121,13 @@ void func_803870F8(Actor *this){
if(local->egg_count == 3){
CC_func_80386FE0(this, 2);
}else{
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
}
else if(this->state == 2 && 1.0f <= local->unk8){
flagCnt = levelSpecificFlags_get(LEVEL_FLAG_0_CC_TOKEN_TOOTH_OPEN) + levelSpecificFlags_get(LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN);
if(!jiggyscore_isCollected(JIGGY_1B_CC_TOOTH)){
gcdialog_showText((local->unk0 == 1)? ((flagCnt == 0)? 0xd30 : 0xd31) : ((flagCnt == 0)? 0xd2e : 0xd2f), 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog((local->unk0 == 1)? ((flagCnt == 0)? 0xd30 : 0xd31) : ((flagCnt == 0)? 0xd2e : 0xd2f), 4, NULL, NULL, NULL, NULL);
}
CC_func_80386FE0(this, 3);
}//L80387474

6
src/CCW/ch/grublinhood.c
View File

@@ -84,7 +84,7 @@ void __chgrublinhood_die(ActorMarker* marker, s32 arg1) {
subaddie_set_state_with_direction(actor, 5, 0.0f, 1);
actor_playAnimationOnce(actor);
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500);
pCtrl = partEmitMgr_newEmitter(1);
__chgrublinhood_emitHat(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
@@ -185,10 +185,10 @@ void chgrublinhood_update(Actor *this) {
func_802DB5A0(this);
if (this->state == 5) {
if (actor_animationIsAt(this, 0.18f)) {
FUNC_8030E8B4(SFX_2_CLAW_SWIPE, 1.0f, 28000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_2_CLAW_SWIPE, 1.0f, 28000, this->position, 1250, 2500);
}
if (actor_animationIsAt(this, 0.7f)) {
FUNC_8030E8B4(SFX_1F_HITTING_AN_ENEMY_3, 1.0f, 28000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_1F_HITTING_AN_ENEMY_3, 1.0f, 28000, this->position, 1250, 2500);
}
}
}

2
src/CCW/ch/vacationtexttrigger.c
View File

@@ -37,7 +37,7 @@ void chVacationTextTrigger_update(Actor* this) {
// Start dialog if player is within trigger
if (__playerIsWithinTrigger(0, -107, 188) != 0) {
gcdialog_showText(0xDA9, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xDA9, 4, NULL, NULL, NULL, NULL);
volatileFlag_set(VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT, 1);
}
}

2
src/CCW/code_0.c
View File

@@ -10,7 +10,7 @@ ActorInfo D_8038EB74 = { 0x1AC, 0x29A, 0x445, 0x0, NULL, func_803864B8, NULL, ac
/* .code */
void CCW_func_803863F0(Actor *this, s32 next_state){
if(next_state == 2){
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 32000, this->position, 500, 3000);
sfx_playFadeShorthandDefault(SFX_2F_ORANGE_SPLAT, 1.0f, 32000, this->position, 500, 3000);
levelSpecificFlags_set(LEVEL_FLAG_10_CCW_UNKNOWN, TRUE);
marker_despawn(this->marker);
}

6
src/CCW/code_14B0.c
View File

@@ -79,7 +79,7 @@ void CCW_func_80387A40(Actor *this) {
local->sfxsourceIdx = sfxsource_createSfxsourceAndReturnIndex();
local->unk18[0] = local->unk18[1] = local->unk18[2] = 0.0f;
sfxsource_setSfxId(local->sfxsourceIdx, 0x3FA);
func_8030DD14(local->sfxsourceIdx, 2);
sfxSource_setunk43_7ByIndex(local->sfxsourceIdx, 2);
sfxsource_playSfxAtVolume(local->sfxsourceIdx, 0.9f);
sfxsource_setSampleRate(local->sfxsourceIdx, 0);
func_803878A0(this, 1);
@@ -116,13 +116,13 @@ void CCW_func_80387A40(Actor *this) {
func_8030DBFC(local->sfxsourceIdx, 0.8f, 0.9f, 0.05f);
sfxsource_set_fade_distances(local->sfxsourceIdx, 500.0f, 1500.0f);
sfxsource_set_position(local->sfxsourceIdx, this->position);
func_8030E2C4(local->sfxsourceIdx);
sfxSource_func_8030E2C4(local->sfxsourceIdx);
sfxsource_setSampleRate(local->sfxsourceIdx, 2000.0f + 8000.0f*(LENGTH_VEC3F(local->unk18)/ local->unk8));
if (!mapSpecificFlags_get(local->unk4->unk2)) {
player_getPosition(sp44);
if (sp44[2] > -600.0f) {
if (!local->unk4->unk3 || !jiggyscore_isCollected(local->unk4->unk3) ) {
gcdialog_showText(local->unk4->unk4, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(local->unk4->unk4, 4, NULL, NULL, NULL, NULL);
mapSpecificFlags_set(local->unk4->unk2, TRUE);
}
}

12
src/CCW/code_160.c
View File

@@ -31,7 +31,7 @@ void CCW_func_80386550(ActorMarker *marker){
if (local->unk0 != NULL) {
actor_collisionOn(marker_getActor(local->unk0));
}
func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 28000);
coMusicPlayer_playMusic(COMUSIC_3D_JIGGY_SPAWN, 28000);
}
void func_803865C4(ActorMarker* marker, enum asset_e text_id, s32 arg2) {
@@ -45,9 +45,9 @@ void func_803865F4(Actor *this, s32 next_state) {
local->unkC = 0.0f;
if (next_state == 2) {
if (!volatileFlag_getAndSet(VOLATILE_FLAG_B5, 1)) {
gcdialog_showText(0xCE2, 4, NULL, this->marker, func_803865C4, NULL);
gcdialog_showDialog(0xCE2, 4, NULL, this->marker, func_803865C4, NULL);
} else {
gcdialog_showText(0xCE3, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCE3, 4, NULL, NULL, NULL, NULL);
func_803865F4(this, 3);
return;
}
@@ -56,7 +56,7 @@ void func_803865F4(Actor *this, s32 next_state) {
if (next_state == 3) {
local->unkC = 0.1f;
func_8025A58C(0, 4000);
func_8025A6EC(COMUSIC_4B_CCW_ZUBBA_FIGHT, 30000);
coMusicPlayer_playMusic(COMUSIC_4B_CCW_ZUBBA_FIGHT, 30000);
}
if (next_state == 4) {
@@ -65,11 +65,11 @@ void func_803865F4(Actor *this, s32 next_state) {
volatileFlag_set(VOLATILE_FLAG_3, 0);
volatileFlag_set(VOLATILE_FLAG_5_FF_MINIGAME_WON, 1);
} else {
gcdialog_showText(0xCE4, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCE4, 4, NULL, NULL, NULL, NULL);
func_8025A58C(-1, 400);
comusic_8025AB44(COMUSIC_4B_CCW_ZUBBA_FIGHT, 0, 400);
func_8025AABC(COMUSIC_4B_CCW_ZUBBA_FIGHT);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(2.0f, 4);
timedFunc_set_1(2.0f, (GenFunction_1)CCW_func_80386550, (s32) this->marker);

4
src/CCW/code_1B20.c
View File

@@ -53,7 +53,7 @@ void func_80387F64(Actor *this, s32 next_state){
}
if (next_state == 2) {
if (map_get() == MAP_43_CCW_SPRING) {
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
fileProgressFlag_set(local->unk0->unk8, TRUE);
skeletalAnim_set(this->unk148, local->unk0->unk4, 0.0f, 6.0f);
@@ -91,7 +91,7 @@ bool func_80388260(ActorMarker *marker, s32 arg1){
}
void CCW_func_80388278(ActorMarker *marker, ActorMarker *other_marker) {
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
void func_803882A4(ActorMarker* marker, ActorMarker *other_marker) {

10
src/CCW/code_2270.c
View File

@@ -48,7 +48,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) {
}
if (next_state == 2) {
if (local->unk0->unk4 != 0) {
gcdialog_showText(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
}
skeletalAnim_set(this->unk148, ASSET_FC_ANIM_GOBI_SPITTING, 0.2f, 3.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
@@ -73,7 +73,7 @@ void CCW_func_8038868C(Actor *this, s32 next_state) {
}
if (next_state == 5) {
if (local->unk0->unk6 != 0) {
gcdialog_showText((s32) local->unk0->unk6, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog((s32) local->unk0->unk6, 4, NULL, NULL, NULL, NULL);
}
skeletalAnim_set(this->unk148, ASSET_FD_ANIM_GOBI2_GETTING_UP, 0.23f, 0.5f);
timed_setStaticCameraToNode(0.0f, 3);
@@ -163,7 +163,7 @@ void chGobiCCW_update(Actor *this) {
player_getPosition(sp48);
if (ml_vec3f_distance(this->position, sp48) < 600.0f) {
if (local->unk0->unk2 != 0) {
gcdialog_showText((s32) local->unk0->unk2, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog((s32) local->unk0->unk2, 4, NULL, NULL, NULL, NULL);
}
this->has_met_before = TRUE;
}
@@ -192,10 +192,10 @@ void chGobiCCW_update(Actor *this) {
if (skeletalAnim_getAnimId(this->unk148) == ASSET_177_ANIM_GOBI_SLEEP) {
skeletalAnim_getProgressRange(this->unk148, &sp44, &sp40);
if ((sp44 < 0.1) && (0.1 <= (f64) sp40)) {
FUNC_8030E8B4(SFX_5E_BANJO_PHEWWW, 0.8f, 15000, this->position, 500, 1500);
sfx_playFadeShorthandDefault(SFX_5E_BANJO_PHEWWW, 0.8f, 15000, this->position, 500, 1500);
}
if ((sp44 < 0.8) && (0.8 <= (f64) sp40)) {
FUNC_8030E8B4(SFX_5D_BANJO_RAAOWW, 0.8f, 15000, this->position, 500, 1500);
sfx_playFadeShorthandDefault(SFX_5D_BANJO_RAAOWW, 0.8f, 15000, this->position, 500, 1500);
}
}

4
src/CCW/code_2B00.c
View File

@@ -112,12 +112,12 @@ void func_803891B0(void* marker) {
func_8030DD90(actor->unk44_31, 0);
sfxsource_setSampleRate(actor->unk44_31, 0x2AF8);
sfxsource_playSfxAtVolume(actor->unk44_31, 0.3f);
func_8030E2C4(actor->unk44_31);
sfxSource_func_8030E2C4(actor->unk44_31);
}
void func_8038921C(void* marker) {
Actor* actor = marker_getActor(reinterpret_cast(ActorMarker*, marker));
func_8030E394(actor->unk44_31);
sfxSource_triggerCallbackByIndex(actor->unk44_31);
sfxsource_freeSfxsourceByIndex(actor->unk44_31);
actor->unk44_31 = 0U;
FUNC_8030E624(SFX_6C_LOCKUP_CLOSING, 1.0f, 25000);

2
src/CCW/code_3050.c
View File

@@ -13,7 +13,7 @@ void func_80389440(Actor *this, s32 next_state) {
void *temp_v0;
if (next_state == 2) {
sfxsource_play(SFX_AA_BGS_EGG_BREAKING_1, 28000);
gcsfx_playAtSampleRate(SFX_AA_BGS_EGG_BREAKING_1, 28000);
this->marker->propPtr->unk8_3 = FALSE;
fileProgressFlag_set(FILEPROG_E6_SPRING_EYRIE_HATCHED, TRUE);
skeletalAnim_set(this->unk148, 0x187, 0.0f, 2.0f);

8
src/CCW/code_3310.c
View File

@@ -153,14 +153,14 @@ void func_803897B8(Actor *this, s32 next_state) {
skeletalAnim_set(this->unk148, local->unk0->unk14, 0.5f, 8.5f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
if (local->unk0->map_id == MAP_43_CCW_SPRING) {
gcdialog_showText(0xCD6, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCD6, 4, NULL, NULL, NULL, NULL);
skeletalAnim_setCallback_0(this->unk148, 0.65f, &func_80389798);
}
if (local->unk0->map_id == MAP_44_CCW_SUMMER) {
gcdialog_showText(0xCD9, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCD9, 4, NULL, NULL, NULL, NULL);
}
if (local->unk0->map_id == MAP_45_CCW_AUTUMN) {
gcdialog_showText(0xCDB, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCDB, 4, NULL, NULL, NULL, NULL);
}
local->unk8 = local->unk0->unk18;
}
@@ -274,7 +274,7 @@ void CCW_func_80389BFC(Actor *this) {
if ((local->unk0->unkE != 0) && (carriedObj_getActorId() == ACTOR_2A2_CATERPILLAR) && (ml_vec3f_distance(this->position, sp4C) < 1010.0f) && (player_throwCarriedObject() != 0)) {
player_setThrowTargetPosition(D_8038FDE0);
if ((local->unk0->map_id == MAP_44_CCW_SUMMER) && (local->unk4 == 0)) {
gcdialog_showText(0xCD8, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCD8, 4, NULL, NULL, NULL, NULL);
}
local->unk4++;
if (local->unk4 < local->unk0->unk25) {

6
src/CCW/code_3DA0.c
View File

@@ -54,7 +54,7 @@ void chcaterpillar_setState(Actor *this, s32 next_state) {
local->unk24 = 0.0f;
}
if (next_state == 4) {
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
marker_despawn(this->marker);
}
if (next_state == 5) {
@@ -153,10 +153,10 @@ void chcaterpillar_update(Actor *this){
if(ml_vec3f_distance(this->position, sp74) < 50.0f){
func_8028F030(ACTOR_2A2_CATERPILLAR);
if(!volatileFlag_get(VOLATILE_FLAG_B2)){
gcdialog_showText(ASSET_CC7_DIALOG_UNKNOWN, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_CC7_DIALOG_UNKNOWN, 4, NULL, NULL, NULL, NULL);
volatileFlag_set(VOLATILE_FLAG_B2, TRUE);
}
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 0x1f4, 0x9c4);
sfx_playFadeShorthandDefault(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 0x1f4, 0x9c4);
marker_despawn(this->marker);
}
}//L8038A794

2
src/CCW/code_4530.c
View File

@@ -44,7 +44,7 @@ void func_8038A950(Actor *this, s32 next_state) {
skeletalAnim_set(this->unk148, 0x199, 0.0f, 6.5f);
}
if (next_state == 2) {
gcdialog_showText(0xCDC, 0xA, this->position, this->marker, func_8038A920, NULL);
gcdialog_showDialog(0xCDC, 0xA, this->position, this->marker, func_8038A920, NULL);
}
if (next_state == 3) {
skeletalAnim_set(this->unk148, 0x19A, 0.0f, 7.0f);

2
src/CCW/code_4960.c
View File

@@ -28,7 +28,7 @@ Struct_CCW_4960_0 D_8038F254[] = {
/* .code */
void func_8038AD50(Actor *this, s32 next_state) {
if (next_state == 2) {
gcdialog_showText(0xCDD, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCDD, 0, NULL, NULL, NULL, NULL);
if (this->state == 1) {
mapSpecificFlags_set(6, 0);
timed_setStaticCameraToNode(0.0f, 1);

2
src/CCW/code_4D00.c
View File

@@ -90,7 +90,7 @@ void func_8038B19C(Actor *this) {
}
if (!this->has_met_before && func_803292E0(this)) {
this->has_met_before = TRUE;
gcdialog_showText(0xCC8, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCC8, 0, NULL, NULL, NULL, NULL);
}
func_8028E668(this->position, 300.0f, -50.0f, 120.0f);
}

2
src/CCW/code_50D0.c
View File

@@ -92,7 +92,7 @@ void func_8038B87C(Actor *this) {
}
if (!this->has_met_before && func_803292E0(this)) {
this->has_met_before = TRUE;
gcdialog_showText(0xCC9, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCC9, 0, NULL, NULL, NULL, NULL);
}
func_8028E668(this->position, 300.0f, -50.0f, 120.0f);
}

8
src/CCW/code_5540.c
View File

@@ -49,7 +49,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 0xB);
gcdialog_showText(0xCCC, 0x20, this->position, NULL, NULL, NULL);
gcdialog_showDialog(0xCCC, 0x20, this->position, NULL, NULL, NULL);
}
if (next_state == NABNUT_STATE_4_THANK_PLAYER) {
@@ -135,13 +135,13 @@ void chnabnut_update(Actor *this) {
player_getPosition(sp30);
if (!this->has_met_before && (ml_vec3f_distance(this->position, sp30) < 400.0f)) {
this->has_met_before = TRUE;
gcdialog_showText(0xCCA, 0xE, this->position, NULL, NULL, NULL);
gcdialog_showDialog(0xCCA, 0xE, this->position, NULL, NULL, NULL);
}
if (item_getCount(ITEM_23_ACORNS) > 0) {
func_80258A4C(this->position, this->yaw - 90.0f, sp30, &sp2C, &sp28, &sp24);
this->yaw += sp24 * 10.0f;
}
if (this->has_met_before && !func_803114B0()) {
if (this->has_met_before && !gcdialog_hasCurrentTextId()) {
player_setCarryObjectPoseInCylinder(this->position, 500.0f, 200.0f, ACTOR_2A9_ACORN, &this);
if ((carriedObj_getActorId() == ACTOR_2A9_ACORN) && (ml_vec3f_distance(this->position, sp30) < 300.0f) && player_throwCarriedObject()) {
player_setThrowTargetPosition(D_8038F350);
@@ -149,7 +149,7 @@ void chnabnut_update(Actor *this) {
if (local->returned_acorn_count == 6) {
chnabnut_setState(this, NABNUT_STATE_2_WAIT);
} else if (item_getCount(ITEM_23_ACORNS) == 1) {
gcdialog_showText(0xCCB, 0x20, this->position, NULL, NULL, NULL);
gcdialog_showDialog(0xCCB, 0x20, this->position, NULL, NULL, NULL);
}
}
}

2
src/CCW/code_5BF0.c
View File

@@ -116,7 +116,7 @@ void func_8038C41C(Actor *this) {
player_getPosition(sp2C);
if (!this->has_met_before && (ml_vec3f_distance(this->position, sp2C) < 400.0f)) {
this->has_met_before = TRUE;
gcdialog_showText(0xCCD, 0, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCCD, 0, NULL, NULL, NULL, NULL);
}
}
}

4
src/CCW/code_61E0.c
View File

@@ -43,7 +43,7 @@ void CCW_func_8038C6A0(Actor *this, s32 next_state) {
local->unk18 = 0.0f;
}
if (next_state == 4) {
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
marker_despawn(this->marker);
}
if (next_state == 5) {
@@ -75,7 +75,7 @@ void func_8038C7A8(Actor *this) {
player_getPosition(sp38);
if (ml_vec3f_distance(this->position, sp38) < 50.0f) {
func_8028F030(0x2A9);
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 500, 2500);
sfx_playFadeShorthandDefault(SFX_C5_TWINKLY_POP, 1.0f, 25000, this->position, 500, 2500);
CCW_func_8038C6A0(this, 5);
}
}

2
src/CCW/code_6620.c
View File

@@ -120,7 +120,7 @@ void func_8038CC4C(Actor *this) {
player_getPosition(sp38);
if (ml_vec3f_distance(this->position, sp38) < 900.0f) {
if (local->unk0->map_id != MAP_46_CCW_WINTER || func_8028F2FC()) {
gcdialog_showText(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
this->has_met_before = TRUE;
}
}

4
src/CCW/code_6AC0.c
View File

@@ -61,7 +61,7 @@ void func_8038CEB0(Actor *this, s32 next_state) {
this->marker->propPtr->unk8_3 = FALSE;
skeletalAnim_set(this->unk148, 0x1A7, 0.2f, 3.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
gcdialog_showText(0xCD0, 0x24, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCD0, 0x24, NULL, NULL, NULL, NULL);
}
if (next_state == 3) {
skeletalAnim_set(this->unk148, 0x1A8, 0.2f, 0.5f);
@@ -117,7 +117,7 @@ void func_8038CFB4(Actor *this) {
if (!this->has_met_before) {
player_getPosition(sp60);
if (ml_vec3f_distance(this->position, sp60) < 900.0f) {
gcdialog_showText(0xCCF, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xCCF, 4, NULL, NULL, NULL, NULL);
this->has_met_before = TRUE;
}
}

4
src/CCW/code_6EC0.c
View File

@@ -71,10 +71,10 @@ void func_8038D368(Actor *this) {
player_getPosition(plyr_pos);
if (ml_vec3f_distance(this->position, plyr_pos) < 600.0f) {
if (!jiggyscore_isCollected(JIGGY_4B_CCW_GNAWTY)) {
gcdialog_showText(local->unk0->unk2, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(local->unk0->unk2, 4, NULL, NULL, NULL, NULL);
} else {
if (local->unk0->unk4) {
gcdialog_showText(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(local->unk0->unk4, 4, NULL, NULL, NULL, NULL);
}
}
this->has_met_before = TRUE;

4
src/CCW/code_7BF0.c
View File

@@ -97,7 +97,7 @@ void func_8038E0C8(Actor *this) {
this->unk38_31--;
break;
}
if( func_80329530(this, 0x2A8)
if( subaddie_playerIsWithinSphereAndActive(this, 0x2A8)
&& (this->unk38_31 == 0)
&& (player_getTransformation() == TRANSFORM_1_BANJO)
) {
@@ -114,7 +114,7 @@ void func_8038E0C8(Actor *this) {
|| actor_animationIsAt(this, 0.47f)
|| actor_animationIsAt(this, 0.78f)
) {
FUNC_8030E8B4(SFX_80_YUMYUM_CLACK, 1.0f, 32000, this->position, 1500, 3000);
sfx_playFadeShorthandDefault(SFX_80_YUMYUM_CLACK, 1.0f, 32000, this->position, 1500, 3000);
}
break;
}

8
src/CCW/code_950.c
View File

@@ -43,13 +43,13 @@ void chwasp_setState(Actor *this, s32 next_state) {
}
}
if (next_state == 3) {
FUNC_8030E8B4(SFX_1F_HITTING_AN_ENEMY_3, 1.2f, 32200, this->position, 500, 3000);
sfx_playFadeShorthandDefault(SFX_1F_HITTING_AN_ENEMY_3, 1.2f, 32200, this->position, 500, 3000);
func_80324D54(randf2(0.1f, 0.4f), 0x3FC, randf2(0.95f, 1.1f), 32000, this->position, 500.0f, 3000.0f);
actor_collisionOff(this);
}
if (next_state == 4) {
skeletalAnim_set(this->unk148, ASSET_171_ANIM_ZUBBA_DIE, 0.1f, 0.2f);
FUNC_8030E8B4(SFX_1F_HITTING_AN_ENEMY_3, 1.2f, 32200, this->position, 500, 3000);
sfx_playFadeShorthandDefault(SFX_1F_HITTING_AN_ENEMY_3, 1.2f, 32200, this->position, 500, 3000);
func_80324D54(0.1f, 0x66, randf2(1.6f, 1.7f), 32000, this->position, 500.0f, 3000.0f);
func_803867C8(local->unk4);
actor_collisionOff(this);
@@ -117,7 +117,7 @@ void chwasp_update(Actor *this) {
local->unk4 = 0;
local->unk14 = 1000.0f;
sfxsource_setSfxId(local->sfxsourceIdx, 0x3FA);
func_8030DD14(local->sfxsourceIdx, 2);
sfxSource_setunk43_7ByIndex(local->sfxsourceIdx, 2);
sfxsource_playSfxAtVolume(local->sfxsourceIdx, 0.9f);
sfxsource_setSampleRate(local->sfxsourceIdx, 0);
marker_setCollisionScripts(this->marker, func_80387124, NULL, CCW_func_80387150);
@@ -210,6 +210,6 @@ void chwasp_update(Actor *this) {
}
sfxsource_set_fade_distances(local->sfxsourceIdx, 500.0f, 1500.0f);
sfxsource_set_position(local->sfxsourceIdx, this->position);
func_8030E2C4(local->sfxsourceIdx);
sfxSource_func_8030E2C4(local->sfxsourceIdx);
sfxsource_setSampleRate(local->sfxsourceIdx, (s32) ((local->unk18 / local->unk14) * 10000.0f));
}

20
src/FP/ch/bearcub.c
View File

@@ -50,7 +50,7 @@ Struct_FP_3E00 D_80391E80[] ={
void func_8038A1F0(Actor **this_ptr, enum marker_e carried_obj_marker_id, enum actor_e actor_id, enum actor_e arg3){
player_setCarryObjectPoseInHorizontalRadius((*this_ptr)->position, 600.0f, actor_id, this_ptr);
if (!func_80329530(*this_ptr, 400)) {
if (!subaddie_playerIsWithinSphereAndActive(*this_ptr, 400)) {
return;
}
@@ -79,10 +79,10 @@ void func_8038A274(Actor *this){
void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(text_id == 0xc19){
func_802BAFE4(0x25);
gcStaticCamera_activate(0x25);
jiggy_spawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
coMusicPlayer_playMusic(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
}
@@ -134,13 +134,13 @@ void func_8038A384(Actor *this){
switch(this->state){
case 1://L8038A5B0
if(!levelSpecificFlags_get(LEVEL_FLAG_19_FP_UNKNOWN) && func_80329530(this, 0xfa)){
if(!levelSpecificFlags_get(LEVEL_FLAG_19_FP_UNKNOWN) && subaddie_playerIsWithinSphereAndActive(this, 0xfa)){
if(player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT){
if(sp34 == 0
&& !jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)
&& !jiggyscore_isSpawned(JIGGY_2C_FP_BOGGY_3)
){
if (gcdialog_showText(ASSET_C1A_DIALOG_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C1A_DIALOG_UNKNOWN, 0x2a, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_19_FP_UNKNOWN, TRUE);
}
}
@@ -164,23 +164,23 @@ 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_UNKNOWN) {
gcdialog_showText(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
gcdialog_showDialog(sp38, 0x2f, this->position, this->marker, func_8038A318, NULL);
}
else {
gcdialog_showText(sp38, 0x3, this->position, this->marker, func_8038A318, NULL);
gcdialog_showDialog(sp38, 0x3, this->position, this->marker, func_8038A318, NULL);
}
}
else{//L8038A73C
func_8038A1F0(&this, D_80391E80[sp3C].unk4, D_80391E80[sp3C].unk8, D_80391E80[sp3C].unkC);
if( actor_animationIsAt(this, 0.45f)
&& !func_803114B0()
&& !gcdialog_hasCurrentTextId()
){
func_8030E878(SFX_B1_BOGGY_KID_CRYING, randf2(0.9f, 1.1f), 32000, this->position, 150.0f, 700.0f);
}
}//L8038A7DC
break;
case 2://L8038A7C0
if(!func_803114B0()){
if(!gcdialog_hasCurrentTextId()){
func_8038A274(this);
}
break;

18
src/FP/ch/boggy1.c
View File

@@ -49,7 +49,7 @@ Actor *func_803875E0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_803876A4(Actor *this){
subaddie_set_state_with_direction(this, 2, 0.0001f, 1);
actor_playAnimationOnce(this);
FUNC_8030E8B4(SFX_8E_GRUNTLING_DAMAGE, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_8E_GRUNTLING_DAMAGE, 1.0f, 32000, this->position, 1250, 2500);
}
void func_803876F8(Actor *this){
@@ -86,7 +86,7 @@ void func_80387828(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if (text_id == 0xc00) {
gcdialog_showText(ASSET_C2B_DIALOG_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8);
gcdialog_showDialog(ASSET_C2B_DIALOG_UNKNOWN, 0xf, NULL, this->marker, NULL, func_803877A8);
}
}
@@ -147,9 +147,9 @@ void func_8038794C(Actor *this){
break;
}//L80387B38
if(!this->has_met_before && func_80329530(this, 0x1f4)){
if(!this->has_met_before && subaddie_playerIsWithinSphereAndActive(this, 0x1f4)){
if(!player_movementGroup() || player_movementGroup() == BSGROUP_8_TROT){
if (gcdialog_showText(ASSET_BFF_DIALOG_UNKNOWN, 0x2a, this->position, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_BFF_DIALOG_UNKNOWN, 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);
}
@@ -162,19 +162,19 @@ void func_8038794C(Actor *this){
case 2://L80387BEC
func_8028FC8C(this->position);
if(actor_animationIsAt(this, 0.1f)){
FUNC_8030E8B4(SFX_F6_BLUBBER_TALKING_2, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_F6_BLUBBER_TALKING_2, 1.0f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.24f)){//L80387C2C
FUNC_8030E8B4(SFX_A0_COUGHING, 0.7f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.7f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.52f)){//L80387C60
FUNC_8030E8B4(SFX_A0_COUGHING, 0.67f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.67f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.61f)){//L80387C94
FUNC_8030E8B4(SFX_A0_COUGHING, 0.64f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.64f, 32000, this->position, 1250, 2500);
}
else if(actor_animationIsAt(this, 0.69f)){//L80387CC8
FUNC_8030E8B4(SFX_A0_COUGHING, 0.61f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_A0_COUGHING, 0.61f, 32000, this->position, 1250, 2500);
}//L80387CF4
if(actor_animationIsAt(this, 0.9999f)){

28
src/FP/ch/boggy2.c
View File

@@ -124,10 +124,10 @@ void func_80388A50(Actor *this){
void func_80388A94(Actor *this){
func_80388A50(this);
if(mapSpecificFlags_get(6)){
gcdialog_showText(ASSET_C0A_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C0A_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showText(ASSET_C09_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C09_DIALOG_UNKNOWN, 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(5)){
gcdialog_showText(ASSET_C05_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C05_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else{
gcdialog_showText(ASSET_C02_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C02_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
}
else{//L80388BB8
if(!volatileFlag_get(VOLATILE_FLAG_B3)){
if(gcdialog_showText(ASSET_C01_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(ASSET_C01_DIALOG_UNKNOWN, 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_showText(ASSET_C08_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
if(gcdialog_showDialog(ASSET_C08_DIALOG_UNKNOWN, 0xe, this->position, this->marker, func_80388D70, NULL)){
volatileFlag_set(VOLATILE_FLAG_B4, TRUE);
func_80388A50(this);
}
@@ -180,12 +180,12 @@ bool FP_func_80388CA0(Actor *this){
if(player_movementGroup() != BSGROUP_0_NONE && player_movementGroup() != BSGROUP_8_TROT)
return FALSE;
if( !func_80329530(this, 1100) ){
if( !subaddie_playerIsWithinSphereAndActive(this, 1100) ){
local->unk18 = TRUE;
}
sp20 = this->unk10_12;
this->unk10_12 = func_80329530(this, 0x1C2);
this->unk10_12 = subaddie_playerIsWithinSphereAndActive(this, 0x1C2);
return (sp20 == 0 && this->unk10_12 && local->unk18);
}
@@ -199,7 +199,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
case 0xc06:
case 0xc28:
case 0xc29://L80388DC4
func_8025A6EC(COMUSIC_3A_FP_BOGGY_RACE, 25000);
coMusicPlayer_playMusic(COMUSIC_3A_FP_BOGGY_RACE, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
func_802BE720();
@@ -262,7 +262,7 @@ void func_80388F90(Actor *this){
func_8030DB04(this->unk44_31, 32000, this->position, 1000.0f, 4000.0f);
sfxsource_playSfxAtVolume(this->unk44_31, local->unk8);
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}
bool func_80388FE8(Actor *this, f32 arg1, f32 arg2){
@@ -467,24 +467,24 @@ void func_803896FC(Actor *this){
else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && player_movementGroup() == BSGROUP_C_WALRUS_SLED){
FP_func_803888E4(this);
}
else if( func_80329530(this, 0x1C2)
else if( subaddie_playerIsWithinSphereAndActive(this, 0x1C2)
&& player_movementGroup() == BSGROUP_0_NONE
&& func_8028F20C()
&& func_8028EFC8()
&& sp3C[FACE_BUTTON(BUTTON_B)] == 1
&& !func_803114B0()
&& !gcdialog_hasCurrentTextId()
){
if( local->unk19 == 1
&& player_getTransformation() != TRANSFORM_4_WALRUS
&& volatileFlag_get(VOLATILE_FLAG_B3)
){
gcdialog_showText(ASSET_C01_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C01_DIALOG_UNKNOWN, 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_showText(ASSET_C08_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
gcdialog_showDialog(ASSET_C08_DIALOG_UNKNOWN, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( player_getTransformation() != TRANSFORM_4_WALRUS){
func_80388A94(this);

8
src/FP/ch/boggy3.c
View File

@@ -26,7 +26,7 @@ Actor *func_80390290(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(this->unk38_31) return this;
if(func_803114C4() == 0xC1F || func_803114C4() == 0xC1E){
if(gcdialog_getCurrentTextId() == 0xC1F || gcdialog_getCurrentTextId() == 0xC1E){
sp18 = 1;
}
func_8033A45C(1, 0);
@@ -73,18 +73,18 @@ void func_80390388(Actor *this){
this->has_met_before = TRUE;
}
if( func_80329530(this, 0xFA)
if( subaddie_playerIsWithinSphereAndActive(this, 0xFA)
&& (player_movementGroup() == BSGROUP_0_NONE || player_movementGroup() == BSGROUP_8_TROT)
){
if(0.0f == this->unk1C[0] && func_80390334()){
if(gcdialog_showText(ASSET_C1F_DIALOG_UNKNOWN, 0xb, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_C1F_DIALOG_BOGGY_NEEDS_SLEEP, 0xb, this->position, NULL, NULL, NULL)){
this->has_met_before = TRUE;
this->unk1C[0] = 1.0f;
}
}
else{
if( !this->has_met_before ){
if(gcdialog_showText(ASSET_C1E_DIALOG_UNKNOWN, 0x2b, this->position, NULL, NULL, NULL)){
if(gcdialog_showDialog(ASSET_C1E_DIALOG_BOGGY_LOOK_FOR_PRESENTS, 0x2b, this->position, NULL, NULL, NULL)){
this->has_met_before = TRUE;
}
}

12
src/FP/ch/cavewozza.c
View File

@@ -49,11 +49,11 @@ void func_80390630(Actor *this){
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 1.0f);
if(!func_803114B0()){
if(!gcdialog_hasCurrentTextId()){
if( actor_animationIsAt(this, 0.09f)
|| actor_animationIsAt(this, 0.19f)
){
FUNC_8030E8B4(SFX_88_WOZZA_NOISE, 1.0f, 22000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_88_WOZZA_NOISE, 1.0f, 22000, this->position, 500, 2000);
}
if( actor_animationIsAt(this, 0.68f)
@@ -62,21 +62,21 @@ void func_80390630(Actor *this){
|| actor_animationIsAt(this, 0.92f)
){
FUNC_8030E8B4(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
}
}
if (func_80329530(this, 350)) {
if (subaddie_playerIsWithinSphereAndActive(this, 350)) {
if (player_getTransformation() == TRANSFORM_4_WALRUS) {
if (!levelSpecificFlags_get(LEVEL_FLAG_31_FP_UNKNOWN)) {
if (gcdialog_showText(ASSET_C27_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C27_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_31_FP_UNKNOWN, TRUE);
}
}
}
else {
if (!levelSpecificFlags_get(LEVEL_FLAG_32_FP_UNKNOWN)) {
if (gcdialog_showText(ASSET_C26_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
if (gcdialog_showDialog(ASSET_C26_DIALOG_UNKNOWN, 0x23, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(LEVEL_FLAG_32_FP_UNKNOWN, TRUE);
}
}

4
src/FP/ch/scarfsled.c
View File

@@ -58,7 +58,7 @@ void __chScarfSled_func_8038655C(Actor *this){
this->unk10_12 = FALSE;
if(!tmp_bool){
if(tmp != 0){
func_8030E6A4(SFX_19_BANJO_LANDING_08, func_8030E200(this->unk44_31), 0x55f0);
gcsfx_playWithPitch(SFX_19_BANJO_LANDING_08, func_8030E200(this->unk44_31), 0x55f0);
}
}
else{
@@ -67,7 +67,7 @@ void __chScarfSled_func_8038655C(Actor *this){
func_8030E0FC(this->unk44_31, 0.9f, 1.5f, 1.2f);
}
this->unk10_12 = TRUE;
func_8030E2C4(*((u8*)this + 0x44));
sfxSource_func_8030E2C4(*((u8*)this + 0x44));
}
}

4
src/FP/ch/snowmanbutton.c
View File

@@ -52,7 +52,7 @@ void FP_func_80386BEC(Actor *this){
player_getPosition(plyr_pos);
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_collisionOff(this);
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
FUNC_8030E624(SFX_90_SWITCH_PRESS, 1.0f, 32000);
maSnowButton_decRemaining();
particleEmitter_setRGB(pCtrl, D_80391B44);
@@ -78,7 +78,7 @@ void FP_func_80386CF8(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
this->pitch += (f32)(this->unkF4_8 - 1);
this->pitch += (f32)(this->actorTypeSpecificField - 1);
}
if(!this->volatile_initialized){

18
src/FP/ch/twinkly.c
View File

@@ -106,7 +106,7 @@ void func_8038C260(f32 position[3], s32 count, enum asset_e model_id){
particleEmitter_setFade(pCtrl, 0.0f, 0.3f);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 0);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
particleEmitter_emitN(pCtrl, count);
}
@@ -232,10 +232,10 @@ void func_8038C8F0(ActorMarker *marker){
s32 pad;
this = marker_getActor(reinterpret_cast(ActorMarker *, marker));
other = marker_getActor(this->unk100);
other = marker_getActor(this->partnerActor);
muncher = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392070, 170);
muncher->unk100 = other->marker;
muncher->unkF4_8 = 1;
muncher->partnerActor = other->marker;
muncher->actorTypeSpecificField = 1;
if(pad);
}
@@ -255,7 +255,7 @@ void func_8038C9A0(Actor *this){
if(this->marker->id == 0x200){
sp30 = func_8034C2C4(this->marker, 0x190);
}
other = marker_getActor(this->unk100);
other = marker_getActor(this->partnerActor);
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
@@ -279,7 +279,7 @@ void func_8038C9A0(Actor *this){
if(1.0f == other->unk1C[1]){
func_8038C398(this->position, this->marker->id);
FUNC_8030E8B4(SFX_7B_ICE_BREAKING_1, 1.0f, 32000, this->position, 0x6d6, 0xdac);\
sfx_playFadeShorthandDefault(SFX_7B_ICE_BREAKING_1, 1.0f, 32000, this->position, 0x6d6, 0xdac);\
marker_despawn(this->marker);
return;
}
@@ -326,7 +326,7 @@ void func_8038C9A0(Actor *this){
if(other->unk38_31 != 0){
other->unk38_31--;
}
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
marker_despawn(this->marker);
}
break;
@@ -336,11 +336,11 @@ void func_8038C9A0(Actor *this){
if(this->unk1C[1] <= this->position_y){
this->position_y = this->unk1C[1];
if(!fileProgressFlag_get(FILEPROG_82_MET_TWINKLIES)){
gcdialog_showText(0xc12, 0x2a, this->position, this->marker, func_8038C94C, NULL);
gcdialog_showDialog(0xc12, 0x2a, this->position, this->marker, func_8038C94C, NULL);
fileProgressFlag_set(FILEPROG_82_MET_TWINKLIES, TRUE);
}
else{
gcdialog_showText(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
gcdialog_showDialog(0xc25, 0x2b, this->position, this->marker, func_8038C94C, NULL);
}
subaddie_set_state(this, 5);
this->pitch -= 3.0f;

22
src/FP/ch/twinklybox.c
View File

@@ -176,8 +176,8 @@ void func_8038D294(ActorMarker *marker){
func_8038CF54(this->position, 12, ASSET_4D4_MODEL_TWINKLY_BOX_PAPER_SHARD);
func_8038D01C(this->position, 12, ASSET_700_SPRITE_DUST);
this->velocity[1] = 0.0f;
FUNC_8030E8B4(SFX_30_MAGIC_POOF, 1.0f, 32000, this->position, 1000, 3500);
gcdialog_showText(0xc13, 0, NULL, NULL, NULL, NULL);
sfx_playFadeShorthandDefault(SFX_30_MAGIC_POOF, 1.0f, 32000, this->position, 1000, 3500);
gcdialog_showDialog(0xc13, 0, NULL, NULL, NULL, NULL);
}
void func_8038D324(Actor *this){
@@ -210,9 +210,9 @@ void func_8038D41C(ActorMarker *marker){
Actor *actor;
actor = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392354, 170);
actor->unk100 = _marker;
actor->partnerActor = _marker;
actor = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392360, 170);
actor->unk100 = _marker;
actor->partnerActor = _marker;
if(pad[0]);
}
@@ -233,7 +233,7 @@ void func_8038D474(ActorMarker *marker){
}
actor->unk1C[0] += 1.0;
child = spawn_child_actor(D_8039236C[(s32)actor->unk1C[0]], &actor);
child->unk100 = actor->marker;
child->partnerActor = actor->marker;
}
void func_8038D51C(ActorMarker *marker){
@@ -263,7 +263,7 @@ void func_8038D5C8(ActorMarker *this_marker, ActorMarker *other_marker){
func_8028F490(D_8039237C);
func_8028F8F8(7, 1);
this->unk1C[1] = 0.0f;
func_8025A6EC(COMUSIC_68_TWINKLY_MINIGAME, 25000);
coMusicPlayer_playMusic(COMUSIC_68_TWINKLY_MINIGAME, 25000);
func_8025A58C(0, 4000);
core1_ce60_incOrDecCounter(FALSE);
this->unk1C[2] = 428571.0f;
@@ -316,7 +316,7 @@ void func_8038D6C8(Actor *this){
switch (this->state)
{
case 1: //L8038D89C
if(!func_80329530(this, 800))
if(!subaddie_playerIsWithinSphereAndActive(this, 800))
break;
if(!(globalTimer_getTime() & 1))
@@ -346,7 +346,7 @@ void func_8038D6C8(Actor *this){
|| actor_animationIsAt(this, 0.63f)
|| actor_animationIsAt(this, 0.81f)
){
FUNC_8030E8B4(SFX_98_DEAF_THUD, 1.0f, 32000, this->position, 400, 2000);
sfx_playFadeShorthandDefault(SFX_98_DEAF_THUD, 1.0f, 32000, this->position, 400, 2000);
}
break;
@@ -382,7 +382,7 @@ void func_8038D6C8(Actor *this){
func_8025AEA0(COMUSIC_68_TWINKLY_MINIGAME, (s32)this->unk1C[2]);
if(item_getCount(ITEM_24_TWINKLY_SCORE) == 0){
subaddie_set_state_with_direction(this, 1, 0.001f, 1);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_8038D3D8();
func_80324E38(0.0f, 3);
timedFunc_set_1(1.3f, (GenFunction_1)func_8038D51C, (s32)this->marker);
@@ -397,7 +397,7 @@ void func_8038D6C8(Actor *this){
actor_playAnimationOnce(this);
this->unk38_31 = 0;
item_set(ITEM_6_HOURGLASS, FALSE);
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
coMusicPlayer_playMusic(COMUSIC_3C_MINIGAME_LOSS, 28000);
func_8028F8F8(7, FALSE);
this->unk1C[1] = 1.0f;
func_8038D3D8();
@@ -426,7 +426,7 @@ bool func_8038DD14(void){
bool func_8038DD34(ActorMarker *marker){
Actor *this = marker_getActor(marker);
if(func_80329530(this, 800))
if(subaddie_playerIsWithinSphereAndActive(this, 800))
return TRUE;
return FALSE;
}

26
src/FP/ch/twinklymuncher.c
View File

@@ -59,8 +59,8 @@ void func_8038DEB8(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if(this->state != 1 && this->state != 5){
func_8038DE78(this);
FUNC_8030E8B4(SFX_87_TANKTUP_OOOHW, 1.6f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_87_TANKTUP_OOOHW, 1.6f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1250, 2500);
}
}
@@ -108,10 +108,10 @@ void func_8038E094(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
anctrl_setAnimTimer(this->anctrl, 0.99999f);
this->lifetime_value = 0.0f;
if(this->unkF4_8 == 1){
if(this->actorTypeSpecificField == 1){
func_8038DDC8(this);
}
if(this->unkF4_8 == 2){
if(this->actorTypeSpecificField == 2){
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -2){
func_8038DDC8(this);
}
@@ -121,13 +121,13 @@ void func_8038E094(Actor *this){
}
}
}//L8038E180
if(this->unk100){
sp38 = marker_getActor(this->unk100);
if(this->partnerActor){
sp38 = marker_getActor(this->partnerActor);
if(sp38->unk1C[1] == 1.0f){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_13_COMPLETED_TWINKLIES_MINIGAME)){
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_showText(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
gcdialog_showDialog(ASSET_C15_DIALOG_TWINKLIE_MINIGAME_LOST, 0x2b, this->position, this->marker, func_8038E040, NULL);
this->velocity[0] = 1.0f;
subaddie_set_state_with_direction(this, 6, 0.03f, 1);
actor_loopAnimation(this);
@@ -173,10 +173,10 @@ void func_8038E094(Actor *this){
}
if(actor_animationIsAt(this, 0.15f))
FUNC_8030E8B4(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_C5_TWINKLY_POP, 1.0f, 32000, this->position, 1250, 2500);
if(actor_animationIsAt(this, 0.35f))
FUNC_8030E8B4(SFX_C4_TWINKLY_MUNCHER_GRR, 1.2f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_C4_TWINKLY_MUNCHER_GRR, 1.2f, 32000, this->position, 1250, 2500);
if(actor_animationIsAt(this, 0.97f))
func_8038DE08(this);
@@ -197,11 +197,11 @@ void func_8038E094(Actor *this){
if(sp38 && sp38->marker->id == this->unk38_31){
if(actor_animationIsAt(this, 0.23)){
func_8038C398(sp38->position, sp38->marker->id);
FUNC_8030E8B4(SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_27_JINJO_HI, 1.6f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_110_TWINKLY_DEATH, 1.0f, 32000, this->position, 1250, 2500);
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(0xa) && gcdialog_showText(0xc16, 0, NULL, NULL, NULL, NULL)){
if( !mapSpecificFlags_get(0xa) && gcdialog_showDialog(0xc16, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(0xa, TRUE);
}
}

28
src/FP/ch/wozza.c
View File

@@ -101,7 +101,7 @@ void func_8038F41C(Actor *this){
}
void func_8038F454(Actor *this){
if(!mapSpecificFlags_get(7) && player_movementGroup() != BSGROUP_A_FLYING && func_80329530(this, 1000) ){
if(!mapSpecificFlags_get(7) && player_movementGroup() != BSGROUP_A_FLYING && subaddie_playerIsWithinSphereAndActive(this, 1000) ){
mapSpecificFlags_set(7, TRUE);
subaddie_set_state(this, 2);
actor_loopAnimation(this);
@@ -136,7 +136,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
this->yaw_ideal = (f32) func_803297C8(this, arg1);
func_80328FB0(this, arg3);
if(actor_animationIsAt(this, 0.9f)){
FUNC_8030E8B4(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_3F2_UNKNOWN, 0.8f, 24000, this->position, 500, 2000);
}
this->actor_specific_1_f = (1.0f- sp24)*arg2;
func_80329054(this, 2);
@@ -164,8 +164,8 @@ void FP_func_8038F758(ActorMarker *marker){
s32 pad;
jiggy->yaw = this->yaw;
this->unk100 = jiggy->marker;
jiggy->unk100 = this->marker;
this->partnerActor = jiggy->marker;
jiggy->partnerActor = this->marker;
}
@@ -222,13 +222,13 @@ void FP_func_8038F7AC(Actor *this){
break;
}
if(func_80329530(this, 1300) && player_getTransformation() == TRANSFORM_4_WALRUS){
if(subaddie_playerIsWithinSphereAndActive(this, 1300) && player_getTransformation() == TRANSFORM_4_WALRUS){
subaddie_set_state_with_direction(this, 8, 0.02f, 1);
actor_loopAnimation(this);
break;
}
if(func_80329530(this, 1000) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
if(subaddie_playerIsWithinSphereAndActive(this, 1000) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
func_8038F454(this);
break;
}
@@ -246,7 +246,7 @@ void FP_func_8038F7AC(Actor *this){
break;
case 4: //L8038FAD0
if(!func_80329530(this, 2000) && player_movementGroup() != BSGROUP_A_FLYING){
if(!subaddie_playerIsWithinSphereAndActive(this, 2000) && player_movementGroup() != BSGROUP_A_FLYING){
func_8038F560(this);
break;
}
@@ -267,13 +267,13 @@ void FP_func_8038F7AC(Actor *this){
case 6: //L8038FBA8
FP_func_8038F6C4(this, local->unk18, 1.0f);
if( func_80329530(this, 1700) ) break;
if( subaddie_playerIsWithinSphereAndActive(this, 1700) ) break;
if( player_movementGroup() == BSGROUP_A_FLYING ) break;
func_8038F560(this);
if(!local->unk30){
if(gcdialog_showText(0xc1d, 0x20, NULL, NULL, NULL, NULL)){
if(gcdialog_showDialog(0xc1d, 0x20, NULL, NULL, NULL, NULL)){
local->unk30 = TRUE;
}
}
@@ -283,7 +283,7 @@ void FP_func_8038F7AC(Actor *this){
if(!FP_func_8038F6C4(this, local->unkC, 4.5f))
break;
if(func_80329530(this, 1000) || player_movementGroup() == BSGROUP_A_FLYING){
if(subaddie_playerIsWithinSphereAndActive(this, 1000) || player_movementGroup() == BSGROUP_A_FLYING){
func_8038F528(this);
break;
}
@@ -299,8 +299,8 @@ void FP_func_8038F7AC(Actor *this){
break;
}
if(func_80329530(this, 500) && !this->has_met_before){
if(gcdialog_showText(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){
if(subaddie_playerIsWithinSphereAndActive(this, 500) && !this->has_met_before){
if(gcdialog_showDialog(0xc1c, 0xAA, this->position, this->marker, func_8038F330, func_8038F3C4)){
timed_setStaticCameraToNode(0.0f, 0x2E);
this->has_met_before = TRUE;
}
@@ -317,13 +317,13 @@ void FP_func_8038F7AC(Actor *this){
func_8038F598(this, 2.0f);
if(!func_803114B0()){
if(!gcdialog_hasCurrentTextId()){
if( actor_animationIsAt(this, 0.02f)
|| actor_animationIsAt(this, 0.14f)
|| actor_animationIsAt(this, 0.28f)
|| actor_animationIsAt(this, 0.42f)
){
FUNC_8030E8B4(SFX_88_WOZZA_NOISE, 1.0f, 32000, this->position, 500, 2000);
sfx_playFadeShorthandDefault(SFX_88_WOZZA_NOISE, 1.0f, 32000, this->position, 500, 2000);
}
}
break;

4
src/FP/ch/wozzasjig.c
View File

@@ -47,8 +47,8 @@ void func_8038FF54(Actor *this){
this->marker->propPtr->unk8_3 = FALSE;
actor_collisionOff(this);
if(this->unk100){
other = marker_getActor(this->unk100);
if(this->partnerActor){
other = marker_getActor(this->partnerActor);
if(this->state != 9){
if(other->state == 9){
subaddie_set_state_with_direction(this, 9, 0.01f, 1);

18
src/FP/ch/xmastree.c
View File

@@ -43,7 +43,7 @@ void __chXmasTree_80386F3C(void){
levelSpecificFlags_set(LEVEL_FLAG_29_FP_UNKNOWN, TRUE);
func_803228D8();
volatileFlag_set(VOLATILE_FLAG_E, 1);
func_802E4078(MAP_53_FP_CHRISTMAS_TREE, 1, 0);
transitionToMap(MAP_53_FP_CHRISTMAS_TREE, 1, 0);
}
void __chXmasTree_80386F84(Actor * this){
@@ -67,9 +67,9 @@ void __chXmasTree_spawnStar(void *marker){
void __chXmasTree_80387038(Actor *this){
if(func_8030E3FC(this->unk44_31))
func_8030E394(this->unk44_31);
sfxSource_triggerCallbackByIndex(this->unk44_31);
sfxsource_playSfxAtVolume(this->unk44_31, randf2(0.9f, 1.1f));
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}
void __chXmasTree_8038709C(Actor *this){
@@ -95,7 +95,7 @@ void chXmasTree_update(Actor *this){
if(this->unk44_31 == 0){
this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex();
sfxsource_setSfxId(this->unk44_31, SFX_415_UNKNOWN);
func_8030DD14(this->unk44_31, 3);
sfxSource_setunk43_7ByIndex(this->unk44_31, 3);
sfxsource_setSampleRate(this->unk44_31, 28000);
}
__spawnQueue_add_0(__chXmasTree_spawnSwitch);
@@ -126,9 +126,9 @@ void chXmasTree_update(Actor *this){
subaddie_set_state(this, 3);
this->lifetime_value = 2.0f;
func_8025A6EC(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
func_802BAFE4(0x1A);
gcdialog_showText(0xC14, 0, NULL, NULL, NULL, NULL);
coMusicPlayer_playMusic(COMUSIC_61_XMAS_TREE_LIGHTS_UP, 28000);
gcStaticCamera_activate(0x1A);
gcdialog_showDialog(0xC14, 0, NULL, NULL, NULL, NULL);
break;
case 3: // L803872F0
@@ -178,8 +178,8 @@ void chXmasTree_update(Actor *this){
this->lifetime_value = 0.1f;
if(!maSlalom_isActive()){
if(!mapSpecificFlags_get(9) || mapSpecificFlags_get(1)){
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
func_802BAFE4(0x1a);
coMusicPlayer_playMusic(COMUSIC_3C_MINIGAME_LOSS, 28000);
gcStaticCamera_activate(0x1a);
this->lifetime_value = 2.0f;
}
}

4
src/FP/ch/xmastreeeggtoll.c
View File

@@ -61,7 +61,7 @@ void func_80390D58(f32 position[3]){
void func_80390E78(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
FUNC_8030E8B4(SFX_96_HOTSAND_EEL_HISS, 1.0f, 32000, this->position, 1000, 2000);
sfx_playFadeShorthandDefault(SFX_96_HOTSAND_EEL_HISS, 1.0f, 32000, this->position, 1000, 2000);
}
void func_80390EB0(Actor *this){
@@ -71,7 +71,7 @@ void func_80390EB0(Actor *this){
marker_setCollisionScripts(this->marker, func_80390E78, NULL, NULL);
}
if(viewport_func_8024DB50(this->position, 150.0f) || func_80329530(this, 1200))
if(viewport_func_8024DB50(this->position, 150.0f) || subaddie_playerIsWithinSphereAndActive(this, 1200))
{
if( !(globalTimer_getTime() & 3) && randf() < 0.2){
func_80390C70(this->position);

6
src/FP/ch/xmastreeice.c
View File

@@ -38,7 +38,7 @@ void func_80390944(f32 position[3], s32 cnt, enum asset_e model_id){
particleEmitter_setScaleAndLifetimeRanges(pCtrl, &D_80392754);
particleEmitter_func_802EF9F8(pCtrl, 0.6f);
particleEmitter_func_802EFA18(pCtrl, 0);
func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_func_802EFA20(pCtrl, 1.0f, 1.3f);
particleEmitter_setSfx(pCtrl, SFX_7B_ICE_BREAKING_1, 8000);
particleEmitter_emitN(pCtrl, cnt);
}
@@ -65,14 +65,14 @@ void func_80390ABC(ActorMarker *marker){
func_80390944(this->position, 0xA, 0x4D3);
func_80390A30(this->position, 6, ASSET_700_SPRITE_DUST);
func_8030E6D4(SFX_B6_GLASS_BREAKING_1);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
this->unk38_31 = 1;
}
void func_80390B2C(ActorMarker *marker){
Actor *this = marker_getActor(marker);
func_803228D8();
func_802E4078(MAP_27_FP_FREEZEEZY_PEAK, 0xd, 0);
transitionToMap(MAP_27_FP_FREEZEEZY_PEAK, 0xd, 0);
marker_despawn(this->marker);
}

2
src/FP/ch/xmastreestar.c
View File

@@ -42,7 +42,7 @@ void func_8038EC5C(Actor *this){
this->unk38_31++;
this->lifetime_value = 0.33f;
if(this->unk38_31 < 4){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
}

2
src/FP/ch/xmastreeswitch.c
View File

@@ -40,7 +40,7 @@ void func_8038E7CC(ActorMarker *this_marker, ActorMarker *other_marker){
if(this->state == 2){
this->unk38_31++;
if(this->unk38_31 < 4){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
}
}
}

8
src/FP/code_19E0.c
View File

@@ -127,7 +127,7 @@ void func_803881AC(Actor *this){
if(0.0f == this->velocity_x)
return;
}else{
if(!func_80329530(this, 2000) && !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
if(!subaddie_playerIsWithinSphereAndActive(this, 2000) && !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
return;
this->marker->collidable = TRUE;
this->unk124_6 = TRUE;
@@ -142,11 +142,11 @@ void func_803881AC(Actor *this){
}
if( 1.0f == this->velocity_x && func_80387EE4(this)){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
maSlalom_setPlayerGate(this->unkF4_8);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
maSlalom_setPlayerGate(this->actorTypeSpecificField);
}
if(func_80388000(this)){
maSlalom_setBoggyGate(this->unkF4_8);
maSlalom_setBoggyGate(this->actorTypeSpecificField);
}
}

2
src/FP/code_1FF0.c
View File

@@ -70,7 +70,7 @@ void func_80388584(Actor *this){
}
}
else{//L80388694
if(!func_80329530(this, 2000)&& !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
if(!subaddie_playerIsWithinSphereAndActive(this, 2000)&& !maSlolam_WithinRadiusOfBoggy(this->position, 2000))
return;
this->marker->collidable = TRUE;
this->unk124_6 = TRUE;

2
src/FP/code_B4D0.c
View File

@@ -35,6 +35,6 @@ void func_8039195C(void){
void func_80391994(void){
if(map_get() == MAP_7F_FP_WOZZAS_CAVE){
func_8030DB04(Me.sound, 22000, Me.position, 400.0f, 1200.0f);
func_8030E2C4(Me.sound);
sfxSource_func_8030E2C4(Me.sound);
}
}

18
src/FP/ma/slalom.c
View File

@@ -107,8 +107,8 @@ void __maSlalom_spawnGate(s32 indx, s32 arg1){
a1->unk38_31 = 1;
a2->unk38_31 = 1;
a1->unkF4_8 = indx + 1;
a2->unkF4_8 = indx + 1;
a1->actorTypeSpecificField = indx + 1;
a2->actorTypeSpecificField = indx + 1;
meActiveFlags[indx].marker = a1->marker;
meDummyFlags[indx].marker = a2->marker;
@@ -279,7 +279,7 @@ void maSlalom_win(void){
player_stateTimer_set(STATE_TIMER_3_TURBO_TALON, 2.0f);
}
func_8028F918(1);
func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 28000);
coMusicPlayer_playMusic(COMUSIC_3B_MINIGAME_VICTORY, 28000);
FP_func_8038AB60(0);
func_8038ABDC();
timed_setStaticCameraToNode(0.0f, 1);
@@ -293,7 +293,7 @@ void maSlalom_lose(void){
pntBoggy = marker_getActor(Me.boggyLink);
pntBoggy->unk38_31 = 1;
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
coMusicPlayer_playMusic(COMUSIC_3C_MINIGAME_LOSS, 28000);
FP_func_8038AB60(0);
func_8038ABDC();
if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
@@ -407,7 +407,7 @@ void maSlalom_linkActiveFlag(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
s32 num;
num = actor->unkF4_8 - 1;
num = actor->actorTypeSpecificField - 1;
if(num < NUM_GATES){
meActiveFlags[num].marker = actor->marker;
meActiveFlags[num].position[0] = actor->position[0];
@@ -421,7 +421,7 @@ void maSlalom_linkDummyFlag(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
s32 num;
num = actor->unkF4_8 - 1;
num = actor->actorTypeSpecificField - 1;
if(num < NUM_GATES){
meDummyFlags[num].marker = actor->marker;
meDummyFlags[num].position[0] = actor->position[0];
@@ -538,7 +538,7 @@ void maSlalom_setBoggyGate(s32 gate_num){
FP_func_8038AB60(0);
if(!player_isDead()){
func_8028F918(2);
gcdialog_showText(0xc10, 0x20, NULL, NULL, maSlalom_dialogCallback, NULL);
gcdialog_showDialog(0xc10, 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_showText(0xc0f, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xc0f, 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_showText(0xc0e, 0x20, NULL, NULL, NULL, NULL);
gcdialog_showDialog(0xc0e, 0x20, NULL, NULL, NULL, NULL);
}//L8038BDF0
func_8025AEA0(0x3a, 0x493e0);
break;

4
src/FP/ma/snowbutton.c
View File

@@ -47,7 +47,7 @@ void maSnowButton_update(void){
case MA_SNOW_BUTTON_STATE_1_ACTIVE:
if(Me.remainingButtonCount <= 0){
Me.state = MA_SNOW_BUTTON_STATE_2_WIN;
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
Me.delay = 0;
}
break;
@@ -56,7 +56,7 @@ void maSnowButton_update(void){
if(!(Me.delay < 30)){
if(Me.jiggySpawnerExists){
func_802BAFE4(0x11);
gcStaticCamera_activate(0x11);
jiggy_spawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, Me.spawn_pos);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, Me.spawn_pos[0]),

2
src/FP/ma/snowy.c
View File

@@ -58,7 +58,7 @@ void maSnowy_update(void){
case MA_SNOWY_STATE_2_WIN:
if(Me.delay >= 75){
if(Me.jiggySpawnerExists){
func_802BAFE4(0x12);
gcStaticCamera_activate(0x12);
jiggy_spawn(JIGGY_31_FP_SIR_SLUSH, Me.spawn_pos);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, Me.spawn_pos[0]),

29
src/GV/ch/ancientone.c
View File

@@ -65,9 +65,9 @@ void func_80386620(Actor *this){
D_80390C28[phi_s1 + 1] = D_80390C28[phi_s1 + 2];
D_80390C28[phi_s1 + 2] = temp_a0;
temp_v0_3 = marker_getActor(D_80390C28[phi_s1 + 1]);
temp_v0_3->unkF4_8 = phi_s1 + 2;
temp_v0_3->actorTypeSpecificField = phi_s1 + 2;
temp_v0_3 = marker_getActor(D_80390C28[phi_s1 + 2]);
temp_v0_3->unkF4_8 = phi_s1 + 3;
temp_v0_3->actorTypeSpecificField = phi_s1 + 3;
}
phi_s1 = (phi_s1 == 2) ? 0 : phi_s1 + 1;
phi_s2 <<= 1;
@@ -86,7 +86,7 @@ void func_803867CC(void){
void func_803867F4(void){
f32 sp24[3];
func_802BAFE4(4);
gcStaticCamera_activate(4);
if(nodeProp_findPositionFromActorId(0x148, sp24)){
jiggy_spawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
@@ -98,7 +98,7 @@ void func_80386850(ActorMarker *caller_marker, enum asset_e text_id, s32 arg2){
if(text_id == 0xA80){
subaddie_set_state_with_direction(caller, 2, 0.0f, 1);
actor_playAnimationOnce(caller);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
timedFunc_set_0(1.0f, func_803867F4);
}
}
@@ -119,13 +119,13 @@ void chAncientOne_update(Actor *this){
}
}
if(!this->initialized){
if(D_80390C28[this->unkF4_8 - 1])
if(D_80390C28[this->actorTypeSpecificField - 1])
return;
LOCAL_CH_ANCIENT_ONE(this)->unk1C = this->position_y;
this->position_y -= 1100.0f;
D_80390C28[this->unkF4_8 - 1] = this->marker;
if(this->unkF4_8 != 1){
D_80390C28[this->actorTypeSpecificField - 1] = this->marker;
if(this->actorTypeSpecificField != 1){
this->marker->propPtr->unk8_4 = FALSE;
}
this->marker->propPtr->unk8_3 = TRUE;
@@ -144,12 +144,12 @@ void chAncientOne_update(Actor *this){
this->position_y = LOCAL_CH_ANCIENT_ONE(this)->unk1C;
if( sp40 == (LOCAL_CH_ANCIENT_ONE(this)->unk4_31 ^ 1)){
if((sp44[0]*sp44[0] + sp44[1]*sp44[1] + sp44[2]*sp44[2]) < (f32)LOCAL_CH_ANCIENT_ONE(this)->unk4_30){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
coMusicPlayer_playMusic(COMUSIC_2B_DING_B, 28000);
for(sp38= 7; sp38< 0xC && mapSpecificFlags_get(sp38);sp38++);
mapSpecificFlags_set(sp38, TRUE);
if(sp38== 0xB){
if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){
gcdialog_showText(ASSET_A80_DIALOG_ANICIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL);
gcdialog_showDialog(ASSET_A80_DIALOG_ANICIENT_ONES_DONE, 0xE, NULL, this->marker, func_80386850, NULL);
}
else{
func_80386850(this->marker, 0xA80, -1);
@@ -158,15 +158,16 @@ void chAncientOne_update(Actor *this){
else {
if(sp38== 7){
if(!jiggyscore_isCollected(JIGGY_46_GV_ANCIENT_ONES)){
gcdialog_showText(ASSET_A7F_DIALOG_ANICIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A7F_DIALOG_ANICIENT_ONES_MEET, 0x4, NULL, NULL, NULL, NULL);
}
}
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
actor_playAnimationOnce(this);
if(this->unkF4_8 < 5){
D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE;
func_802BAFE4(GV_D_80390C20[this->unkF4_8 - 1]);
if(this->actorTypeSpecificField < 5){
D_80390C28[this->actorTypeSpecificField]->propPtr->unk8_4 = TRUE;
gcStaticCamera_activate(GV_D_80390C20[this->actorTypeSpecificField - 1]);
core1_7090_initSfxSource(2, 0x86, 0x7ff8, 0.3f);
timedFunc_set_0(0.45f, func_8038678C);
@@ -181,7 +182,7 @@ void chAncientOne_update(Actor *this){
this->position_y += 18.0;
this->position_x += (sp38 & 1) ? 0x17 : -0x17;
this->position_z += (sp38 & 2) ? 0xC : -0xC;
if(this->unkF4_8 != 1){
if(this->actorTypeSpecificField != 1){
if(sp38 == 6){
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
}

14
src/GV/ch/gobi1.c
View File

@@ -63,7 +63,7 @@ void chGobi1_setState(Actor *this, s32 next_state){
}
if(this->state == 6){
FUNC_8030E8B4(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
sfx_playFadeShorthandDefault(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
skeletalAnim_set(this->unk148, 0x241, 0.2f, 0.5f);
}
}
@@ -140,14 +140,14 @@ void chGobi1_update(Actor *this){
sp6C = 5;
if(ml_timer_update(&local->unkC, tick))
FUNC_8030E8B4(SFX_84_GOBI_CRYING, 0.9f, 32000, this->position, 1500, 2500);
sfx_playFadeShorthandDefault(SFX_84_GOBI_CRYING, 0.9f, 32000, this->position, 1500, 2500);
if(ml_timer_update(&local->unk10, tick)){
for(i = 0; i < 2; i++){
sfxsource_setSfxId(local->unk0[i], SFX_3F9_UNKNOWN);
func_8030DD14(local->unk0[i], 3);
sfxSource_setunk43_7ByIndex(local->unk0[i], 3);
sfxsource_setSampleRate(local->unk0[i], 32000);
func_8030E2C4(local->unk0[i]);
sfxSource_func_8030E2C4(local->unk0[i]);
}
}
@@ -177,10 +177,10 @@ void chGobi1_update(Actor *this){
if(this->state == 1 || this->state == 2){
if( !this->has_met_before
&& func_80329530(this, 250)
&& !func_80329530(this, 80)
&& subaddie_playerIsWithinSphereAndActive(this, 250)
&& !subaddie_playerIsWithinSphereAndActive(this, 80)
&& func_8028F2A0()
&& gcdialog_showText(0xa73, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(0xa73, 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;
}

6
src/GV/ch/gobi2.c
View File

@@ -108,7 +108,7 @@ void chGobi2_setState(Actor *this, s32 next_state){
}
if(next_state == 8){
FUNC_8030E8B4(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
sfx_playFadeShorthandDefault(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
skeletalAnim_set(this->unk148, ASSET_242_ANIM_GOBI_RELAXING, 0.2f, 0.5f);
}
@@ -201,9 +201,9 @@ void chGobi2_update(Actor *this){
if(this->state == 2){
if(!this->has_met_before){
if(func_80329530(this, 0xFA) && !func_80329530(this, 0x50)){
if(subaddie_playerIsWithinSphereAndActive(this, 0xFA) && !subaddie_playerIsWithinSphereAndActive(this, 0x50)){
if(func_8028F2A0()){
if(gcdialog_showText(ASSET_A75_DIALOG_GOBI2_MEET, 0, this->position, NULL, NULL, NULL))
if(gcdialog_showDialog(ASSET_A75_DIALOG_GOBI2_MEET, 0, this->position, NULL, NULL, NULL))
this->has_met_before = TRUE;
}
}

4
src/GV/ch/gobi3.c
View File

@@ -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_showText(ASSET_A77_DIALOG_GOBI3_DONE, 0xe, this->position, this->marker, __chGobi3_runaway, NULL);
gcdialog_showDialog(ASSET_A77_DIALOG_GOBI3_DONE, 0xe, this->position, this->marker, __chGobi3_runaway, NULL);
}
if(next_state == 4){
@@ -85,7 +85,7 @@ void chGobi3_setState(Actor *this, s32 next_state){
}
if(next_state == 7){
FUNC_8030E8B4(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
sfx_playFadeShorthandDefault(SFX_84_GOBI_CRYING, 0.9f, 20000, this->position, 1500, 2500);
skeletalAnim_set(this->unk148, ASSET_242_ANIM_GOBI_RELAXING, 0.2f, 0.5f);
}

2
src/GV/ch/gobirock.c
View File

@@ -41,7 +41,7 @@ void __chGobiRock_setState(Actor *this, s32 next_state){
FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.5f, 9000);
FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.7f, 9000);
FUNC_8030E624(SFX_9B_BOULDER_BREAKING_1, 0.9f, 9000);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
func_802F066C(local->unkC, local->unk0);
particleEmitter_emitN(local->unkC, 10);
func_802F053C(local->unk10, local->unk0);

24
src/GV/ch/histup.c
View File

@@ -38,8 +38,8 @@ int func_8038D920(Actor *this, f32 arg1){
f32 sp20[3];
f32 sp1C;
this->unkF4_8 = 20;
sp1C = (f32)(this->unkF4_8 + 25);
this->actorTypeSpecificField = 20;
sp1C = (f32)(this->actorTypeSpecificField + 25);
player_getPosition(sp20);
ml_vec3f_diff_copy(sp2C, this->position, sp20);
return this->position_y < sp20[1] && sp20[1] <= arg1 && sp2C[0]*sp2C[0] + sp2C[2]*sp2C[2] < sp1C*sp1C;
@@ -62,7 +62,7 @@ Actor *func_8038DA18(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
sp38[1] = this->position_y;
}
if(func_8038D920(this, sp38[1])){
player_setClimbParams(sp2C, sp38, (f32)this->unkF4_8, 2);
player_setClimbParams(sp2C, sp38, (f32)this->actorTypeSpecificField, 2);
}
return this;
@@ -96,7 +96,7 @@ void func_8038DB88(Actor *this){
tmp = this->unk44_31;
if(tmp){
if(func_8030E3FC(tmp)){
func_8030E394(this->unk44_31);
sfxSource_triggerCallbackByIndex(this->unk44_31);
}
sfxsource_freeSfxsourceByIndex(this->unk44_31);
this->unk44_31 = 0;
@@ -148,11 +148,11 @@ void func_8038DBDC(Actor *this){
if(actor_animationIsAt(this, 0.2f) && this->unk44_31 == 0){
this->unk44_31 = func_8030ED2C(0x3F7, 3);
this->unk1C[1] = 1.0f;
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}//L8038DE08
if(actor_animationIsAt(this, 0.7f)){
func_8038DB88(this);
FUNC_8030E8B4(SFX_3F8_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_3F8_UNKNOWN, 1.0f, 32000, this->position, 1250, 2500);
}
}
break;
@@ -177,16 +177,16 @@ void func_8038DBDC(Actor *this){
}
else{
if(actor_animationIsAt(this, 0.04f))
FUNC_8030E8B4(SFX_7C_CHEBOOF, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_7C_CHEBOOF, 1.0f, 32000, this->position, 1250, 2500);
if(actor_animationIsAt(this, 0.04f))
FUNC_8030E8B4(SFX_2C_PULLING_NOISE, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_2C_PULLING_NOISE, 1.0f, 32000, this->position, 1250, 2500);
if(actor_animationIsAt(this, 0.33f))
FUNC_8030E8B4(SFX_2C_PULLING_NOISE, 1.2f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_2C_PULLING_NOISE, 1.2f, 32000, this->position, 1250, 2500);
if(actor_animationIsAt(this, 0.66f))
FUNC_8030E8B4(SFX_2C_PULLING_NOISE, 1.4f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_2C_PULLING_NOISE, 1.4f, 32000, this->position, 1250, 2500);
}
break;
case 5: //8038DFC8
@@ -202,7 +202,7 @@ void func_8038DBDC(Actor *this){
if(!this->unk44_31){
this->unk44_31 = func_8030ED2C(SFX_2C_PULLING_NOISE, 3);
this->unk1C[1] = 1.9f;
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
}
}
else{//L8038E070
@@ -216,7 +216,7 @@ void func_8038DBDC(Actor *this){
}
else{
if(actor_animationIsAt(this, 0.42f))
sfxsource_play(SFX_7C_CHEBOOF, 32000);
gcsfx_playAtSampleRate(SFX_7C_CHEBOOF, 32000);
tmp = this->unk44_31;
if(tmp && func_8030E3FC(tmp)){
if(1.0 < this->unk1C[1]){

12
src/GV/ch/mazectrl.c
View File

@@ -65,7 +65,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
local->unk8 = 0.0f;
if(next_state == 2){
func_8025A58C(0, 4000);
func_8025A6EC(COMUSIC_26_GV_SANDYBUTT_DANGER, 30000);
coMusicPlayer_playMusic(COMUSIC_26_GV_SANDYBUTT_DANGER, 30000);
item_set(ITEM_0_HOURGLASS_TIMER, 0xdd3);
item_set(ITEM_6_HOURGLASS, TRUE);
func_8038F520(1.0f);
@@ -85,7 +85,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
}
if (!levelSpecificFlags_get(LEVEL_FLAG_16_GV_UNKNOWN)) {
gcdialog_showText(ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A82_DIALOG_SANDYBUTT_START_MAZE, 4, NULL, NULL, NULL, NULL);
levelSpecificFlags_set(LEVEL_FLAG_16_GV_UNKNOWN, TRUE);
}
}//L8038F794
@@ -99,7 +99,7 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
if(next_state == 3){
func_80324E38(0.0f, 3);
timedFunc_set_2(0.0f, (GenFunction_2)func_8025A6EC, COMUSIC_3E_SANDYBUTT_FAILURE, 0x7FFF);
timedFunc_set_2(0.0f, (GenFunction_2)coMusicPlayer_playMusic, COMUSIC_3E_SANDYBUTT_FAILURE, 0x7FFF);
timedFunc_set_2(1.0f, (GenFunction_2)__chMazeCtrl_markerSetState, reinterpret_cast(s32, this->marker), 6);
timedFunc_set_2(2.0f, (GenFunction_2)__chMazeCtrl_markerSetState, reinterpret_cast(s32, this->marker), 4);
}//L8038F850
@@ -132,10 +132,10 @@ void __chMazeCtrl_setState(Actor *this, s32 next_state){
if(next_state == 5){
func_8038F56C(0.0f);
if(++local->unk4 == 1)
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
coMusicPlayer_playMusic(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7fff);
if(!levelSpecificFlags_get(LEVEL_FLAG_17_GV_UNKNOWN)){
gcdialog_showText(ASSET_A83_DIALOG_SANDYBUTT_DONE, 4, NULL, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A83_DIALOG_SANDYBUTT_DONE, 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_showText(ASSET_A81_DIALOG_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showDialog(ASSET_A81_DIALOG_SANDYBUTT_ENTER, 0, NULL, NULL, NULL, NULL)
) {
levelSpecificFlags_set(LEVEL_FLAG_15_GV_UNKNOWN, TRUE);
}

27
src/GV/ch/sarcophagus.c
View File

@@ -2,8 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_802EE6CC(f32[3], s32[4], s32[4], s32, f32, f32, s32, s32, s32);
#include "core2/dustemitter.h"
void chSarcophagus_update(Actor *this);
void chSarcophagus_updateSNS(Actor *this);
@@ -43,8 +42,8 @@ void GV_func_803894B0(Actor *this){
}
void func_80389518(Actor *this){
func_802EE6CC(this->unk1C, D_80390E88, D_80390E78, 0,
0.55f, 50.0f, 0xDC, 0x168, 0
dustEmitter_emit(this->unk1C, D_80390E88, D_80390E78, 0,
0.55f, 50.0f, 0xDC, 0x168, DUST_EMITTER_TYPE_DUST
);
}
@@ -71,10 +70,10 @@ void chSarcophagus_update(Actor *this){
if(!this->initialized){
GV_func_803894B0(this);
}
if(func_80329530(this, 500) && func_8038957C(this)){
if(subaddie_playerIsWithinSphereAndActive(this, 500) && func_8038957C(this)){
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_RUBBING, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_3F6_RUBBING, 1.0f, 32000, this->position, 1250, 2500);
}
break;
@@ -84,7 +83,7 @@ void chSarcophagus_update(Actor *this){
&& actor_animationIsAt(this, 0.1f)
&& !jiggyscore_isCollected(JIGGY_41_GV_MAZE)
){
func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7fff);
coMusicPlayer_playMusic(COMUSIC_3D_JIGGY_SPAWN, 0x7fff);
this->unk38_31 = 1;
}
if(actor_animationIsAt(this, 0.5f)){
@@ -93,10 +92,10 @@ void chSarcophagus_update(Actor *this){
break;
case 3: //L80389788
if(!func_80329530(this, 700)){
if(!subaddie_playerIsWithinSphereAndActive(this, 700)){
subaddie_set_state_with_direction(this, 4, 0.5f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_RUBBING, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_6B_LOCKUP_OPENING, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_3F6_RUBBING, 1.0f, 32000, this->position, 1250, 2500);
}
break;
case 4: //L803897E4
@@ -113,7 +112,7 @@ void chSarcophagus_update(Actor *this){
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
}
else if(actor_animationIsAt(this, 0.9f)){
FUNC_8030E8B4(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 32000, this->position, 1250, 2500);
}
break;
}//L803898A8
@@ -133,8 +132,8 @@ void chSarcophagus_updateSNS(Actor *this){
this->unk1C[0] -= 1.0f;
if(this->unk1C[0] == 0.0f){
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
FUNC_8030E8B4(SFX_6B_LOCKUP_OPENING, 0.5f, 32000, this->position, 1250, 2500);
FUNC_8030E8B4(SFX_3F6_RUBBING, 0.5f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_6B_LOCKUP_OPENING, 0.5f, 32000, this->position, 1250, 2500);
sfx_playFadeShorthandDefault(SFX_3F6_RUBBING, 0.5f, 32000, this->position, 1250, 2500);
}
}
else{//L803899C0

2
src/GV/ch/toots.c
View File

@@ -60,7 +60,7 @@ void chtoots_update(Actor *this){
else if(this->unk38_31 != 0){
this->unk38_31--;
if(this->unk38_31 == 6){
FUNC_8030E8B4(SFX_DD_JINJO_TALKING, 1.0f, 20000, this->position, 1500, 4500);
sfx_playFadeShorthandDefault(SFX_DD_JINJO_TALKING, 1.0f, 20000, this->position, 1500, 4500);
}
}
else{

6
src/GV/ch/trunker.c
View File

@@ -70,11 +70,11 @@ void chTrucker_update(Actor *this){
}//L803891D8
if( this->state == 1
&& !this->has_met_before
&& func_80329530(this, 250)
&& !func_80329530(this, 80)
&& subaddie_playerIsWithinSphereAndActive(this, 250)
&& !subaddie_playerIsWithinSphereAndActive(this, 80)
&& func_8028F2A0()
){
gcdialog_showText(ASSET_A71_DIALOG_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL);
gcdialog_showDialog(ASSET_A71_DIALOG_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL);
this->has_met_before = TRUE;
}//L80389254

10
src/GV/code_3630.c
View File

@@ -29,7 +29,7 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){
}
void func_80389A60(Actor *this){
gcdialog_showText(ASSET_A70_DIALOG_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
gcdialog_showDialog(ASSET_A70_DIALOG_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
this->has_met_before = TRUE;
subaddie_set_state(this, 5);
}
@@ -62,8 +62,8 @@ void func_80389B1C(Actor *this){
anctrl_setTransitionDuration(this->anctrl, 0.15f);
if(this->state == 1 || this->state == 2){
if(! this->has_met_before && func_80329530(this, 250) && !func_80329530(this, 0x50)){
gcdialog_showText(ASSET_A6F_DIALOG_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL);
if(! this->has_met_before && subaddie_playerIsWithinSphereAndActive(this, 250) && !subaddie_playerIsWithinSphereAndActive(this, 0x50)){
gcdialog_showDialog(ASSET_A6F_DIALOG_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL);
this->has_met_before = TRUE;
mapSpecificFlags_set(0, TRUE);
}
@@ -83,7 +83,7 @@ void func_80389B1C(Actor *this){
|| actor_animationIsAt(this, 0.51f)
|| actor_animationIsAt(this, 0.57f)
){
FUNC_8030E8B4(SFX_8_BANJO_LANDING_04, 3.802f, 8000, this->position, 1500, 4500);
sfx_playFadeShorthandDefault(SFX_8_BANJO_LANDING_04, 3.802f, 8000, this->position, 1500, 4500);
}
if( actor_animationIsAt(this, 0.4f)){
@@ -102,7 +102,7 @@ void func_80389B1C(Actor *this){
case 3: //L80389E14
if( actor_animationIsAt(this, 0.2f)){
func_8025A58C(500, 400);
func_8025A6EC(COMUSIC_27_GV_RUBEES_SONG, 28000);
coMusicPlayer_playMusic(COMUSIC_27_GV_RUBEES_SONG, 28000);
}
if( actor_animationIsAt(this, 0.99f)){

4
src/GV/code_3BB0.c
View File

@@ -45,14 +45,14 @@ void func_80389FA0(f32 position[3]){
}
void GV_func_8038A084(Actor *this){
if(this->unkF4_8 == 6 && !this->volatile_initialized){
if(this->actorTypeSpecificField == 6 && !this->volatile_initialized){
this->volatile_initialized = TRUE;
if( jiggyscore_isCollected(JIGGY_42_GV_WATER_PYRAMID) && this->yaw == 1.0f){
this->unk38_31 = TRUE;
}
}
if(this->unkF4_8 == 6
if(this->actorTypeSpecificField == 6
&& viewport_func_8024DB50(this->position, 50.0f)
&& !this->unk38_31
&& randf() < 0.2

12
src/GV/code_3D90.c
View File

@@ -35,10 +35,10 @@ Actor *func_8038A180(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if( this->unk54 == 0.0f
&& this->unk48 != this->unk1C[1]
&& this_marker->unk14_21
&& func_80329530(this, 3000)
&& subaddie_playerIsWithinSphereAndActive(this, 3000)
){
func_8033E73C(this->marker, 6, func_80329904);
func_8033E3F0(0xc, this->marker->unk14_21);
commonParticle_add(this->marker, 6, func_80329904);
commonParticle_new(0xc, this->marker->unk14_21);
}
}
return this;
@@ -60,7 +60,7 @@ void func_8038A2C0(void *this_marker){
s32 pad;
func_8032AA58(shadow, this->scale);
this->unk100 = shadow->marker;
this->partnerActor = shadow->marker;
}
void func_8038A314(Actor *this){}
@@ -74,7 +74,7 @@ void func_8038A31C(Actor *this){
this->velocity[0] = 0.0f;
}
if(this->unk100)
if(this->partnerActor)
sp24 = subaddie_getLinkedActor(this);
this->unk1C[1] = this->unk48;
@@ -141,7 +141,7 @@ void func_8038A31C(Actor *this){
}//L8038A6A4
this->unk124_11 = 0x3;
this->pitch = 0.0f;
if(this->unk100 && sp24 && this->unk100->id == MARKER_AF_MAGIC_CARPET_SHADOW){
if(this->partnerActor && sp24 && this->partnerActor->id == MARKER_AF_MAGIC_CARPET_SHADOW){
sp24->position_x = this->position_x;
sp24->position_y = mapModel_getFloorY(this->position) + 60.0f;
sp24->position_z = this->position_z;

10
src/GV/code_43B0.c
View File

@@ -33,8 +33,8 @@ Actor *func_8038A7A0(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
&& this_marker->unk14_21
&& this->unk48 != this->unk1C[2]
){
func_8033E73C(this->marker, 5, func_80329904);
func_8033E3F0(0xa, this->marker->unk14_21);
commonParticle_add(this->marker, 5, func_80329904);
commonParticle_new(0xa, this->marker->unk14_21);
this->unk38_31++;
}
@@ -56,7 +56,7 @@ void func_8038A8CC(ActorMarker *this_marker){
Actor *shadow = spawn_child_actor(ACTOR_122_MAGIC_CARPET_SHADOW, &this);
s32 pad;
this->unk100 = shadow->marker;
this->partnerActor = shadow->marker;
shadow->position_y = mapModel_getFloorY(this->position);
shadow->unk1C[0] = func_8038A860(shadow, this);
shadow->yaw = this->yaw;
@@ -91,7 +91,7 @@ void GV_func_8038A9C0(Actor *this){
this->yaw = 90.0f;
}
if(this->unk100)
if(this->partnerActor)
sp24 = subaddie_getLinkedActor(this);
if(this->velocity_y != 0.0f){
@@ -101,7 +101,7 @@ void GV_func_8038A9C0(Actor *this){
}
this->unk1C[2] = this->unk1C[1];
this->unk1C[1] = this->unk48;
if(this->unk100 != NULL && sp24 != NULL && this->unk100->id == MARKER_AF_MAGIC_CARPET_SHADOW){
if(this->partnerActor != NULL && sp24 != NULL && this->partnerActor->id == MARKER_AF_MAGIC_CARPET_SHADOW){
sp24->unk1C[0] = func_8038A860(sp24, this);
}
}

12
src/GV/code_4740.c
View File

@@ -167,7 +167,7 @@ void func_8038B124(Actor *this){
if(this->unk44_31 == 0){
this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex();
sfxsource_setSfxId(this->unk44_31, SFX_3EC_CCW_DOOR_OPENING);
func_8030DD14(this->unk44_31, 2);
sfxSource_setunk43_7ByIndex(this->unk44_31, 2);
sfxsource_playSfxAtVolume(this->unk44_31, 0.1f);
sfxsource_setSampleRate(this->unk44_31, 32000);
}
@@ -184,7 +184,7 @@ void func_8038B124(Actor *this){
}//L8038B33C
if( this->unk1C[1] == 0.0
&& func_80329530(this, 0x320)
&& subaddie_playerIsWithinSphereAndActive(this, 0x320)
&& func_803292E0(this)
){
anctrl_setSmoothTransition(this->anctrl, 0);
@@ -207,7 +207,7 @@ void func_8038B124(Actor *this){
break;
case 2: //L8038B430
func_8030E2C4(this->unk44_31);
sfxSource_func_8030E2C4(this->unk44_31);
if(0.98 < anctrl_getAnimTimer(this->anctrl)){
func_8038AF10(this);
}
@@ -218,13 +218,13 @@ void func_8038B124(Actor *this){
break;
case 3: //L8038B494
func_8030E2C4(this->unk44_31);
if(func_80329530(this, 175)){
sfxSource_func_8030E2C4(this->unk44_31);
if(subaddie_playerIsWithinSphereAndActive(this, 175)){
subaddie_set_state_with_direction(this, 4, 0.00001f, 1);
actor_loopAnimation(this);
this->unk1C[0] = 1.0f;
}
else if(!func_80329530(this, 1100) || !func_8038AF78(this, 8.0f, 16.0f)){
else if(!subaddie_playerIsWithinSphereAndActive(this, 1100) || !func_8038AF78(this, 8.0f, 16.0f)){
subaddie_set_state_with_direction(this, 8, 0.00001f, 1);
actor_playAnimationOnce(this);
this->unk1C[0] = 1.0f;

Some files were not shown because too many files have changed in this diff Show More