diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index c357d38e2..08594f690 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -1538,6 +1538,10 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) #else GLOBAL_ASM( glabel amRenderAibotInfo +.late_rodata +glabel var7f1acfe0nb +.word 0x3f8ccccd +.text /* f0fbab8: 3c0a800a */ lui $t2,0x800a /* f0fbabc: 254ae6c0 */ addiu $t2,$t2,-6464 /* f0fbac0: 8d46006c */ lw $a2,0x6c($t2) diff --git a/src/game/activemenu/tick.c b/src/game/activemenu/tick.c index 91b18da33..c72183d72 100644 --- a/src/game/activemenu/tick.c +++ b/src/game/activemenu/tick.c @@ -414,6 +414,16 @@ void amTick(void) #else GLOBAL_ASM( glabel amTick +.late_rodata +glabel var7f1a2240nb +.word 0 +glabel var7f1a2244nb +.word 0x3e89374c +glabel var7f1a2248nb +.word 0x4196cbe4 +glabel var7f1a224cnb +.word 0x4196cbe4 +.text /* f01ae90: 27bdff20 */ addiu $sp,$sp,-224 /* f01ae94: 3c06800a */ lui $a2,0x800a /* f01ae98: 24c6e6c0 */ addiu $a2,$a2,-6464 diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 8e706a687..f2ab24bc9 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -3943,15 +3943,15 @@ glabel var7f1adae0 glabel var7f1adae4 .word 0x3ccccccd glabel var7f1adae8 -.word eyespyProcessInput+0x1184 # f0d1aac +.word eyespyProcessInput+0x11c4 glabel var7f1adaec -.word eyespyProcessInput+0x1280 # f0d1ba8 +.word eyespyProcessInput+0x12c0 glabel var7f1adaf0 -.word eyespyProcessInput+0x122c # f0d1b54 +.word eyespyProcessInput+0x126c glabel var7f1adaf4 -.word eyespyProcessInput+0x12d4 # f0d1bfc +.word eyespyProcessInput+0x1314 glabel var7f1adaf8 -.word eyespyProcessInput+0x11d8 # f0d1b00 +.word eyespyProcessInput+0x1218 glabel var7f1adafc .word 0x40c907a9 glabel var7f1adb00 diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 3205be4a2..58a9c1143 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -3237,8 +3237,6 @@ glabel var7f1ada18 .word 0x3f4ccccd glabel var7f1ada1c .word 0x4528c000 -glabel var7f1ada20 -.word 0x3ecccccd glabel var7f1ada24 .word 0x3f333333 glabel var7f1ada28 diff --git a/src/game/bondview.c b/src/game/bondview.c index 3018f3c3e..84286deb8 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -31,6 +31,9 @@ u32 var8007f858 = 0xb8000000; u32 var8007f85c = 0x00000000; #if VERSION < VERSION_NTSC_1_0 +const char var7f1b02b0nb[] = "fsrad"; +const char var7f1b02b8nb[] = "fscs"; + GLOBAL_ASM( glabel func7f13c2d0nb /* f13c2d0: 27bdffe8 */ addiu $sp,$sp,-24 @@ -14983,6 +14986,11 @@ Gfx *bviewRenderNvBinoculars(Gfx *gdl) const char var7f1b5e50[] = "Fullscreen_DrawFaultScope"; const char var7f1b5e6c[] = "Fullscreen_DrawFaultScope"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b03d8nb[] = "Fault Scope is active\n"; +#endif + const char var7f1b5e88[] = "IntroFaderBlurGfx"; #if VERSION >= VERSION_NTSC_1_0 @@ -16227,8 +16235,28 @@ Gfx *bviewRenderHorizonScanner(Gfx *gdl) return gdl; } #else +const char var7f1b041cnb[] = "BinocularViewGfx"; +const char var7f1b0430nb[] = ">> "; +const char var7f1b0434nb[] = " >>"; +const char var7f1b0438nb[] = "%s %s:%03d"; +const char var7f1b0444nb[] = "%s %s%s%4.2fh"; +const char var7f1b0454nb[] = ""; +const char var7f1b0458nb[] = ""; +const char var7f1b045cnb[] = "%s %s%s%4.2fX"; +const char var7f1b046cnb[] = ""; +const char var7f1b0470nb[] = ""; +const char var7f1b0474nb[] = " JMBC WIDE BAND SCANNER\n"; + GLOBAL_ASM( glabel bviewRenderHorizonScanner +.late_rodata +glabel var7f1b04c0nb +.word 0x40490fdb +glabel var7f1b04c4nb +.word 0x40933333 +glabel var7f1b04c8nb +.word 0x4465599a +.text /* f142640: 27bdfea0 */ addiu $sp,$sp,-352 /* f142644: afbf0054 */ sw $ra,0x54($sp) /* f142648: afb2004c */ sw $s2,0x4c($sp) diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 71db965fa..38e4b6baf 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -114,6 +114,10 @@ void bwalkInit(void) #else GLOBAL_ASM( glabel bwalkInit +.late_rodata +glabel var7f1a7ad0 +.word 0xb8d1b717 +.text /* f0c13a0: 27bdffa8 */ addiu $sp,$sp,-88 /* f0c13a4: afb00038 */ sw $s0,0x38($sp) /* f0c13a8: 3c10800a */ lui $s0,0x800a @@ -530,6 +534,10 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, #else GLOBAL_ASM( glabel bwalkCalculateNewPosition +.late_rodata +glabel var7f1a7ad8nb +.word 0x40c907a9 +.text /* f0c19d0: 27bdff48 */ addiu $sp,$sp,-184 /* f0c19d4: afb00030 */ sw $s0,0x30($sp) /* f0c19d8: 3c10800a */ lui $s0,0x800a @@ -2286,6 +2294,44 @@ void bwalkUpdateVertical(void) #else GLOBAL_ASM( glabel bwalkUpdateVertical +.late_rodata +glabel var7f1a7adcnb +.word 0x3f99999a +glabel var7f1a7ae0nb +.word 0x3f8ccccd +glabel var7f1a7ae4nb +.word 0xc6ea6000 +glabel var7f1a7ae8nb +.word 0xc6ea6000 +glabel var7f1a7aecnb +.word 0x3d3a5e30 +glabel var7f1a7af0nb +.word 0x3d3a5e30 +glabel var7f1a7af4nb +.word 0x3f745a1d +glabel var7f1a7af8nb +.word 0x3d3a5e30 +glabel var7f1a7afcnb +.word 0x3fb1c71d +glabel var7f1a7b00nb +.word 0x3e8e38e4 +glabel var7f1a7b04nb +.word 0x3e8e38e4 +glabel var7f1a7b08nb +.word 0xc6ea6000 +glabel var7f1a7b0cnb +.word 0xc6ea6000 +glabel var7f1a7b10nb +.word 0xc1555555 +glabel var7f1a7b14nb +.word 0x41055555 +glabel var7f1a7b18nb +.word 0x3f7212d7 +glabel var7f1a7b1cnb +.word 0x3d5ed290 +glabel var7f1a7b20nb +.word 0x3bce168a +.text /* f0c2bd8: 27bdff10 */ addiu $sp,$sp,-240 /* f0c2bdc: afb00048 */ sw $s0,0x48($sp) /* f0c2be0: 3c10800a */ lui $s0,0x800a @@ -5549,8 +5595,6 @@ glabel var7f1ad7fc .word 0xc27e6668 glabel var7f1ad800 .word 0x43b0aaaa -glabel var7f1ad804 -.word 0x3ecccccd glabel var7f1ad808 .word 0x3c888889 glabel var7f1ad80c @@ -5570,13 +5614,7 @@ glabel var7f1ad824 glabel var7f1ad828 .word 0x3f4ccccd glabel var7f1ad82c -.word 0x3f4ccccd -glabel var7f1ad830 .word 0x4528c000 -glabel var7f1ad834 -.word 0x3ecccccd -glabel var7f1ad838 -.word 0x3ecccccd glabel var7f1ad83c .word 0x3e99999a glabel var7f1ad840 diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 8df20377e..fc897a7c2 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -46,7 +46,11 @@ #include "data.h" #include "types.h" +#if VERSION >= VERSION_NTSC_1_0 const char var7f1a8690[] = "chr/chr.c"; +#else +const char var7f1a8690[] = "chr.c"; +#endif void *var8009ccc0[20]; s32 g_NumChrs; @@ -4387,12 +4391,6 @@ glabel var7f1a86f0 .word 0x3f666666 glabel var7f1a86f4 .word 0xc7c35000 -glabel var7f1a86f8 -.word 0x3f666666 -glabel var7f1a86fc -.word 0x3f666666 -glabel var7f1a8700 -.word 0xc7c35000 glabel var7f1a8704 .word 0x411ffffe glabel var7f1a8708 diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index e2608127d..56ef8e39b 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -52,6 +52,153 @@ #include "data.h" #include "types.h" +#if VERSION < VERSION_NTSC_1_0 +const char *g_ChrActionNames[] = { + "ACT_INIT", + "ACT_STAND", + "ACT_KNEEL", + "ACT_ANIM", + "ACT_DIE", + "ACT_DEAD", + "ACT_ARGH", + "ACT_PREARGH", + "ACT_ATTACK", + "ACT_ATTACKWALK", + "ACT_ATTACKROLL", + "ACT_SIDESTEP", + "ACT_JUMPOUT", + "ACT_RUNPOS", + "ACT_PATROL", + "ACT_GOPOS", + "ACT_SURRENDER", + "ACT_LOOKATTARGET", + "ACT_SURPRISED", + "ACT_STARTALARM", + "ACT_THROWGRENADE", + "ACT_TURNDIR", + "ACT_TEST", + "ACT_BONDINTRO", + "ACT_BONDDIE", + "ACT_BONDMULTI", + "ACT_NULL", + "ACT_BOT_ATTACKSTAND", + "ACT_BOT_ATTACKKNEEL", + "ACT_BOT_ATTACKSTRAFE", + "ACT_DRUGGEDDROP", + "ACT_DRUGGEDKO", + "ACT_DRUGGEDCOMINGUP", + "ACT_ATTACKAMOUNT", + "ACT_ROBOTATTACK", + "ACT_SKJUMP", + "ACT_PUNCH", + "ACT_CUTFIRE", +}; + +const char *g_ChrMyActionNames[] = { + "NONE", + "NORMAL", + "COVERWAIT", + "GRENADEWAIT", + "WAITING", + "COVERGOTO", + "COVERBREAK", + "COVERSEEN", + "FLANKLEFT", + "FLANKRIGHT", + "DODGE", + "GRENADE", + "WAITSEEN", + "WITHDRAW", + "SHOOTING", + "SYNCSHOOT", + "WAITTIMEOUT", + "COVERTIMEOUT", + "TRACKING", + "RETREAT", + "SURRENDER", + "TALKING", + "LISTENING", + "GOTOALARM", + "BOTFRIENDFOLLOW", + "BOTHIDE", + "BOTPATH", + "BOTINJURED", + "BOTNORMAL", + "BOTSHOOTING", + "DRUGGED", + "PANIC", + "RUNFROMGRENADE", + "UNARMEDATTACK", + "MA_SKJUMP_START", + "MA_SKJUMP_AIR", + "MA_SKJUMP_LAND", + "MA_SKJUMP_LANDLOOP", + "MA_SKJUMP_SHOT", + "AIBOTDEADLIST", + "AIBOTINIT", + "AIBOTMAINLOOP", + "AIBOTGETITEM", + "AIBOTGOTOPOS", + "AIBOTGOTOPROP", + "AIBOTRUNAWAY", + "AIBOTDOWNLOAD", + "AIBOTATTACK", + "unused1", + "unused2", + "AIBOTFOLLOW", + "AIBOTDEFEND", + "FLANKBEST", + "FACING", + "PUNCHING", +}; + +const char *g_ChrActionNames2[] = { + "ACT_INIT", + "ACT_STAND", + "ACT_KNEEL", + "ACT_ANIM", + "ACT_DIE", + "ACT_DEAD", + "ACT_ARGH", + "ACT_PREARGH", + "ACT_ATTACK", + "ACT_ATTACKWALK", + "ACT_ATTACKROLL", + "ACT_SIDESTEP", + "ACT_JUMPOUT", + "ACT_RUNPOS", + "ACT_PATROL", + "ACT_GOPOS", + "ACT_SURRENDER", + "ACT_LOOKATTARGET", + "ACT_SURPRISED", + "ACT_STARTALARM", + "ACT_THROWGRENADE", + "ACT_TURNDIR", + "ACT_TEST", + "ACT_BONDINTRO", + "ACT_BONDDIE", + "ACT_BONDMULTI", + "ACT_NULL", + "ACT_BOT_ATTACKSTAND", + "ACT_BOT_ATTACKKNEEL", + "ACT_BOT_ATTACKSTRAFE", + "ACT_DRUGGEDDROP", + "ACT_DRUGGEDKO", + "ACT_DRUGGEDCOMINGUP", + "ACT_ATTACKAMOUNT", + "ACT_ROBOTATTACK", + "ACT_SKJUMP", +}; + +const char *g_ChrLiftActionNames[] = { + "NOTUSINGLIFT", + "WAITINGFORLIFT", + "ONLIFT", + "WAITINGONLIFT", +}; +#endif + #if VERSION >= VERSION_PAL_FINAL const char var7f1a8ac0[] = "chr/chraction.c"; const char var7f1a8acc[] = "chr/chraction.c"; @@ -20276,16 +20423,17 @@ bool chrIsReadyForOrders(struct chrdata *chr) case ACT_DRUGGEDKO: case ACT_DRUGGEDCOMINGUP: #if VERSION < VERSION_NTSC_1_0 + case ACT_ARGH: case 0x200: #endif return false; - case ACT_ARGH: #if VERSION >= VERSION_NTSC_1_0 + case ACT_ARGH: if ((chr->chrflags & CHRCFLAG_00000200) == 0) { return false; } -#endif break; +#endif case ACT_ROBOTATTACK: if (!chr->act_robotattack.unk06e) { return false; @@ -29398,89 +29546,89 @@ glabel var7f1a90d8 glabel var7f1a90dc .word 0x461c4000 glabel var7f1a90e0 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a90e4 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a90e8 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a90ec -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a90f0 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a90f4 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a90f8 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a90fc -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9100 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9104 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9108 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a910c -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9110 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9114 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9118 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a911c -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9120 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9124 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9128 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a912c -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9130 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9134 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9138 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a913c -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9140 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9144 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9148 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a914c -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9150 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9154 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9158 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a915c -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9160 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9164 -.word func0f0404d4+0x14e8 # f0419bc +.word func0f0404d4+0x14d0 glabel var7f1a9168 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a916c -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9170 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9174 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9178 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a917c -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9180 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 glabel var7f1a9184 -.word func0f0404d4+0x14dc # f0419b0 +.word func0f0404d4+0x14c4 .text /* f03fcb4: 27bdfd88 */ addiu $sp,$sp,-632 /* f03fcb8: afbf0044 */ sw $ra,0x44($sp) @@ -34090,11 +34238,14 @@ const char var7f1a8bd0[] = "chraction.c"; const char var7f1a8bdc[] = "chraction.c"; #endif +#if VERSION >= VERSION_NTSC_1_0 const char var7f1a8be8[] = "CHARS -> FRAMETIMESCALEI(240) = %d"; const char var7f1a8c0c[] = "CHARS -> numseenbond1 \t= %d/%d"; const char var7f1a8c30[] = "CHARS -> numseenbond2 \t= %d/%d"; const char var7f1a8c54[] = "CHARS -> numseenbond3 \t= %d/%d"; const char var7f1a8c78[] = "CHARS -> numseenbond \t= %d/%d"; +#endif + const char var7f1a8c9c[] = "CHARS -> DEAD = %d/%d"; const char var7f1a8cb4[] = "chrdisttopad : %x -> %d : Dist=%f"; @@ -42449,19 +42600,9 @@ GLOBAL_ASM( glabel func0f04af84 .late_rodata glabel var7f1a9404 -.word 0x40c907a9 -glabel var7f1a9408 .word 0x3f4907a9 -glabel var7f1a940c -.word 0xc7c35000 glabel var7f1a9410 .word 0x40c907a9 -glabel var7f1a9414 -.word 0xc7c35000 -glabel var7f1a9418 -.word 0xc7c35000 -glabel var7f1a941c -.word 0x3f4907a9 .text /* f04a374: 27bdff60 */ addiu $sp,$sp,-160 /* f04a378: 8fae00b4 */ lw $t6,0xb4($sp) @@ -44527,6 +44668,12 @@ Gfx *func0f004cd84(Gfx *gdl, s32 arg1) return gdl; } #else +const char var7f1a2fe4nb[] = "\nTEAM %d: Cmd: %s"; +const char var7f1a2ff8nb[] = "CHR[%d]\n%s\n%s\n%s%s"; +const char var7f1a300cnb[] = "myaction?"; +const char var7f1a3018nb[] = "ACT_?"; +const char var7f1a1020nb[] = ""; + GLOBAL_ASM( glabel func0f04c1e8nb /* f04c1e8: 27bdfdd0 */ addiu $sp,$sp,-560 diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index e5da18ce1..bc9f28df8 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -4306,6 +4306,74 @@ bool aiTryEquipWeapon(void) #else GLOBAL_ASM( glabel aiTryEquipWeapon +.late_rodata +glabel var7f1a3f70nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f74nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f78nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f7cnb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f80nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f84nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f88nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f8cnb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f90nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f94nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f98nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3f9cnb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fa0nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fa4nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fa8nb +.word aiTryEquipWeapon+0x164 +glabel var7f1a3facnb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fb0nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fb4nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fb8nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fbcnb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fc0nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fc4nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fc8nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fccnb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fd0nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fd4nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fd8nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fdcnb +.word aiTryEquipWeapon+0x1c8 +glabel var7f1a3fe0nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fe4nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fe8nb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3fecnb +.word aiTryEquipWeapon+0x148 +glabel var7f1a3ff0nb +.word aiTryEquipWeapon+0x148 +.text /* f054cb0: 3c07800a */ lui $a3,0x800a /* f054cb4: 24e7e6c0 */ addiu $a3,$a3,-6464 /* f054cb8: 8ce50438 */ lw $a1,0x438($a3) @@ -8815,6 +8883,10 @@ glabel var7f1a9d64 #else GLOBAL_ASM( glabel aiSayQuip +.late_rodata +glabel var7f1a9d64 +.word 0x45dac000 +.text /* f0596c0: 27bdff58 */ addiu $sp,$sp,-168 /* f0596c4: afb00048 */ sw $s0,0x48($sp) /* f0596c8: 3c10800a */ lui $s0,0x800a diff --git a/src/game/core.c b/src/game/core.c index 09f64dfb8..b861954fb 100644 --- a/src/game/core.c +++ b/src/game/core.c @@ -106,7 +106,28 @@ #include "data.h" #include "types.h" +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b1e20nb[] = "lv.c"; +const char var7f1b1e28nb[] = "R=%d(%d)"; +const char var7f1b1e34nb[] = "%s%sx %4.0f"; +const char var7f1b1e40nb[] = ""; +const char var7f1b1e44nb[] = ""; +const char var7f1b1e48nb[] = "%s%sy %4.0f"; +const char var7f1b1e54nb[] = ""; +const char var7f1b1e58nb[] = ""; +const char var7f1b1e5cnb[] = "%s%sz %4.0f"; +const char var7f1b1e68nb[] = ""; +const char var7f1b1e6cnb[] = ""; +const char var7f1b1e70nb[] = "%s %3d"; +const char var7f1b1e78nb[] = "lv.c Master DL overrun!"; +#endif + const char var7f1b7730[] = "fr: %d\n"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b1e98nb[] = "lv.c"; +#endif + const char var7f1b7738[] = "cutsceneframe: %d\n"; const char var7f1b774c[] = "pos:%s%s %.2f %.2f %.2f\n"; const char var7f1b7768[] = ""; @@ -558,6 +579,64 @@ void coreLoadStage(s32 stagenum) #else GLOBAL_ASM( glabel coreLoadStage +.late_rodata +glabel var7f1b1ed8nc +.word coreLoadStage+0x38c +glabel var7f1b1edcnc +.word coreLoadStage+0x394 +glabel var7f1b1ee0nc +.word coreLoadStage+0x394 +glabel var7f1b1ee4nc +.word coreLoadStage+0x394 +glabel var7f1b1ee8nc +.word coreLoadStage+0x394 +glabel var7f1b1eecnc +.word coreLoadStage+0x394 +glabel var7f1b1ef0nc +.word coreLoadStage+0x394 +glabel var7f1b1ef4nc +.word coreLoadStage+0x394 +glabel var7f1b1ef8nc +.word coreLoadStage+0x394 +glabel var7f1b1efcnc +.word coreLoadStage+0x38c +glabel var7f1b1f00nc +.word coreLoadStage+0x394 +glabel var7f1b1f04nc +.word coreLoadStage+0x394 +glabel var7f1b1f08nc +.word coreLoadStage+0x394 +glabel var7f1b1f0cnc +.word coreLoadStage+0x394 +glabel var7f1b1f10nc +.word coreLoadStage+0x394 +glabel var7f1b1f14nc +.word coreLoadStage+0x394 +glabel var7f1b1f18nc +.word coreLoadStage+0x394 +glabel var7f1b1f1cnc +.word coreLoadStage+0x394 +glabel var7f1b1f20nc +.word coreLoadStage+0x394 +glabel var7f1b1f24nc +.word coreLoadStage+0x394 +glabel var7f1b1f28nc +.word coreLoadStage+0x394 +glabel var7f1b1f2cnc +.word coreLoadStage+0x394 +glabel var7f1b1f30nc +.word coreLoadStage+0x38c +glabel var7f1b1f34nc +.word coreLoadStage+0x38c +glabel var7f1b1f38nc +.word coreLoadStage+0x394 +glabel var7f1b1f3cnc +.word coreLoadStage+0x394 +glabel var7f1b1f40nc +.word coreLoadStage+0x394 +glabel var7f1b1f44nc +.word coreLoadStage+0x38c +.text /* f1627b8: 27bdffe0 */ addiu $sp,$sp,-32 /* f1627bc: afbf001c */ sw $ra,0x1c($sp) /* f1627c0: afb10018 */ sw $s1,0x18($sp) @@ -1180,6 +1259,10 @@ bool coreCheckCmpFollowThreat(struct threat *threat, s32 index) #if VERSION < VERSION_NTSC_1_0 GLOBAL_ASM( glabel func7f163414nb +.late_rodata +glabel var7f1b1f68 +.word 0x40490fdb +.text /* f163414: 27bdff30 */ addiu $sp,$sp,-208 /* f163418: afbf003c */ sw $ra,0x3c($sp) /* f16341c: afb10038 */ sw $s1,0x38($sp) @@ -4281,6 +4364,22 @@ Gfx *coreRender(Gfx *gdl) #else GLOBAL_ASM( glabel coreRender +.late_rodata +glabel var7f1b1fbcnb +.word 0x3f866666 +glabel var7f1b1fc0nb +.word 0x3ca3d70b +glabel var7f1b1fc4nb +.word 0x3f8ccccd +glabel var7f1b1fc8nb +.word 0x3bda740e +glabel var7f1b1fccnb +.word 0x3ca3d70b +glabel var7f1b1fd0nb +.word 0x3f8ccccd +glabel var7f1b1fd4nb +.word 0x3bda740e +.text /* f164048: 27bdfe10 */ addiu $sp,$sp,-496 /* f16404c: afb20038 */ sw $s2,0x38($sp) /* f164050: afbf0054 */ sw $ra,0x54($sp) diff --git a/src/game/credits.c b/src/game/credits.c index b84195daf..3c12d83b4 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -4851,8 +4851,15 @@ void creditsTick(void) } } #else +const char var7f1afd10nb[] = "for"; +const char var7f1afd14nb[] = "flick"; + GLOBAL_ASM( glabel creditsTick +.late_rodata +glabel var7f1afe70nb +.word 0x3c23d70a +.text /* f135914: 27bdffe0 */ addiu $sp,$sp,-32 /* f135918: afbf001c */ sw $ra,0x1c($sp) /* f13591c: 3c047f1b */ lui $a0,0x7f1b diff --git a/src/game/debug2.c b/src/game/debug2.c index 5091d8c75..0c2fe7843 100644 --- a/src/game/debug2.c +++ b/src/game/debug2.c @@ -5,6 +5,128 @@ #include "data.h" #include "types.h" +// ntsc-beta rodata at 7f1af170 +char *g_DebugMenuLabels[] = { + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "All Levels", + "-", + + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "All Training", + + "-", + "-", + "props", + "-", + "-", + "-", + "-", + "-", + "-", + "tiles", + "pads", + "-", + "-", + "-", + "-", + + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + + "-", + "-", + "-", + "-", + "-", + "-", + "chr stats", + "-", + "all challenges", + "-", + "VM Stats", + "Mem Info", + "-", + + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "-", + "all buddies", + + "-", + "-", + "-", + "-", + "-", + "-", + "testing man pos", + "-", + "-", + "-", + "-", + "-", + "-", +}; + +const char var7f1af378nb[] = "main"; +const char var7f1af380nb[] = "scene %d"; + GLOBAL_ASM( glabel debug0f119270nb /* f119270: 27bdffd8 */ addiu $sp,$sp,-40 @@ -165,6 +287,186 @@ glabel debug0f11944cnb GLOBAL_ASM( glabel debug0f11946cnb +.late_rodata +glabel var7f1af38cnb +.word debug0f11946cnb+0x2a8 +glabel var7f1af390nb +.word debug0f11946cnb+0x428 +glabel var7f1af394nb +.word debug0f11946cnb+0x428 +glabel var7f1af398nb +.word debug0f11946cnb+0x428 +glabel var7f1af39cnb +.word debug0f11946cnb+0x428 +glabel var7f1af3a0nb +.word debug0f11946cnb+0x428 +glabel var7f1af3a4nb +.word debug0f11946cnb+0x428 +glabel var7f1af3a8nb +.word debug0f11946cnb+0x428 +glabel var7f1af3acnb +.word debug0f11946cnb+0x428 +glabel var7f1af3b0nb +.word debug0f11946cnb+0x428 +glabel var7f1af3b4nb +.word debug0f11946cnb+0x428 +glabel var7f1af3b8nb +.word debug0f11946cnb+0x428 +glabel var7f1af3bcnb +.word debug0f11946cnb+0x428 +glabel var7f1af3c0nb +.word debug0f11946cnb+0x428 +glabel var7f1af3c4nb +.word debug0f11946cnb+0x428 +glabel var7f1af3c8nb +.word debug0f11946cnb+0x428 +glabel var7f1af3ccnb +.word debug0f11946cnb+0x328 +glabel var7f1af3d0nb +.word debug0f11946cnb+0x428 +glabel var7f1af3d4nb +.word debug0f11946cnb+0x428 +glabel var7f1af3d8nb +.word debug0f11946cnb+0x3e4 +glabel var7f1af3dcnb +.word debug0f11946cnb+0x428 +glabel var7f1af3e0nb +.word debug0f11946cnb+0x428 +glabel var7f1af3e4nb +.word debug0f11946cnb+0x428 +glabel var7f1af3e8nb +.word debug0f11946cnb+0x428 +glabel var7f1af3ecnb +.word debug0f11946cnb+0x428 +glabel var7f1af3f0nb +.word debug0f11946cnb+0x428 +glabel var7f1af3f4nb +.word debug0f11946cnb+0x27c +glabel var7f1af3f8nb +.word debug0f11946cnb+0x250 +glabel var7f1af3fcnb +.word debug0f11946cnb+0x428 +glabel var7f1af400nb +.word debug0f11946cnb+0x428 +glabel var7f1af404nb +.word debug0f11946cnb+0x428 +glabel var7f1af408nb +.word debug0f11946cnb+0x3b4 +glabel var7f1af40cnb +.word debug0f11946cnb+0x428 +glabel var7f1af410nb +.word debug0f11946cnb+0x428 +glabel var7f1af414nb +.word debug0f11946cnb+0x428 +glabel var7f1af418nb +.word debug0f11946cnb+0x428 +glabel var7f1af41cnb +.word debug0f11946cnb+0x428 +glabel var7f1af420nb +.word debug0f11946cnb+0x428 +glabel var7f1af424nb +.word debug0f11946cnb+0x428 +glabel var7f1af428nb +.word debug0f11946cnb+0x428 +glabel var7f1af42cnb +.word debug0f11946cnb+0x428 +glabel var7f1af430nb +.word debug0f11946cnb+0x428 +glabel var7f1af434nb +.word debug0f11946cnb+0x428 +glabel var7f1af438nb +.word debug0f11946cnb+0x428 +glabel var7f1af43cnb +.word debug0f11946cnb+0x428 +glabel var7f1af440nb +.word debug0f11946cnb+0x428 +glabel var7f1af444nb +.word debug0f11946cnb+0x428 +glabel var7f1af448nb +.word debug0f11946cnb+0x428 +glabel var7f1af44cnb +.word debug0f11946cnb+0x428 +glabel var7f1af450nb +.word debug0f11946cnb+0x428 +glabel var7f1af454nb +.word debug0f11946cnb+0x428 +glabel var7f1af458nb +.word debug0f11946cnb+0x428 +glabel var7f1af45cnb +.word debug0f11946cnb+0x3cc +glabel var7f1af460nb +.word debug0f11946cnb+0x428 +glabel var7f1af464nb +.word debug0f11946cnb+0x2f0 +glabel var7f1af468nb +.word debug0f11946cnb+0x428 +glabel var7f1af46cnb +.word debug0f11946cnb+0x3fc +glabel var7f1af470nb +.word debug0f11946cnb+0x414 +glabel var7f1af474nb +.word debug0f11946cnb+0x428 +glabel var7f1af478nb +.word debug0f11946cnb+0x428 +glabel var7f1af47cnb +.word debug0f11946cnb+0x428 +glabel var7f1af480nb +.word debug0f11946cnb+0x428 +glabel var7f1af484nb +.word debug0f11946cnb+0x428 +glabel var7f1af488nb +.word debug0f11946cnb+0x428 +glabel var7f1af48cnb +.word debug0f11946cnb+0x428 +glabel var7f1af490nb +.word debug0f11946cnb+0x428 +glabel var7f1af494nb +.word debug0f11946cnb+0x428 +glabel var7f1af498nb +.word debug0f11946cnb+0x428 +glabel var7f1af49cnb +.word debug0f11946cnb+0x428 +glabel var7f1af4a0nb +.word debug0f11946cnb+0x428 +glabel var7f1af4a4nb +.word debug0f11946cnb+0x428 +glabel var7f1af4a8nb +.word debug0f11946cnb+0x428 +glabel var7f1af4acnb +.word debug0f11946cnb+0x428 +glabel var7f1af4b0nb +.word debug0f11946cnb+0x428 +glabel var7f1af4b4nb +.word debug0f11946cnb+0x428 +glabel var7f1af4b8nb +.word debug0f11946cnb+0x428 +glabel var7f1af4bcnb +.word debug0f11946cnb+0x428 +glabel var7f1af4c0nb +.word debug0f11946cnb+0x428 +glabel var7f1af4c4nb +.word debug0f11946cnb+0x428 +glabel var7f1af4c8nb +.word debug0f11946cnb+0x428 +glabel var7f1af4ccnb +.word debug0f11946cnb+0x428 +glabel var7f1af4d0nb +.word debug0f11946cnb+0x310 +glabel var7f1af4d4nb +.word debug0f11946cnb+0x428 +glabel var7f1af4d8nb +.word debug0f11946cnb+0x428 +glabel var7f1af4dcnb +.word debug0f11946cnb+0x428 +glabel var7f1af4e0nb +.word debug0f11946cnb+0x428 +glabel var7f1af4e4nb +.word debug0f11946cnb+0x428 +glabel var7f1af4e8nb +.word debug0f11946cnb+0x428 +glabel var7f1af4ecnb +.word debug0f11946cnb+0x238 +.text /* f11946c: 27bdffd0 */ addiu $sp,$sp,-48 /* f119470: afbf0014 */ sw $ra,0x14($sp) /* f119474: afa40030 */ sw $a0,0x30($sp) diff --git a/src/game/dlights.c b/src/game/dlights.c index 70ce955bf..e237a3270 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -3464,15 +3464,15 @@ GLOBAL_ASM( glabel func0f0037ac .late_rodata glabel var7f1a7dbc -.word func0f0037ac+0x134 # f0038e0 +.word func0f0037ac+0x154 glabel var7f1a7dc0 -.word func0f0037ac+0x194 # f003940 +.word func0f0037ac+0x1b4 glabel var7f1a7dc4 -.word func0f0037ac+0x278 # f003a24 +.word func0f0037ac+0x298 glabel var7f1a7dc8 -.word func0f0037ac+0x328 # f003ad4 +.word func0f0037ac+0x348 glabel var7f1a7dcc -.word func0f0037ac+0x410 # f003bbc +.word func0f0037ac+0x430 glabel var7f1a7dd0 .word 0x40c90fdb glabel var7f1a7dd4 diff --git a/src/game/explosions/explosions.c b/src/game/explosions/explosions.c index 5024d0d7e..6bd1200ff 100644 --- a/src/game/explosions/explosions.c +++ b/src/game/explosions/explosions.c @@ -27,27 +27,6 @@ #include "data.h" #include "types.h" -const char var7f1b5230[] = "VTXSTORE : vtxfixrefs -> Start - p1=%x, p2=%x\n"; -const char var7f1b5260[] = "vtxfixrefs : Part=%x -- Mapping ptr %x -> %x\n"; -const char var7f1b5290[] = "VTXSTORE : vtxfixrefs -> End - Done=%d\n"; -const char var7f1b52b8[] = "vtxstorecheck : memaFree -> %u bytes at Ptr=%x(%x)\n"; -const char var7f1b52ec[] = "vtxstorecheck : At block 1 %d -> Ref1=%x, Ref2=%x\n"; -const char var7f1b5320[] = "vtxstorecheck : At block 2 %d -> Ref1=%x, Ref2=%x\n"; -const char var7f1b5354[] = "vtx buffer low, need to delete objects\n"; -const char var7f1b537c[] = "getfreevertices : %d of type %d -> ref1=%x, ref2=%x\n"; -const char var7f1b53b4[] = "vtxstore: 1st mema alloc of %u bytes\n"; -const char var7f1b53dc[] = "getfreevertices : Return ptr = %x\n"; -const char var7f1b5400[] = "vtxstore: Out of mema (returning NULL)\n"; -const char var7f1b5428[] = "vtxstore: GROSS! CorspeCount > MAX_CORPSES corpses! Freeing corpse %x\n"; -const char var7f1b5470[] = "vtxstore: CorpseCount %d, Trying to free %d\n"; -const char var7f1b54a0[] = "vtxstore: Freeing corpse %x\n"; -const char var7f1b54c0[] = "vtxstore: Out of vertices type %d wanted %d free %d (returning NULL)\n"; -const char var7f1b5508[] = "vtxstore: freevertices type %d, list %x\n"; -const char var7f1b5534[] = "freevertices: address not found in array %x\n"; -const char var7f1b5564[] = ""; -const char var7f1b5568[] = ""; -const char var7f1b556c[] = ""; - struct explosion *g_Explosions; s32 g_MaxExplosions; diff --git a/src/game/file.c b/src/game/file.c index 78e6fa85e..406be9ddc 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -2027,6 +2027,13 @@ extern void *_file_Asaucerexp1M; #endif extern void *_filenamesSegmentRomStart; +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b1d40nb[] = "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x"; +const char var7f1b1d78nb[] = "ob.c"; +const char var7f1b1d80nb[] = "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"; +const char var7f1b1dd8nb[] = "ob.c"; +#endif + struct fileinfo g_FileInfo[NUM_FILES]; u32 var800aa570; diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index fb4a5e42b..70f54617b 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -3608,31 +3608,31 @@ glabel menuTickAll glabel var7f1a8608 .word 0x3ca3d70a glabel var7f1a860c -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8610 -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8614 -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8618 -.word menuTickAll+0x16c0 # f01d5e8 +.word menuTickAll+0x16a0 glabel var7f1a861c -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8620 -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8624 -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8628 -.word menuTickAll+0x16c0 # f01d5e8 +.word menuTickAll+0x16a0 glabel var7f1a862c -.word menuTickAll+0x16c0 # f01d5e8 +.word menuTickAll+0x16a0 glabel var7f1a8630 -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8634 -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c glabel var7f1a8638 -.word menuTickAll+0x16c0 # f01d5e8 +.word menuTickAll+0x16a0 glabel var7f1a863c -.word menuTickAll+0x168c # f01d5b4 +.word menuTickAll+0x166c .text /* f01bc28: 27bdfe98 */ addiu $sp,$sp,-360 /* f01bc2c: 3c0e8007 */ lui $t6,0x8007 diff --git a/src/game/game_092610.c b/src/game/game_092610.c index 387e896e3..c23e635fc 100644 --- a/src/game/game_092610.c +++ b/src/game/game_092610.c @@ -17,15 +17,43 @@ #include "data.h" #include "types.h" +#if VERSION < VERSION_NTSC_1_0 +const char var7f1a5720nb[] = "SND : Stop -> Prop=%x, Id=%d\n"; +#endif + const char var7f1ab400[] = "Propsnd : USING TIME 60\n"; const char var7f1ab41c[] = "PS_AUTO : Un-Pausing %d\n"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1a5778nb[] = "PS_AUTO : Pausing %d\n"; +const char var7f1a5790nb[] = "SND : Propsound needs play : Id %d is flaged g\n"; +const char var7f1a57c0nb[] = "AISND : Channel %d - %s"; +const char var7f1a57d8nb[] = "FREE"; +const char var7f1a57e0nb[] = "IN USE"; +#endif + const char var7f1ab438[] = "Propsnd : Using %d of %d (Peek = %d of %d)"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1ab464[] = "AISOUND: aisoundnewtypeflags - Channel %d -> Playing sound number id=%d(%x)\n"; const char var7f1ab4b4[] = "AISOUND: PSTYPE_MARKER - Channel %d -> Playing sound number id=%d(%x)\n"; const char var7f1ab4fc[] = "AISOUND: PSTYPE_MARKER - Channel %d -> Playing sound number id=%d(%x)\n"; +#else +const char var7f1a5814nb[] = "SND : Start -> Prop=%x, Id=%d, Vol=%d, Flags=%d, Type=%d\n"; +const char var7f1a5850nb[] = "AISOUND: Channel %d -> Playing sound number id=%d(%x))\n"; +#endif + const char var7f1ab544[] = "AISOUND: CUTSCENE -> Playing sound number id=%d(%x))\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1ab57c[] = "AISOUND: Channel %d -> Playing sound number id=%d(%x), Prop=%x, Flags=%x, Type=%d, Zero=%d\n"; const char var7f1ab5d8[] = "AISOUND: Channel %d -> Playing sound number id=%d(%x), Prop=%x, Flags=%x, Type=%d\n"; +#else +const char var7f1ab58c0nb[] = "AISOUND: DONTCARE -> Playing sound number id=%d(%x))\n"; +const char var7f1ab58f8nb[] = "AISOUND: Channel %d -> Playing sound number id=%d(%x), Prop=%x\n"; +const char var7f1ab5938nb[] = "SERIOUS: Existing ai sound number %d (Sound id=%d(%x)) : KILLING\n"; +#endif + const char var7f1ab62c[] = "AISOUND: CUTSCENE -> Stopping all cutscene sounds\n"; const char var7f1ab660[] = "AISOUND: Stop sound channel %d\n"; const char var7f1ab680[] = "AISOUND: Channel %d -> Setting params : Vol=%d, Pad=%d, Prop=%x, Time=%d, Far=%d, Silence=%d, Flags=%u\n"; @@ -3434,6 +3462,8 @@ glabel var7f1ab744 .word 0x451c4000 glabel var7f1ab748 .word 0x453b8000 +glabel var7f1a5a9cnb +.word 0x4b18967f .text /* f091d88: 27bdff48 */ addiu $sp,$sp,-184 /* f091d8c: afa600c0 */ sw $a2,0xc0($sp) diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 7a110f53e..2368db78e 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -5126,7 +5126,7 @@ glabel var7f1ac31c /* f09a308: 03e00008 */ jr $ra /* f09a30c: 00000000 */ nop ); -#else +#elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( glabel func0f099c48 .late_rodata @@ -5786,6 +5786,664 @@ glabel var7f1ac31c /* f09a308: 03e00008 */ jr $ra /* f09a30c: 00000000 */ nop ); +#else +GLOBAL_ASM( +glabel func0f099c48 +.late_rodata +glabel var7f1ac1b8 +.word 0x3f5f5dd8 +glabel var7f1ac1bc +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac1c0 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac1c4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1c8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1cc +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1d0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1d4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1d8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1dc +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1e0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1e4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1e8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1ec +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1f0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1f4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1f8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac1fc +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac200 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac204 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac208 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac20c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac210 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac214 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac218 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac21c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac220 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac224 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac228 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac22c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac230 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac234 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac238 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac23c +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac240 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac244 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac248 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac24c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac250 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac254 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac258 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac25c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac260 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac264 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac268 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac26c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac270 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac274 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac278 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac27c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac280 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac284 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac288 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac28c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac290 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac294 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac298 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac29c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2a0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2a4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2a8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2ac +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2b0 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac2b4 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac2b8 +.word func0f099c48+0x570 # f09a1b8 +glabel var7f1ac2bc +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2c0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2c4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2c8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2cc +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2d0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2d4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2d8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2dc +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2e0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2e4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2e8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2ec +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2f0 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2f4 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2f8 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac2fc +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac300 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac304 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac308 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac30c +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac310 +.word func0f099c48+0x534 # f09a17c +glabel var7f1ac314 +.word func0f099c48+0x570 +glabel var7f1ac31c +.word 0x3f5f5dd8 +.text +/* f099c48: 27bdffc8 */ addiu $sp,$sp,-56 +/* f099c4c: afbf002c */ sw $ra,0x2c($sp) +/* f099c50: afb00028 */ sw $s0,0x28($sp) +/* f099c54: afa40038 */ sw $a0,0x38($sp) +/* f099c58: 00c08025 */ or $s0,$a2,$zero +/* f099c5c: afa5003c */ sw $a1,0x3c($sp) +/* f099c60: afa70044 */ sw $a3,0x44($sp) +/* f099c64: 0fc2c41f */ jal handGetWeaponFunction +/* f099c68: 00c02025 */ or $a0,$a2,$zero +/* f099c6c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f099c70: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) +/* f099c74: afa20030 */ sw $v0,0x30($sp) +/* f099c78: 2418ffff */ addiu $t8,$zero,-1 +/* f099c7c: 8dcf00d8 */ lw $t7,0xd8($t6) +/* f099c80: 00002825 */ or $a1,$zero,$zero +/* f099c84: 51e0000a */ beqzl $t7,.L0f099cb0 +/* f099c88: 8e190618 */ lw $t9,0x618($s0) +/* f099c8c: ae00068c */ sw $zero,0x68c($s0) +/* f099c90: ae180680 */ sw $t8,0x680($s0) +/* f099c94: 0fc27346 */ jal func0f09cd18 +/* f099c98: 8fa4003c */ lw $a0,0x3c($sp) +/* f099c9c: 50400004 */ beqzl $v0,.L0f099cb0 +/* f099ca0: 8e190618 */ lw $t9,0x618($s0) +/* f099ca4: 10000195 */ b .L0f09a2fc +/* f099ca8: 8fa20044 */ lw $v0,0x44($sp) +/* f099cac: 8e190618 */ lw $t9,0x618($s0) +.L0f099cb0: +/* f099cb0: 8fa9003c */ lw $t1,0x3c($sp) +/* f099cb4: 3c08800a */ lui $t0,%hi(g_Vars+0x284) +/* f099cb8: 17200018 */ bnez $t9,.L0f099d1c +/* f099cbc: 00095100 */ sll $t2,$t1,0x4 +/* f099cc0: 01495023 */ subu $t2,$t2,$t1 +/* f099cc4: 000a5080 */ sll $t2,$t2,0x2 +/* f099cc8: 01495021 */ addu $t2,$t2,$t1 +/* f099ccc: 000a50c0 */ sll $t2,$t2,0x3 +/* f099cd0: 8d08a244 */ lw $t0,%lo(g_Vars+0x284)($t0) +/* f099cd4: 01495021 */ addu $t2,$t2,$t1 +/* f099cd8: 000a5080 */ sll $t2,$t2,0x2 +/* f099cdc: 000a5823 */ negu $t3,$t2 +/* f099ce0: 240cffff */ addiu $t4,$zero,-1 +/* f099ce4: ae0c0670 */ sw $t4,0x670($s0) +/* f099ce8: ae000674 */ sw $zero,0x674($s0) +/* f099cec: 010b1021 */ addu $v0,$t0,$t3 +/* f099cf0: 8c4d13e0 */ lw $t5,0x13e0($v0) +/* f099cf4: 24010001 */ addiu $at,$zero,0x1 +/* f099cf8: 24420ddc */ addiu $v0,$v0,0xddc +/* f099cfc: 55a10008 */ bnel $t5,$at,.L0f099d20 +/* f099d00: 8e030608 */ lw $v1,0x608($s0) +/* f099d04: 8c4e0614 */ lw $t6,0x614($v0) +/* f099d08: 240f0009 */ addiu $t7,$zero,0x9 +/* f099d0c: 29c10014 */ slti $at,$t6,0x14 +/* f099d10: 50200003 */ beqzl $at,.L0f099d20 +/* f099d14: 8e030608 */ lw $v1,0x608($s0) +/* f099d18: ae0f0608 */ sw $t7,0x608($s0) +.L0f099d1c: +/* f099d1c: 8e030608 */ lw $v1,0x608($s0) +.L0f099d20: +/* f099d20: 8fb9003c */ lw $t9,0x3c($sp) +/* f099d24: 24010009 */ addiu $at,$zero,0x9 +/* f099d28: 1461001a */ bne $v1,$at,.L0f099d94 +/* f099d2c: 00194900 */ sll $t1,$t9,0x4 +/* f099d30: 01394823 */ subu $t1,$t1,$t9 +/* f099d34: 00094880 */ sll $t1,$t1,0x2 +/* f099d38: 01394821 */ addu $t1,$t1,$t9 +/* f099d3c: 000948c0 */ sll $t1,$t1,0x3 +/* f099d40: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f099d44: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) +/* f099d48: 01394821 */ addu $t1,$t1,$t9 +/* f099d4c: 00094880 */ sll $t1,$t1,0x2 +/* f099d50: 00095023 */ negu $t2,$t1 +/* f099d54: 030a1021 */ addu $v0,$t8,$t2 +/* f099d58: 8c4813e0 */ lw $t0,0x13e0($v0) +/* f099d5c: 24010001 */ addiu $at,$zero,0x1 +/* f099d60: 24420ddc */ addiu $v0,$v0,0xddc +/* f099d64: 15010007 */ bne $t0,$at,.L0f099d84 +/* f099d68: 00001825 */ or $v1,$zero,$zero +/* f099d6c: 8c4b0614 */ lw $t3,0x614($v0) +/* f099d70: 29610014 */ slti $at,$t3,0x14 +/* f099d74: 50200004 */ beqzl $at,.L0f099d88 +/* f099d78: ae000614 */ sw $zero,0x614($s0) +/* f099d7c: 1000015f */ b .L0f09a2fc +/* f099d80: 00001025 */ or $v0,$zero,$zero +.L0f099d84: +/* f099d84: ae000614 */ sw $zero,0x614($s0) +.L0f099d88: +/* f099d88: ae000618 */ sw $zero,0x618($s0) +/* f099d8c: ae000608 */ sw $zero,0x608($s0) +/* f099d90: ae00061c */ sw $zero,0x61c($s0) +.L0f099d94: +/* f099d94: 54600095 */ bnezl $v1,.L0f099fec +/* f099d98: 24010001 */ addiu $at,$zero,0x1 +/* f099d9c: 8e0c0618 */ lw $t4,0x618($s0) +/* f099da0: 8fad0030 */ lw $t5,0x30($sp) +/* f099da4: 8faa0030 */ lw $t2,0x30($sp) +/* f099da8: 5580003f */ bnezl $t4,.L0f099ea8 +/* f099dac: 8fb80038 */ lw $t8,0x38($sp) +/* f099db0: 11a00034 */ beqz $t5,.L0f099e84 +/* f099db4: 8fa4003c */ lw $a0,0x3c($sp) +/* f099db8: 81a20007 */ lb $v0,0x7($t5) +/* f099dbc: 24010001 */ addiu $at,$zero,0x1 +/* f099dc0: 8fae0038 */ lw $t6,0x38($sp) +/* f099dc4: 50400004 */ beqzl $v0,.L0f099dd8 +/* f099dc8: 8dcf0004 */ lw $t7,0x4($t6) +/* f099dcc: 1441002d */ bne $v0,$at,.L0f099e84 +/* f099dd0: 00000000 */ nop +/* f099dd4: 8dcf0004 */ lw $t7,0x4($t6) +.L0f099dd8: +/* f099dd8: 0002c880 */ sll $t9,$v0,0x2 +/* f099ddc: 01f94821 */ addu $t1,$t7,$t9 +/* f099de0: 8d38001c */ lw $t8,0x1c($t1) +/* f099de4: 24690001 */ addiu $t1,$v1,0x1 +/* f099de8: 8f04000c */ lw $a0,0xc($t8) +/* f099dec: 10800023 */ beqz $a0,.L0f099e7c +/* f099df0: 00000000 */ nop +/* f099df4: 8dca0000 */ lw $t2,0x0($t6) +/* f099df8: 2401001a */ addiu $at,$zero,0x1a +/* f099dfc: 8fa5003c */ lw $a1,0x3c($sp) +/* f099e00: 1141001e */ beq $t2,$at,.L0f099e7c +/* f099e04: 00000000 */ nop +/* f099e08: 0fc26238 */ jal func0f0988e0 +/* f099e0c: 02003025 */ or $a2,$s0,$zero +/* f099e10: 920b06d6 */ lbu $t3,0x6d6($s0) +/* f099e14: 8fa30038 */ lw $v1,0x38($sp) +/* f099e18: 356c0001 */ ori $t4,$t3,0x1 +/* f099e1c: a20c06d6 */ sb $t4,0x6d6($s0) +/* f099e20: 8faf0030 */ lw $t7,0x30($sp) +/* f099e24: 8c6d0004 */ lw $t5,0x4($v1) +/* f099e28: 81f90007 */ lb $t9,0x7($t7) +/* f099e2c: 00194880 */ sll $t1,$t9,0x2 +/* f099e30: 01a9c021 */ addu $t8,$t5,$t1 +/* f099e34: 8f0e001c */ lw $t6,0x1c($t8) +/* f099e38: 91ca0010 */ lbu $t2,0x10($t6) +/* f099e3c: 31480004 */ andi $t0,$t2,0x4 +/* f099e40: 51000005 */ beqzl $t0,.L0f099e58 +/* f099e44: 8c620000 */ lw $v0,0x0($v1) +/* f099e48: 920c0690 */ lbu $t4,0x690($s0) +/* f099e4c: 358f0020 */ ori $t7,$t4,0x20 +/* f099e50: a20f0690 */ sb $t7,0x690($s0) +/* f099e54: 8c620000 */ lw $v0,0x0($v1) +.L0f099e58: +/* f099e58: 2401001e */ addiu $at,$zero,0x1e +/* f099e5c: 10410003 */ beq $v0,$at,.L0f099e6c +/* f099e60: 2401001f */ addiu $at,$zero,0x1f +/* f099e64: 1441000d */ bne $v0,$at,.L0f099e9c +/* f099e68: 00000000 */ nop +.L0f099e6c: +/* f099e6c: 921906d6 */ lbu $t9,0x6d6($s0) +/* f099e70: 332dff0f */ andi $t5,$t9,0xff0f +/* f099e74: 10000009 */ b .L0f099e9c +/* f099e78: a20d06d6 */ sb $t5,0x6d6($s0) +.L0f099e7c: +/* f099e7c: 10000007 */ b .L0f099e9c +/* f099e80: ae090608 */ sw $t1,0x608($s0) +.L0f099e84: +/* f099e84: 0fc27346 */ jal func0f09cd18 +/* f099e88: 00002825 */ or $a1,$zero,$zero +/* f099e8c: 10400003 */ beqz $v0,.L0f099e9c +/* f099e90: 00000000 */ nop +/* f099e94: 10000119 */ b .L0f09a2fc +/* f099e98: 8fa20044 */ lw $v0,0x44($sp) +.L0f099e9c: +/* f099e9c: 10000052 */ b .L0f099fe8 +/* f099ea0: 8e030608 */ lw $v1,0x608($s0) +/* f099ea4: 8fb80038 */ lw $t8,0x38($sp) +.L0f099ea8: +/* f099ea8: 81480007 */ lb $t0,0x7($t2) +/* f099eac: 02002025 */ or $a0,$s0,$zero +/* f099eb0: 8f0e0004 */ lw $t6,0x4($t8) +/* f099eb4: 00085880 */ sll $t3,$t0,0x2 +/* f099eb8: 01cb6021 */ addu $t4,$t6,$t3 +/* f099ebc: 8d8f001c */ lw $t7,0x1c($t4) +/* f099ec0: 91f90010 */ lbu $t9,0x10($t7) +/* f099ec4: 332d0004 */ andi $t5,$t9,0x4 +/* f099ec8: 51a0002b */ beqzl $t5,.L0f099f78 +/* f099ecc: 8e18060c */ lw $t8,0x60c($s0) +/* f099ed0: 0fc26291 */ jal func0f098a44 +/* f099ed4: 24050001 */ addiu $a1,$zero,0x1 +/* f099ed8: 5040001f */ beqzl $v0,.L0f099f58 +/* f099edc: ae00060c */ sw $zero,0x60c($s0) +/* f099ee0: 8e09060c */ lw $t1,0x60c($s0) +/* f099ee4: 8fa50038 */ lw $a1,0x38($sp) +/* f099ee8: 02003025 */ or $a2,$s0,$zero +/* f099eec: 31380010 */ andi $t8,$t1,0x10 +/* f099ef0: 17000019 */ bnez $t8,.L0f099f58 +/* f099ef4: 24070001 */ addiu $a3,$zero,0x1 +/* f099ef8: 92040003 */ lbu $a0,0x3($s0) +/* f099efc: 0fc2637e */ jal func0f098df8 +/* f099f00: afa00010 */ sw $zero,0x10($sp) +/* f099f04: 8e0a060c */ lw $t2,0x60c($s0) +/* f099f08: 92040003 */ lbu $a0,0x3($s0) +/* f099f0c: 02003025 */ or $a2,$s0,$zero +/* f099f10: 35480010 */ ori $t0,$t2,0x10 +/* f099f14: ae08060c */ sw $t0,0x60c($s0) +/* f099f18: 0fc26328 */ jal func0f098ca0 +/* f099f1c: 8fa50038 */ lw $a1,0x38($sp) +/* f099f20: 28410002 */ slti $at,$v0,0x2 +/* f099f24: 54200005 */ bnezl $at,.L0f099f3c +/* f099f28: 2401ffff */ addiu $at,$zero,-1 +/* f099f2c: 920e0690 */ lbu $t6,0x690($s0) +/* f099f30: 31cbffdf */ andi $t3,$t6,0xffdf +/* f099f34: a20b0690 */ sb $t3,0x690($s0) +/* f099f38: 2401ffff */ addiu $at,$zero,-1 +.L0f099f3c: +/* f099f3c: 54410007 */ bnel $v0,$at,.L0f099f5c +/* f099f40: 8e19000c */ lw $t9,0xc($s0) +/* f099f44: 920c0690 */ lbu $t4,0x690($s0) +/* f099f48: 318fffdf */ andi $t7,$t4,0xffdf +/* f099f4c: 10000002 */ b .L0f099f58 +/* f099f50: a20f0690 */ sb $t7,0x690($s0) +/* f099f54: ae00060c */ sw $zero,0x60c($s0) +.L0f099f58: +/* f099f58: 8e19000c */ lw $t9,0xc($s0) +.L0f099f5c: +/* f099f5c: 53200017 */ beqzl $t9,.L0f099fbc +/* f099f60: 8e0b068c */ lw $t3,0x68c($s0) +/* f099f64: 920d0690 */ lbu $t5,0x690($s0) +/* f099f68: 31a9ffdf */ andi $t1,$t5,0xffdf +/* f099f6c: 10000012 */ b .L0f099fb8 +/* f099f70: a2090690 */ sb $t1,0x690($s0) +/* f099f74: 8e18060c */ lw $t8,0x60c($s0) +.L0f099f78: +/* f099f78: 02002025 */ or $a0,$s0,$zero +/* f099f7c: 330a0010 */ andi $t2,$t8,0x10 +/* f099f80: 5540000e */ bnezl $t2,.L0f099fbc +/* f099f84: 8e0b068c */ lw $t3,0x68c($s0) +/* f099f88: 0fc26291 */ jal func0f098a44 +/* f099f8c: 24050001 */ addiu $a1,$zero,0x1 +/* f099f90: 10400009 */ beqz $v0,.L0f099fb8 +/* f099f94: 8fa50038 */ lw $a1,0x38($sp) +/* f099f98: 92040003 */ lbu $a0,0x3($s0) +/* f099f9c: afa00010 */ sw $zero,0x10($sp) +/* f099fa0: 02003025 */ or $a2,$s0,$zero +/* f099fa4: 0fc2637e */ jal func0f098df8 +/* f099fa8: 00003825 */ or $a3,$zero,$zero +/* f099fac: 8e08060c */ lw $t0,0x60c($s0) +/* f099fb0: 350e0010 */ ori $t6,$t0,0x10 +/* f099fb4: ae0e060c */ sw $t6,0x60c($s0) +.L0f099fb8: +/* f099fb8: 8e0b068c */ lw $t3,0x68c($s0) +.L0f099fbc: +/* f099fbc: 24010002 */ addiu $at,$zero,0x2 +/* f099fc0: 8fa4003c */ lw $a0,0x3c($sp) +/* f099fc4: 51610008 */ beql $t3,$at,.L0f099fe8 +/* f099fc8: 8e030608 */ lw $v1,0x608($s0) +/* f099fcc: 0fc27346 */ jal func0f09cd18 +/* f099fd0: 00002825 */ or $a1,$zero,$zero +/* f099fd4: 50400004 */ beqzl $v0,.L0f099fe8 +/* f099fd8: 8e030608 */ lw $v1,0x608($s0) +/* f099fdc: 100000c7 */ b .L0f09a2fc +/* f099fe0: 8fa20044 */ lw $v0,0x44($sp) +/* f099fe4: 8e030608 */ lw $v1,0x608($s0) +.L0f099fe8: +/* f099fe8: 24010001 */ addiu $at,$zero,0x1 +.L0f099fec: +/* f099fec: 5461001f */ bnel $v1,$at,.L0f09a06c +/* f099ff0: 24010002 */ addiu $at,$zero,0x2 +/* f099ff4: 8e02001c */ lw $v0,0x1c($s0) +/* f099ff8: 240f000b */ addiu $t7,$zero,0xb +/* f099ffc: 24790001 */ addiu $t9,$v1,0x1 +/* f09a000: 28410010 */ slti $at,$v0,0x10 +/* f09a004: 10200004 */ beqz $at,.L0f09a018 +/* f09a008: 240d0011 */ addiu $t5,$zero,0x11 +/* f09a00c: 820c0007 */ lb $t4,0x7($s0) +/* f09a010: 55800009 */ bnezl $t4,.L0f09a038 +/* f09a014: 44822000 */ mtc1 $v0,$f4 +.L0f09a018: +/* f09a018: ae0f0020 */ sw $t7,0x20($s0) +/* f09a01c: ae190608 */ sw $t9,0x608($s0) +/* f09a020: ae0d0038 */ sw $t5,0x38($s0) +/* f09a024: ae00001c */ sw $zero,0x1c($s0) +/* f09a028: ae000018 */ sw $zero,0x18($s0) +/* f09a02c: 1000000e */ b .L0f09a068 +/* f09a030: 03201825 */ or $v1,$t9,$zero +/* f09a034: 44822000 */ mtc1 $v0,$f4 +.L0f09a038: +/* f09a038: 3c017f1b */ lui $at,%hi(var7f1ac1b8) +/* f09a03c: c428c1b8 */ lwc1 $f8,%lo(var7f1ac1b8)($at) +/* f09a040: 468021a0 */ cvt.s.w $f6,$f4 +/* f09a044: 3c014180 */ lui $at,0x4180 +/* f09a048: 44818000 */ mtc1 $at,$f16 +/* f09a04c: 02002025 */ or $a0,$s0,$zero +/* f09a050: 46083282 */ mul.s $f10,$f6,$f8 +/* f09a054: 46105483 */ div.s $f18,$f10,$f16 +/* f09a058: 44059000 */ mfc1 $a1,$f18 +/* f09a05c: 0fc265e0 */ jal func0f099780 +/* f09a060: 00000000 */ nop +/* f09a064: 8e030608 */ lw $v1,0x608($s0) +.L0f09a068: +/* f09a068: 24010002 */ addiu $at,$zero,0x2 +.L0f09a06c: +/* f09a06c: 54610069 */ bnel $v1,$at,.L0f09a214 +/* f09a070: 24010003 */ addiu $at,$zero,0x3 +/* f09a074: 8e090018 */ lw $t1,0x18($s0) +/* f09a078: 8fb80038 */ lw $t8,0x38($sp) +/* f09a07c: 5520004f */ bnezl $t1,.L0f09a1bc +/* f09a080: 8e0e001c */ lw $t6,0x1c($s0) +/* f09a084: 8f0a0000 */ lw $t2,0x0($t8) +/* f09a088: 2401001a */ addiu $at,$zero,0x1a +/* f09a08c: 8fa80030 */ lw $t0,0x30($sp) +/* f09a090: 55410012 */ bnel $t2,$at,.L0f09a0dc +/* f09a094: 8e0a060c */ lw $t2,0x60c($s0) +/* f09a098: 81020007 */ lb $v0,0x7($t0) +/* f09a09c: 0442000f */ bltzl $v0,.L0f09a0dc +/* f09a0a0: 8e0a060c */ lw $t2,0x60c($s0) +/* f09a0a4: 8f0e0004 */ lw $t6,0x4($t8) +/* f09a0a8: 00025880 */ sll $t3,$v0,0x2 +/* f09a0ac: 8fa5003c */ lw $a1,0x3c($sp) +/* f09a0b0: 01cb6021 */ addu $t4,$t6,$t3 +/* f09a0b4: 8d8f001c */ lw $t7,0x1c($t4) +/* f09a0b8: 8de4000c */ lw $a0,0xc($t7) +/* f09a0bc: 50800007 */ beqzl $a0,.L0f09a0dc +/* f09a0c0: 8e0a060c */ lw $t2,0x60c($s0) +/* f09a0c4: 0fc26238 */ jal func0f0988e0 +/* f09a0c8: 02003025 */ or $a2,$s0,$zero +/* f09a0cc: 920d0690 */ lbu $t5,0x690($s0) +/* f09a0d0: 35a90040 */ ori $t1,$t5,0x40 +/* f09a0d4: a2090690 */ sb $t1,0x690($s0) +/* f09a0d8: 8e0a060c */ lw $t2,0x60c($s0) +.L0f09a0dc: +/* f09a0dc: 8fa50038 */ lw $a1,0x38($sp) +/* f09a0e0: 02003025 */ or $a2,$s0,$zero +/* f09a0e4: 31480010 */ andi $t0,$t2,0x10 +/* f09a0e8: 15000004 */ bnez $t0,.L0f09a0fc +/* f09a0ec: 00003825 */ or $a3,$zero,$zero +/* f09a0f0: 92040003 */ lbu $a0,0x3($s0) +/* f09a0f4: 0fc2637e */ jal func0f098df8 +/* f09a0f8: afa00010 */ sw $zero,0x10($sp) +.L0f09a0fc: +/* f09a0fc: 3c18800a */ lui $t8,%hi(g_Vars+0x34) +/* f09a100: 8f189ff4 */ lw $t8,%lo(g_Vars+0x34)($t8) +/* f09a104: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) +/* f09a108: 5b00002c */ blezl $t8,.L0f09a1bc +/* f09a10c: 8e0e001c */ lw $t6,0x1c($s0) +/* f09a110: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) +/* f09a114: 24010001 */ addiu $at,$zero,0x1 +/* f09a118: 8dcb0000 */ lw $t3,0x0($t6) +/* f09a11c: 51610027 */ beql $t3,$at,.L0f09a1bc +/* f09a120: 8e0e001c */ lw $t6,0x1c($s0) +/* f09a124: 0fc2775f */ jal func0f09dd7c +/* f09a128: 00000000 */ nop +/* f09a12c: 10400022 */ beqz $v0,.L0f09a1b8 +/* f09a130: 3c0c8007 */ lui $t4,%hi(g_PlayerInvincible) +/* f09a134: 8d8c0760 */ lw $t4,%lo(g_PlayerInvincible)($t4) +/* f09a138: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) +/* f09a13c: 5580001f */ bnezl $t4,.L0f09a1bc +/* f09a140: 8e0e001c */ lw $t6,0x1c($s0) +/* f09a144: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) +/* f09a148: 8fad0038 */ lw $t5,0x38($sp) +/* f09a14c: 8df900d8 */ lw $t9,0xd8($t7) +/* f09a150: 5720001a */ bnezl $t9,.L0f09a1bc +/* f09a154: 8e0e001c */ lw $t6,0x1c($s0) +/* f09a158: 8da90000 */ lw $t1,0x0($t5) +/* f09a15c: 2d210058 */ sltiu $at,$t1,0x58 +/* f09a160: 10200006 */ beqz $at,.L0f09a17c +/* f09a164: 00094880 */ sll $t1,$t1,0x2 +/* f09a168: 3c017f1b */ lui $at,%hi(var7f1ac1bc) +/* f09a16c: 00290821 */ addu $at,$at,$t1 +/* f09a170: 8c29c1bc */ lw $t1,%lo(var7f1ac1bc)($at) +/* f09a174: 01200008 */ jr $t1 +/* f09a178: 00000000 */ nop +.L0f09a17c: +/* f09a17c: 3c01bf80 */ lui $at,0xbf80 +/* f09a180: 44812000 */ mtc1 $at,$f4 +/* f09a184: 3c048009 */ lui $a0,%hi(var80095200) +/* f09a188: 240affff */ addiu $t2,$zero,-1 +/* f09a18c: 2408ffff */ addiu $t0,$zero,-1 +/* f09a190: 2418ffff */ addiu $t8,$zero,-1 +/* f09a194: afb8001c */ sw $t8,0x1c($sp) +/* f09a198: afa80018 */ sw $t0,0x18($sp) +/* f09a19c: afaa0010 */ sw $t2,0x10($sp) +/* f09a1a0: 8c845200 */ lw $a0,%lo(var80095200)($a0) +/* f09a1a4: 2405804f */ addiu $a1,$zero,-32689 +/* f09a1a8: 00003025 */ or $a2,$zero,$zero +/* f09a1ac: 2407ffff */ addiu $a3,$zero,-1 +/* f09a1b0: 0c004241 */ jal audioStart +/* f09a1b4: e7a40014 */ swc1 $f4,0x14($sp) +.L0f09a1b8: +/* f09a1b8: 8e0e001c */ lw $t6,0x1c($s0) +.L0f09a1bc: +/* f09a1bc: 8e0b0038 */ lw $t3,0x38($s0) +/* f09a1c0: 02002025 */ or $a0,$s0,$zero +/* f09a1c4: 3c053f5f */ lui $a1,0x3f5f +/* f09a1c8: 01cb082a */ slt $at,$t6,$t3 +/* f09a1cc: 1420000d */ bnez $at,.L0f09a204 +/* f09a1d0: 00000000 */ nop +/* f09a1d4: 8e0c0018 */ lw $t4,0x18($s0) +/* f09a1d8: 240f000c */ addiu $t7,$zero,0xc +/* f09a1dc: 29810002 */ slti $at,$t4,0x2 +/* f09a1e0: 14200008 */ bnez $at,.L0f09a204 +/* f09a1e4: 00000000 */ nop +/* f09a1e8: 8e190608 */ lw $t9,0x608($s0) +/* f09a1ec: ae0f0020 */ sw $t7,0x20($s0) +/* f09a1f0: ae00001c */ sw $zero,0x1c($s0) +/* f09a1f4: 27230001 */ addiu $v1,$t9,0x1 +/* f09a1f8: ae030608 */ sw $v1,0x608($s0) +/* f09a1fc: 10000004 */ b .L0f09a210 +/* f09a200: ae000018 */ sw $zero,0x18($s0) +.L0f09a204: +/* f09a204: 0fc265e0 */ jal func0f099780 +/* f09a208: 34a55dd8 */ ori $a1,$a1,0x5dd8 +/* f09a20c: 8e030608 */ lw $v1,0x608($s0) +.L0f09a210: +/* f09a210: 24010003 */ addiu $at,$zero,0x3 +.L0f09a214: +/* f09a214: 14610038 */ bne $v1,$at,.L0f09a2f8 +/* f09a218: 8fa90038 */ lw $t1,0x38($sp) +/* f09a21c: 8d2a0000 */ lw $t2,0x0($t1) +/* f09a220: 2401001a */ addiu $at,$zero,0x1a +/* f09a224: 3c18800a */ lui $t8,%hi(g_Vars+0x284) +/* f09a228: 55410003 */ bnel $t2,$at,.L0f09a238 +/* f09a22c: 8e080018 */ lw $t0,0x18($s0) +/* f09a230: ae00068c */ sw $zero,0x68c($s0) +/* f09a234: 8e080018 */ lw $t0,0x18($s0) +.L0f09a238: +/* f09a238: 55000004 */ bnezl $t0,.L0f09a24c +/* f09a23c: 8e0e001c */ lw $t6,0x1c($s0) +/* f09a240: 8f18a244 */ lw $t8,%lo(g_Vars+0x284)($t8) +/* f09a244: af001600 */ sw $zero,0x1600($t8) +/* f09a248: 8e0e001c */ lw $t6,0x1c($s0) +.L0f09a24c: +/* f09a24c: 8fab0038 */ lw $t3,0x38($sp) +/* f09a250: 29c10017 */ slti $at,$t6,0x17 +/* f09a254: 50200010 */ beqzl $at,.L0f09a298 +/* f09a258: ae000020 */ sw $zero,0x20($s0) +/* f09a25c: 0fc2c6b4 */ jal weaponGetModelNum2 +/* f09a260: 8d640000 */ lw $a0,0x0($t3) +/* f09a264: 1040000b */ beqz $v0,.L0f09a294 +/* f09a268: 8fac0038 */ lw $t4,0x38($sp) +/* f09a26c: 8d840000 */ lw $a0,0x0($t4) +/* f09a270: 0fc2c5f0 */ jal weaponHasFlag +/* f09a274: 24050040 */ addiu $a1,$zero,0x40 +/* f09a278: 10400006 */ beqz $v0,.L0f09a294 +/* f09a27c: 8faf0038 */ lw $t7,0x38($sp) +/* f09a280: 8de40000 */ lw $a0,0x0($t7) +/* f09a284: 0fc2c5f0 */ jal weaponHasFlag +/* f09a288: 24050080 */ addiu $a1,$zero,0x80 +/* f09a28c: 5040000c */ beqzl $v0,.L0f09a2c0 +/* f09a290: 8e19001c */ lw $t9,0x1c($s0) +.L0f09a294: +/* f09a294: ae000020 */ sw $zero,0x20($s0) +.L0f09a298: +/* f09a298: ae00001c */ sw $zero,0x1c($s0) +/* f09a29c: ae000018 */ sw $zero,0x18($s0) +/* f09a2a0: 8fa4003c */ lw $a0,0x3c($sp) +/* f09a2a4: 0fc27346 */ jal func0f09cd18 +/* f09a2a8: 00002825 */ or $a1,$zero,$zero +/* f09a2ac: 50400013 */ beqzl $v0,.L0f09a2fc +/* f09a2b0: 00001025 */ or $v0,$zero,$zero +/* f09a2b4: 10000011 */ b .L0f09a2fc +/* f09a2b8: 8fa20044 */ lw $v0,0x44($sp) +/* f09a2bc: 8e19001c */ lw $t9,0x1c($s0) +.L0f09a2c0: +/* f09a2c0: 240d0017 */ addiu $t5,$zero,0x17 +/* f09a2c4: 3c017f1b */ lui $at,%hi(var7f1ac31c) +/* f09a2c8: 01b94823 */ subu $t1,$t5,$t9 +/* f09a2cc: 44893000 */ mtc1 $t1,$f6 +/* f09a2d0: c42ac31c */ lwc1 $f10,%lo(var7f1ac31c)($at) +/* f09a2d4: 3c0141b8 */ lui $at,0x41b8 +/* f09a2d8: 46803220 */ cvt.s.w $f8,$f6 +/* f09a2dc: 44819000 */ mtc1 $at,$f18 +/* f09a2e0: 02002025 */ or $a0,$s0,$zero +/* f09a2e4: 460a4402 */ mul.s $f16,$f8,$f10 +/* f09a2e8: 46128103 */ div.s $f4,$f16,$f18 +/* f09a2ec: 44052000 */ mfc1 $a1,$f4 +/* f09a2f0: 0fc265e0 */ jal func0f099780 +/* f09a2f4: 00000000 */ nop +.L0f09a2f8: +/* f09a2f8: 00001025 */ or $v0,$zero,$zero +.L0f09a2fc: +/* f09a2fc: 8fbf002c */ lw $ra,0x2c($sp) +/* f09a300: 8fb00028 */ lw $s0,0x28($sp) +/* f09a304: 27bd0038 */ addiu $sp,$sp,0x38 +/* f09a308: 03e00008 */ jr $ra +/* f09a30c: 00000000 */ nop +); #endif s32 func0f09a310(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) @@ -10011,166 +10669,166 @@ glabel var7f1ac480 GLOBAL_ASM( glabel func0f09b8e0 .late_rodata -glabel var7f1ac340 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac344 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac348 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac34c -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac350 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac354 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac358 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac35c -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac360 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac364 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac368 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac36c -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac370 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac374 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac378 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac37c -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac380 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac384 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac388 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac38c -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac390 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac394 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac398 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac39c -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3a0 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3a4 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3a8 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac3ac -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3b0 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3b4 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3b8 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3bc -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3c0 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3c4 -.word func0f09b8e0+0x118 # f09b9f8 -glabel var7f1ac3c8 -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac3cc -.word func0f09b8e0+0x48 # f09b928 -glabel var7f1ac3d0 -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac3d4 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3d8 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3dc -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3e0 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3e4 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3e8 -.word func0f09b8e0+0x19c # f09ba7c -glabel var7f1ac3ec -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3f0 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3f4 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3f8 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac3fc -.word func0f09b8e0+0x19c # f09ba7c -glabel var7f1ac400 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac404 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac408 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac40c -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac410 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac414 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac418 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac41c -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac420 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac424 -.word func0f09b8e0+0x19c # f09ba7c -glabel var7f1ac428 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac42c -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac430 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac434 -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac438 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac43c -.word func0f09b8e0+0x228 # f09bb08 -glabel var7f1ac440 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac444 -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac448 -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac44c -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac450 -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac454 -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac458 -.word func0f09b8e0+0x2f8 # f09bbd8 -glabel var7f1ac45c -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac460 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac464 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac468 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac46c -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac470 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac474 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac478 -.word func0f09b8e0+0x2bc # f09bb9c -glabel var7f1ac47c -.word func0f09b8e0+0x228 # f09bb08 +glabel var7f1a668cnb +.word func0f09b8e0+0x048 +glabel var7f1a6690nb +.word func0f09b8e0+0x048 +glabel var7f1a6694nb +.word func0f09b8e0+0x048 +glabel var7f1a6698nb +.word func0f09b8e0+0x048 +glabel var7f1a669cnb +.word func0f09b8e0+0x048 +glabel var7f1a66a0nb +.word func0f09b8e0+0x048 +glabel var7f1a66a4nb +.word func0f09b8e0+0x048 +glabel var7f1a66a8nb +.word func0f09b8e0+0x048 +glabel var7f1a66acnb +.word func0f09b8e0+0x048 +glabel var7f1a66b0nb +.word func0f09b8e0+0x048 +glabel var7f1a66b4nb +.word func0f09b8e0+0x048 +glabel var7f1a66b8nb +.word func0f09b8e0+0x048 +glabel var7f1a66bcnb +.word func0f09b8e0+0x048 +glabel var7f1a66c0nb +.word func0f09b8e0+0x118 +glabel var7f1a66c4nb +.word func0f09b8e0+0x118 +glabel var7f1a66c8nb +.word func0f09b8e0+0x118 +glabel var7f1a66ccnb +.word func0f09b8e0+0x118 +glabel var7f1a66d0nb +.word func0f09b8e0+0x118 +glabel var7f1a66d4nb +.word func0f09b8e0+0x048 +glabel var7f1a66d8nb +.word func0f09b8e0+0x118 +glabel var7f1a66dcnb +.word func0f09b8e0+0x118 +glabel var7f1a66e0nb +.word func0f09b8e0+0x118 +glabel var7f1a66e4nb +.word func0f09b8e0+0x118 +glabel var7f1a66e8nb +.word func0f09b8e0+0x118 +glabel var7f1a66ecnb +.word func0f09b8e0+0x118 +glabel var7f1a66f0nb +.word func0f09b8e0+0x118 +glabel var7f1a66f4nb +.word func0f09b8e0+0x048 +glabel var7f1a66f8nb +.word func0f09b8e0+0x118 +glabel var7f1a66fcnb +.word func0f09b8e0+0x118 +glabel var7f1a6700nb +.word func0f09b8e0+0x118 +glabel var7f1a6704nb +.word func0f09b8e0+0x118 +glabel var7f1a6708nb +.word func0f09b8e0+0x118 +glabel var7f1a670cnb +.word func0f09b8e0+0x118 +glabel var7f1a6710nb +.word func0f09b8e0+0x118 +glabel var7f1a6714nb +.word func0f09b8e0+0x048 +glabel var7f1a6718nb +.word func0f09b8e0+0x048 +glabel var7f1a671cnb +.word func0f09b8e0+0x298 +glabel var7f1a6720nb +.word func0f09b8e0+0x25c +glabel var7f1a6724nb +.word func0f09b8e0+0x25c +glabel var7f1a6728nb +.word func0f09b8e0+0x25c +glabel var7f1a672cnb +.word func0f09b8e0+0x25c +glabel var7f1a6730nb +.word func0f09b8e0+0x25c +glabel var7f1a6734nb +.word func0f09b8e0+0x19c +glabel var7f1a6738nb +.word func0f09b8e0+0x25c +glabel var7f1a673cnb +.word func0f09b8e0+0x25c +glabel var7f1a6740nb +.word func0f09b8e0+0x25c +glabel var7f1a6744nb +.word func0f09b8e0+0x25c +glabel var7f1a6748nb +.word func0f09b8e0+0x19c +glabel var7f1a674cnb +.word func0f09b8e0+0x25c +glabel var7f1a6750nb +.word func0f09b8e0+0x25c +glabel var7f1a6754nb +.word func0f09b8e0+0x25c +glabel var7f1a6758nb +.word func0f09b8e0+0x25c +glabel var7f1a675cnb +.word func0f09b8e0+0x25c +glabel var7f1a6760nb +.word func0f09b8e0+0x25c +glabel var7f1a6764nb +.word func0f09b8e0+0x25c +glabel var7f1a6768nb +.word func0f09b8e0+0x25c +glabel var7f1a676cnb +.word func0f09b8e0+0x25c +glabel var7f1a6770nb +.word func0f09b8e0+0x19c +glabel var7f1a6774nb +.word func0f09b8e0+0x25c +glabel var7f1a6778nb +.word func0f09b8e0+0x25c +glabel var7f1a677cnb +.word func0f09b8e0+0x25c +glabel var7f1a6780nb +.word func0f09b8e0+0x298 +glabel var7f1a6784nb +.word func0f09b8e0+0x25c +glabel var7f1a6788nb +.word func0f09b8e0+0x1f8 +glabel var7f1a678cnb +.word func0f09b8e0+0x25c +glabel var7f1a6790nb +.word func0f09b8e0+0x298 +glabel var7f1a6794nb +.word func0f09b8e0+0x298 +glabel var7f1a6798nb +.word func0f09b8e0+0x298 +glabel var7f1a679cnb +.word func0f09b8e0+0x298 +glabel var7f1a67a0nb +.word func0f09b8e0+0x298 +glabel var7f1a67a4nb +.word func0f09b8e0+0x298 +glabel var7f1a67a8nb +.word func0f09b8e0+0x25c +glabel var7f1a67acnb +.word func0f09b8e0+0x25c +glabel var7f1a67b0nb +.word func0f09b8e0+0x25c +glabel var7f1a67b4nb +.word func0f09b8e0+0x25c +glabel var7f1a67b8nb +.word func0f09b8e0+0x25c +glabel var7f1a67bcnb +.word func0f09b8e0+0x25c +glabel var7f1a67c0nb +.word func0f09b8e0+0x25c +glabel var7f1a67c4nb +.word func0f09b8e0+0x25c +glabel var7f1a67c8nb +.word func0f09b8e0+0x1f8 glabel var7f1ac480 .word 0x40047ae1 .text @@ -12586,182 +13244,180 @@ glabel func0f09c01c .late_rodata glabel var7f1ac484 .word 0x3f5f5dd8 -glabel var7f1ac488 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac48c -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac490 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac494 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac498 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac49c -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4a0 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4a4 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4a8 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4ac -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4b0 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4b4 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4b8 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4bc -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4c0 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac4c4 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4c8 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4cc -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4d0 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4d4 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4d8 -.word func0f09c01c+0x900 # f09c91c -glabel var7f1ac4dc -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4e0 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4e4 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4e8 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4ec -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac4f0 -.word func0f09c01c+0x798 # f09c7b4 -glabel var7f1ac4f4 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac4f8 -.word func0f09c01c+0x86c # f09c888 -glabel var7f1ac4fc -.word func0f09c01c+0x754 # f09c770 -glabel var7f1ac500 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac504 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac508 -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac50c -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac510 -.word func0f09c01c+0x7dc # f09c7f8 -glabel var7f1ac514 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac518 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac51c -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac520 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac524 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac528 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac52c -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac530 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac534 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac538 -.word func0f09c01c+0x86c # f09c888 -glabel var7f1ac53c -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac540 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac544 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac548 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac54c -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac550 -.word func0f09c01c+0x6c0 # f09c6dc -glabel var7f1ac554 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac558 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac55c -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac560 -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac564 -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac568 -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac56c -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac570 -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac574 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac578 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac57c -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac580 -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac584 -.word func0f09c01c+0x828 # f09c844 -glabel var7f1ac588 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac58c -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac590 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac594 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac598 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac59c -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5a0 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5a4 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5a8 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5ac -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5b0 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5b4 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5b8 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5bc -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5c0 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5c4 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac5c8 -.word func0f09c01c+0x9d0 # f09c9ec -glabel var7f1ac5cc -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac5d0 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac5d4 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac5d8 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac5dc -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac5e0 -.word func0f09c01c+0x994 # f09c9b0 -glabel var7f1ac5e4 -.word func0f09c01c+0x9d0 # f09c9ec +glabel var7f1a67d4nb +.word func0f09c01c+0x940 +glabel var7f1a67d8nb +.word func0f09c01c+0x940 +glabel var7f1a67dcnb +.word func0f09c01c+0x904 +glabel var7f1a67e0nb +.word func0f09c01c+0x904 +glabel var7f1a67e4nb +.word func0f09c01c+0x904 +glabel var7f1a67e8nb +.word func0f09c01c+0x904 +glabel var7f1a67ecnb +.word func0f09c01c+0x904 +glabel var7f1a67f0nb +.word func0f09c01c+0x904 +glabel var7f1a67f4nb +.word func0f09c01c+0x904 +glabel var7f1a67f8nb +.word func0f09c01c+0x904 +glabel var7f1a67fcnb +.word func0f09c01c+0x904 +glabel var7f1a6800nb +.word func0f09c01c+0x904 +glabel var7f1a6804nb +.word func0f09c01c+0x904 +glabel var7f1a6808nb +.word func0f09c01c+0x904 +glabel var7f1a680cnb +.word func0f09c01c+0x940 +glabel var7f1a6810nb +.word func0f09c01c+0x904 +glabel var7f1a6814nb +.word func0f09c01c+0x904 +glabel var7f1a6818nb +.word func0f09c01c+0x904 +glabel var7f1a681cnb +.word func0f09c01c+0x904 +glabel var7f1a6820nb +.word func0f09c01c+0x904 +glabel var7f1a6824nb +.word func0f09c01c+0x8a0 +glabel var7f1a6828nb +.word func0f09c01c+0x904 +glabel var7f1a682cnb +.word func0f09c01c+0x904 +glabel var7f1a6830nb +.word func0f09c01c+0x904 +glabel var7f1a6834nb +.word func0f09c01c+0x904 +glabel var7f1a6838nb +.word func0f09c01c+0x904 +glabel var7f1a683cnb +.word func0f09c01c+0x768 +glabel var7f1a6840nb +.word func0f09c01c+0x940 +glabel var7f1a6844nb +.word func0f09c01c+0x83c +glabel var7f1a6848nb +.word func0f09c01c+0x724 +glabel var7f1a684cnb +.word func0f09c01c+0x940 +glabel var7f1a6850nb +.word func0f09c01c+0x940 +glabel var7f1a6854nb +.word func0f09c01c+0x7f8 +glabel var7f1a6858nb +.word func0f09c01c+0x7f8 +glabel var7f1a685cnb +.word func0f09c01c+0x7ac +glabel var7f1a6860nb +.word func0f09c01c+0x940 +glabel var7f1a6864nb +.word func0f09c01c+0x904 +glabel var7f1a6868nb +.word func0f09c01c+0x904 +glabel var7f1a686cnb +.word func0f09c01c+0x904 +glabel var7f1a6870nb +.word func0f09c01c+0x904 +glabel var7f1a6874nb +.word func0f09c01c+0x904 +glabel var7f1a6878nb +.word func0f09c01c+0x904 +glabel var7f1a687cnb +.word func0f09c01c+0x904 +glabel var7f1a6880nb +.word func0f09c01c+0x904 +glabel var7f1a6884nb +.word func0f09c01c+0x83c +glabel var7f1a6888nb +.word func0f09c01c+0x904 +glabel var7f1a688cnb +.word func0f09c01c+0x904 +glabel var7f1a6890nb +.word func0f09c01c+0x904 +glabel var7f1a6894nb +.word func0f09c01c+0x904 +glabel var7f1a6898nb +.word func0f09c01c+0x940 +glabel var7f1a689cnb +.word func0f09c01c+0x6c0 +glabel var7f1a68a0nb +.word func0f09c01c+0x904 +glabel var7f1a68a4nb +.word func0f09c01c+0x904 +glabel var7f1a68a8nb +.word func0f09c01c+0x7f8 +glabel var7f1a68acnb +.word func0f09c01c+0x7f8 +glabel var7f1a68b0nb +.word func0f09c01c+0x7f8 +glabel var7f1a68b4nb +.word func0f09c01c+0x7f8 +glabel var7f1a68b8nb +.word func0f09c01c+0x7f8 +glabel var7f1a68bcnb +.word func0f09c01c+0x7f8 +glabel var7f1a68c0nb +.word func0f09c01c+0x940 +glabel var7f1a68c4nb +.word func0f09c01c+0x940 +glabel var7f1a68c8nb +.word func0f09c01c+0x7f8 +glabel var7f1a68ccnb +.word func0f09c01c+0x7f8 +glabel var7f1a68d0nb +.word func0f09c01c+0x7f8 +glabel var7f1a68d4nb +.word func0f09c01c+0x940 +glabel var7f1a68d8nb +.word func0f09c01c+0x940 +glabel var7f1a68dcnb +.word func0f09c01c+0x940 +glabel var7f1a68e0nb +.word func0f09c01c+0x940 +glabel var7f1a68e4nb +.word func0f09c01c+0x940 +glabel var7f1a68e8nb +.word func0f09c01c+0x940 +glabel var7f1a68ecnb +.word func0f09c01c+0x940 +glabel var7f1a68f0nb +.word func0f09c01c+0x940 +glabel var7f1a68f4nb +.word func0f09c01c+0x940 +glabel var7f1a68f8nb +.word func0f09c01c+0x940 +glabel var7f1a68fcnb +.word func0f09c01c+0x940 +glabel var7f1a6900nb +.word func0f09c01c+0x940 +glabel var7f1a6904nb +.word func0f09c01c+0x940 +glabel var7f1a6908nb +.word func0f09c01c+0x940 +glabel var7f1a690cnb +.word func0f09c01c+0x940 +glabel var7f1a6910nb +.word func0f09c01c+0x940 +glabel var7f1a6914nb +.word func0f09c01c+0x904 +glabel var7f1a6918nb +.word func0f09c01c+0x904 +glabel var7f1a691cnb +.word func0f09c01c+0x904 +glabel var7f1a6920nb +.word func0f09c01c+0x904 +glabel var7f1a6924nb +.word func0f09c01c+0x904 +glabel var7f1a6928nb +.word func0f09c01c+0x904 +glabel var7f1a692cnb +.word func0f09c01c+0x940 glabel var7f1ac5e8 .word 0x3f59999a glabel var7f1ac5ec @@ -37001,7 +37657,7 @@ glabel var7f1acb14 /* f0a8c48: 03e00008 */ jr $ra /* f0a8c4c: 00000000 */ nop ); -#else +#elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( glabel currentPlayerConsiderToggleGunFunction .late_rodata @@ -37269,6 +37925,281 @@ glabel var7f1acb14 /* f0a8c48: 03e00008 */ jr $ra /* f0a8c4c: 00000000 */ nop ); +#else +GLOBAL_ASM( +glabel currentPlayerConsiderToggleGunFunction +.late_rodata +glabel var7f1a6fccnb +.word 0x453b8000 +glabel var7f1a6fd0nb +.word 0x453b8000 +glabel var7f1acaa4 +.word currentPlayerConsiderToggleGunFunction+0x104 +glabel var7f1a6fd8nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a6fdcnb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a6fe0nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a6fe4nb +.word currentPlayerConsiderToggleGunFunction+0x104 +glabel var7f1a6fe8nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a6fecnb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a6ff0nb +.word currentPlayerConsiderToggleGunFunction+0x0b0 +glabel var7f1a6ff4nb +.word currentPlayerConsiderToggleGunFunction+0x0b0 +glabel var7f1a6ff8nb +.word currentPlayerConsiderToggleGunFunction+0x0b0 +glabel var7f1a6ffcnb +.word currentPlayerConsiderToggleGunFunction+0x104 +glabel var7f1a7000nb +.word currentPlayerConsiderToggleGunFunction+0x104 +glabel var7f1a7004nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7008nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a700cnb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7010nb +.word currentPlayerConsiderToggleGunFunction+0x044 +glabel var7f1a7014nb +.word currentPlayerConsiderToggleGunFunction+0x104 +glabel var7f1a7018nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a701cnb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7020nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7024nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7028nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a702cnb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7030nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7034nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7038nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a703cnb +.word currentPlayerConsiderToggleGunFunction+0x104 +glabel var7f1a7040nb +.word currentPlayerConsiderToggleGunFunction+0x1f4 +glabel var7f1a7044nb +.word currentPlayerConsiderToggleGunFunction+0x0b0 + + + +.text +/* f0a895c: 27bdffe8 */ addiu $sp,$sp,-24 +/* f0a8960: afbf0014 */ sw $ra,0x14($sp) +/* f0a8964: afa40018 */ sw $a0,0x18($sp) +/* f0a8968: afa60020 */ sw $a2,0x20($sp) +/* f0a896c: 00002025 */ or $a0,$zero,$zero +/* f0a8970: 0fc2866a */ jal handGetWeaponNum +/* f0a8974: afa5001c */ sw $a1,0x1c($sp) +/* f0a8978: 244efffa */ addiu $t6,$v0,-6 +/* f0a897c: 2dc1001d */ sltiu $at,$t6,0x1d +/* f0a8980: 10200073 */ beqz $at,.L0f0a8b50 +/* f0a8984: 8fa5001c */ lw $a1,0x1c($sp) +/* f0a8988: 000e7080 */ sll $t6,$t6,0x2 +/* f0a898c: 3c017f1b */ lui $at,%hi(var7f1acaa4) +/* f0a8990: 002e0821 */ addu $at,$at,$t6 +/* f0a8994: 8c2ecaa4 */ lw $t6,%lo(var7f1acaa4)($at) +/* f0a8998: 01c00008 */ jr $t6 +/* f0a899c: 00000000 */ nop +/* f0a89a0: 3c08800a */ lui $t0,%hi(g_Vars) +/* f0a89a4: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) +/* f0a89a8: 8d030284 */ lw $v1,0x284($t0) +/* f0a89ac: 90781583 */ lbu $t8,0x1583($v1) +/* f0a89b0: 37190020 */ ori $t9,$t8,0x20 +/* f0a89b4: 10a00003 */ beqz $a1,.L0f0a89c4 +/* f0a89b8: a0791583 */ sb $t9,0x1583($v1) +/* f0a89bc: 100000a0 */ b .L0f0a8c40 +/* f0a89c0: 24020001 */ addiu $v0,$zero,0x1 +.L0f0a89c4: +/* f0a89c4: 8fa90018 */ lw $t1,0x18($sp) +/* f0a89c8: 29210032 */ slti $at,$t1,0x32 +/* f0a89cc: 50200004 */ beqzl $at,.L0f0a89e0 +/* f0a89d0: 8d030284 */ lw $v1,0x284($t0) +/* f0a89d4: 1000009a */ b .L0f0a8c40 +/* f0a89d8: 00001025 */ or $v0,$zero,$zero +/* f0a89dc: 8d030284 */ lw $v1,0x284($t0) +.L0f0a89e0: +/* f0a89e0: 24010001 */ addiu $at,$zero,0x1 +/* f0a89e4: 906a063b */ lbu $t2,0x63b($v1) +/* f0a89e8: 51410004 */ beql $t2,$at,.L0f0a89fc +/* f0a89ec: 906c0d0f */ lbu $t4,0xd0f($v1) +/* f0a89f0: 10000093 */ b .L0f0a8c40 +/* f0a89f4: 00001025 */ or $v0,$zero,$zero +/* f0a89f8: 906c0d0f */ lbu $t4,0xd0f($v1) +.L0f0a89fc: +/* f0a89fc: 24020002 */ addiu $v0,$zero,0x2 +/* f0a8a00: 358d0010 */ ori $t5,$t4,0x10 +/* f0a8a04: 1000008e */ b .L0f0a8c40 +/* f0a8a08: a06d0d0f */ sb $t5,0xd0f($v1) +/* f0a8a0c: 3c08800a */ lui $t0,%hi(g_Vars) +/* f0a8a10: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) +/* f0a8a14: 8d030284 */ lw $v1,0x284($t0) +/* f0a8a18: 906f1583 */ lbu $t7,0x1583($v1) +/* f0a8a1c: 35f80020 */ ori $t8,$t7,0x20 +/* f0a8a20: a0781583 */ sb $t8,0x1583($v1) +/* f0a8a24: 8fb90020 */ lw $t9,0x20($sp) +/* f0a8a28: 1320000b */ beqz $t9,.L0f0a8a58 +/* f0a8a2c: 00000000 */ nop +/* f0a8a30: 0fc2a31f */ jal currentPlayerIsUsingSecondaryFunction +/* f0a8a34: 00000000 */ nop +/* f0a8a38: 3c08800a */ lui $t0,%hi(g_Vars) +/* f0a8a3c: 24010001 */ addiu $at,$zero,0x1 +/* f0a8a40: 14410005 */ bne $v0,$at,.L0f0a8a58 +/* f0a8a44: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) +/* f0a8a48: 8d030284 */ lw $v1,0x284($t0) +/* f0a8a4c: 906a0d0f */ lbu $t2,0xd0f($v1) +/* f0a8a50: 354b0010 */ ori $t3,$t2,0x10 +/* f0a8a54: a06b0d0f */ sb $t3,0xd0f($v1) +.L0f0a8a58: +/* f0a8a58: 10000079 */ b .L0f0a8c40 +/* f0a8a5c: 24020001 */ addiu $v0,$zero,0x1 +/* f0a8a60: 14a00039 */ bnez $a1,.L0f0a8b48 +/* f0a8a64: 3c08800a */ lui $t0,%hi(g_Vars) +/* f0a8a68: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) +/* f0a8a6c: 8d0c0284 */ lw $t4,0x284($t0) +/* f0a8a70: 81871580 */ lb $a3,0x1580($t4) +/* f0a8a74: 0007102a */ slt $v0,$zero,$a3 +/* f0a8a78: 10400031 */ beqz $v0,.L0f0a8b40 +/* f0a8a7c: 28e30024 */ slti $v1,$a3,0x24 +/* f0a8a80: 1060002f */ beqz $v1,.L0f0a8b40 +/* f0a8a84: 00000000 */ nop +/* f0a8a88: 10400014 */ beqz $v0,.L0f0a8adc +/* f0a8a8c: 00402025 */ or $a0,$v0,$zero +/* f0a8a90: 10600012 */ beqz $v1,.L0f0a8adc +/* f0a8a94: 00602025 */ or $a0,$v1,$zero +/* f0a8a98: 8d0d0288 */ lw $t5,0x288($t0) +/* f0a8a9c: 24e2ffff */ addiu $v0,$a3,-1 +/* f0a8aa0: 0002c0c3 */ sra $t8,$v0,0x3 +/* f0a8aa4: 8dae0070 */ lw $t6,0x70($t5) +/* f0a8aa8: 3c09800b */ lui $t1,%hi(g_MpPlayers+0x97) +/* f0a8aac: 304a0007 */ andi $t2,$v0,0x7 +/* f0a8ab0: 000e7880 */ sll $t7,$t6,0x2 +/* f0a8ab4: 01ee7821 */ addu $t7,$t7,$t6 +/* f0a8ab8: 000f7940 */ sll $t7,$t7,0x5 +/* f0a8abc: 01f8c821 */ addu $t9,$t7,$t8 +/* f0a8ac0: 01394821 */ addu $t1,$t1,$t9 +/* f0a8ac4: 9129c84f */ lbu $t1,%lo(g_MpPlayers+0x97)($t1) +/* f0a8ac8: 240b0001 */ addiu $t3,$zero,0x1 +/* f0a8acc: 014b6004 */ sllv $t4,$t3,$t2 +/* f0a8ad0: 012c2024 */ and $a0,$t1,$t4 +/* f0a8ad4: 0004682b */ sltu $t5,$zero,$a0 +/* f0a8ad8: 01a02025 */ or $a0,$t5,$zero +.L0f0a8adc: +/* f0a8adc: 3c0e800a */ lui $t6,%hi(g_Vars+0x288) +/* f0a8ae0: 8dcea248 */ lw $t6,%lo(g_Vars+0x288)($t6) +/* f0a8ae4: 24e2ffff */ addiu $v0,$a3,-1 +/* f0a8ae8: 0002c8c3 */ sra $t9,$v0,0x3 +/* f0a8aec: 8dcf0070 */ lw $t7,0x70($t6) +/* f0a8af0: 3c0a800b */ lui $t2,%hi(g_MpPlayers) +/* f0a8af4: 254ac7b8 */ addiu $t2,$t2,%lo(g_MpPlayers) +/* f0a8af8: 000fc080 */ sll $t8,$t7,0x2 +/* f0a8afc: 030fc021 */ addu $t8,$t8,$t7 +/* f0a8b00: 0018c140 */ sll $t8,$t8,0x5 +/* f0a8b04: 03195821 */ addu $t3,$t8,$t9 +/* f0a8b08: 016a1821 */ addu $v1,$t3,$t2 +/* f0a8b0c: 30490007 */ andi $t1,$v0,0x7 +/* f0a8b10: 240c0001 */ addiu $t4,$zero,0x1 +/* f0a8b14: 240d0001 */ addiu $t5,$zero,0x1 +/* f0a8b18: 012c3004 */ sllv $a2,$t4,$t1 +/* f0a8b1c: 11a40005 */ beq $t5,$a0,.L0f0a8b34 +/* f0a8b20: 90650097 */ lbu $a1,0x97($v1) +/* f0a8b24: 00a67825 */ or $t7,$a1,$a2 +/* f0a8b28: a06f0097 */ sb $t7,0x97($v1) +/* f0a8b2c: 10000044 */ b .L0f0a8c40 +/* f0a8b30: 24020001 */ addiu $v0,$zero,0x1 +.L0f0a8b34: +/* f0a8b34: 00c0c027 */ nor $t8,$a2,$zero +/* f0a8b38: 00b8c824 */ and $t9,$a1,$t8 +/* f0a8b3c: a0790097 */ sb $t9,0x97($v1) +.L0f0a8b40: +/* f0a8b40: 1000003f */ b .L0f0a8c40 +/* f0a8b44: 24020001 */ addiu $v0,$zero,0x1 +.L0f0a8b48: +/* f0a8b48: 1000003d */ b .L0f0a8c40 +/* f0a8b4c: 00001025 */ or $v0,$zero,$zero +.L0f0a8b50: +/* f0a8b50: 10a00008 */ beqz $a1,.L0f0a8b74 +/* f0a8b54: 3c08800a */ lui $t0,%hi(g_Vars) +/* f0a8b58: 3c08800a */ lui $t0,%hi(g_Vars) +/* f0a8b5c: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) +/* f0a8b60: 8d030284 */ lw $v1,0x284($t0) +/* f0a8b64: 906a1583 */ lbu $t2,0x1583($v1) +/* f0a8b68: 354c0020 */ ori $t4,$t2,0x20 +/* f0a8b6c: 10000033 */ b .L0f0a8c3c +/* f0a8b70: a06c1583 */ sb $t4,0x1583($v1) +.L0f0a8b74: +/* f0a8b74: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) +/* f0a8b78: 8d090284 */ lw $t1,0x284($t0) +/* f0a8b7c: 81271580 */ lb $a3,0x1580($t1) +/* f0a8b80: 0007102a */ slt $v0,$zero,$a3 +/* f0a8b84: 1040002d */ beqz $v0,.L0f0a8c3c +/* f0a8b88: 28e30024 */ slti $v1,$a3,0x24 +/* f0a8b8c: 5060002c */ beqzl $v1,.L0f0a8c40 +/* f0a8b90: 24020001 */ addiu $v0,$zero,0x1 +/* f0a8b94: 50400015 */ beqzl $v0,.L0f0a8bec +/* f0a8b98: 8d0d0288 */ lw $t5,0x288($t0) +/* f0a8b9c: 10600012 */ beqz $v1,.L0f0a8be8 +/* f0a8ba0: 24e2ffff */ addiu $v0,$a3,-1 +/* f0a8ba4: 8d0d0288 */ lw $t5,0x288($t0) +/* f0a8ba8: 0002c0c3 */ sra $t8,$v0,0x3 +/* f0a8bac: 3c0b800b */ lui $t3,%hi(g_MpPlayers) +/* f0a8bb0: 8dae0070 */ lw $t6,0x70($t5) +/* f0a8bb4: 256bc7b8 */ addiu $t3,$t3,%lo(g_MpPlayers) +/* f0a8bb8: 304a0007 */ andi $t2,$v0,0x7 +/* f0a8bbc: 000e7880 */ sll $t7,$t6,0x2 +/* f0a8bc0: 01ee7821 */ addu $t7,$t7,$t6 +/* f0a8bc4: 000f7940 */ sll $t7,$t7,0x5 +/* f0a8bc8: 01f8c821 */ addu $t9,$t7,$t8 +/* f0a8bcc: 032b1821 */ addu $v1,$t9,$t3 +/* f0a8bd0: 90650097 */ lbu $a1,0x97($v1) +/* f0a8bd4: 240c0001 */ addiu $t4,$zero,0x1 +/* f0a8bd8: 014c3004 */ sllv $a2,$t4,$t2 +/* f0a8bdc: 00a64824 */ and $t1,$a1,$a2 +/* f0a8be0: 55200014 */ bnezl $t1,.L0f0a8c34 +/* f0a8be4: 00c07827 */ nor $t7,$a2,$zero +.L0f0a8be8: +/* f0a8be8: 8d0d0288 */ lw $t5,0x288($t0) +.L0f0a8bec: +/* f0a8bec: 24e2ffff */ addiu $v0,$a3,-1 +/* f0a8bf0: 0002c0c3 */ sra $t8,$v0,0x3 +/* f0a8bf4: 8dae0070 */ lw $t6,0x70($t5) +/* f0a8bf8: 3c0b800b */ lui $t3,%hi(g_MpPlayers) +/* f0a8bfc: 256bc7b8 */ addiu $t3,$t3,%lo(g_MpPlayers) +/* f0a8c00: 000e7880 */ sll $t7,$t6,0x2 +/* f0a8c04: 01ee7821 */ addu $t7,$t7,$t6 +/* f0a8c08: 000f7940 */ sll $t7,$t7,0x5 +/* f0a8c0c: 01f8c821 */ addu $t9,$t7,$t8 +/* f0a8c10: 032b1821 */ addu $v1,$t9,$t3 +/* f0a8c14: 906c0097 */ lbu $t4,0x97($v1) +/* f0a8c18: 304a0007 */ andi $t2,$v0,0x7 +/* f0a8c1c: 24090001 */ addiu $t1,$zero,0x1 +/* f0a8c20: 01496804 */ sllv $t5,$t1,$t2 +/* f0a8c24: 018d7025 */ or $t6,$t4,$t5 +/* f0a8c28: 10000004 */ b .L0f0a8c3c +/* f0a8c2c: a06e0097 */ sb $t6,0x97($v1) +/* f0a8c30: 00c07827 */ nor $t7,$a2,$zero +.L0f0a8c34: +/* f0a8c34: 00afc024 */ and $t8,$a1,$t7 +/* f0a8c38: a0780097 */ sb $t8,0x97($v1) +.L0f0a8c3c: +/* f0a8c3c: 24020001 */ addiu $v0,$zero,0x1 +.L0f0a8c40: +/* f0a8c40: 8fbf0014 */ lw $ra,0x14($sp) +/* f0a8c44: 27bd0018 */ addiu $sp,$sp,0x18 +/* f0a8c48: 03e00008 */ jr $ra +/* f0a8c4c: 00000000 */ nop +); #endif // Mismatch near the first gunfuncs check. diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 46b98b769..ba236b61e 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -131,9 +131,8 @@ const struct menucolourpalette g_MenuColourPalettes3[] = { { 0xffffffff, 0xffffff7f, 0xffffffff, 0xffffffff, 0xffffff7f, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffff5f, 0xffffffff, 0xffffff7f, 0xffffffff }, }; -const u32 var7f1b23e8[] = {0x544d0000}; - #if VERSION >= VERSION_NTSC_1_0 +const u32 var7f1b23e8[] = {0x544d0000}; char *g_StringPointer = g_CheatMarqueeString; char *g_StringPointer2 = &g_CheatMarqueeString[PAL ? 150 : 125]; #else @@ -2801,56 +2800,56 @@ glabel var7f1b28c0 GLOBAL_ASM( glabel func0f0f1618 .late_rodata -glabel var7f1b2860 -.word func0f0f1618+0x3dc # f0f19f4 -glabel var7f1b2864 -.word func0f0f1618+0x118 # f0f1730 -glabel var7f1b2868 -.word func0f0f1618+0x72c # f0f1d44 -glabel var7f1b286c -.word func0f0f1618+0x3dc # f0f19f4 -glabel var7f1b2870 -.word func0f0f1618+0x59c # f0f1bb4 -glabel var7f1b2874 -.word func0f0f1618+0x5d8 # f0f1bf0 -glabel var7f1b2878 -.word func0f0f1618+0x6a4 # f0f1cbc -glabel var7f1b287c -.word func0f0f1618+0x27c # f0f1894 -glabel var7f1b2880 -.word func0f0f1618+0x2d4 # f0f18ec -glabel var7f1b2884 -.word func0f0f1618+0x72c # f0f1d44 -glabel var7f1b2888 -.word func0f0f1618+0x388 # f0f19a0 -glabel var7f1b288c -.word func0f0f1618+0x16c # f0f1784 -glabel var7f1b2890 -.word func0f0f1618+0x104 # f0f171c -glabel var7f1b2894 -.word func0f0f1618+0x6c8 # f0f1ce0 -glabel var7f1b2898 -.word func0f0f1618+0x6b4 # f0f1ccc -glabel var7f1b289c -.word func0f0f1618+0x6dc # f0f1cf4 -glabel var7f1b28a0 -.word func0f0f1618+0x718 # f0f1d30 -glabel var7f1b28a4 -.word func0f0f1618+0x374 # f0f198c -glabel var7f1b28a8 -.word func0f0f1618+0x268 # f0f1880 -glabel var7f1b28ac -.word func0f0f1618+0xdc # f0f16f4 -glabel var7f1b28b0 -.word func0f0f1618+0xf0 # f0f1708 -glabel var7f1b28b4 -.word func0f0f1618+0x704 # f0f1d1c -glabel var7f1b28b8 -.word func0f0f1618+0x3ac # f0f19c4 -glabel var7f1b28bc -.word func0f0f1618+0xb0 # f0f16c8 -glabel var7f1b28c0 -.word func0f0f1618+0x9c # f0f16b4 +glabel var7f1acb8cnb +.word func0f0f1618+0x3e8 +glabel var7f1acb90nb +.word func0f0f1618+0x118 +glabel var7f1acb94nb +.word func0f0f1618+0x738 +glabel var7f1acb98nb +.word func0f0f1618+0x3e8 +glabel var7f1acb9cnb +.word func0f0f1618+0x5a8 +glabel var7f1acba0nb +.word func0f0f1618+0x5e4 +glabel var7f1acba4nb +.word func0f0f1618+0x6b0 +glabel var7f1acba8nb +.word func0f0f1618+0x288 +glabel var7f1acbacnb +.word func0f0f1618+0x2e0 +glabel var7f1acbb0nb +.word func0f0f1618+0x738 +glabel var7f1acbb4nb +.word func0f0f1618+0x394 +glabel var7f1acbb8nb +.word func0f0f1618+0x178 +glabel var7f1acbbcnb +.word func0f0f1618+0x104 +glabel var7f1acbc0nb +.word func0f0f1618+0x6d4 +glabel var7f1acbc4nb +.word func0f0f1618+0x6c0 +glabel var7f1acbc8nb +.word func0f0f1618+0x6e8 +glabel var7f1acbccnb +.word func0f0f1618+0x724 +glabel var7f1acbd0nb +.word func0f0f1618+0x380 +glabel var7f1acbd4nb +.word func0f0f1618+0x274 +glabel var7f1acbd8nb +.word func0f0f1618+0x0dc +glabel var7f1acbdcnb +.word func0f0f1618+0x0f0 +glabel var7f1acbe0nb +.word func0f0f1618+0x710 +glabel var7f1acbe4nb +.word func0f0f1618+0x3b8 +glabel var7f1acbe8nb +.word func0f0f1618+0x0b0 +glabel var7f1acbecnb +.word func0f0f1618+0x09c .text /* f0ee228: 27bdff88 */ addiu $sp,$sp,-120 /* f0ee22c: 3c0e8008 */ lui $t6,0x8008 @@ -15568,23 +15567,23 @@ GLOBAL_ASM( glabel func0f0f7728 .late_rodata glabel var7f1b2970 -.word func0f0f7728+0x180 # f0f78a8 +.word func0f0f7728+0x180 glabel var7f1b2974 -.word func0f0f7728+0x3d8 # f0f7b00 +.word func0f0f7728+0x3d8 glabel var7f1b2978 -.word func0f0f7728+0x3d8 # f0f7b00 +.word func0f0f7728+0x3d8 glabel var7f1b297c -.word func0f0f7728+0x748 # f0f7e70 +.word func0f0f7728+0x738 glabel var7f1b2980 -.word func0f0f7728+0x748 # f0f7e70 +.word func0f0f7728+0x738 glabel var7f1b2984 -.word func0f0f7728+0x3d8 # f0f7b00 +.word func0f0f7728+0x3d8 glabel var7f1b2988 -.word func0f0f7728+0x748 # f0f7e70 +.word func0f0f7728+0x738 glabel var7f1b298c -.word func0f0f7728+0x3d8 # f0f7b00 +.word func0f0f7728+0x3d8 glabel var7f1b2990 -.word func0f0f7728+0x180 # f0f78a8 +.word func0f0f7728+0x180 .text /* f0f40a0: 27bdffc8 */ addiu $sp,$sp,-56 /* f0f40a4: afbf0014 */ sw $ra,0x14($sp) @@ -20455,14 +20454,6 @@ glabel var7f1b2a24 .word 0x3f4ccccd glabel var7f1b2a28 .word 0x3f4ccccd -glabel var7f1b2a2c -.word 0x3dcccccd -glabel var7f1b2a30 -.word 0x3d23d70a -glabel var7f1b2a34 -.word 0x3f4ccccd -glabel var7f1b2a38 -.word 0x3f4ccccd glabel var7f1b2a3c .word 0x3f4ccccd glabel var7f1b2a40 @@ -23887,10 +23878,6 @@ glabel var7f1b2ae8 .word func0f0fb488+0x12c # f0fb5b4 glabel var7f1b2aec .word func0f0fb488+0x6b8 # f0fbb40 -glabel var7f1b2af0 -.word 0x3f847ae1 -glabel var7f1b2af4 -.word 0x47ae147b .text /* f0fb488: 30ae00ff */ andi $t6,$a1,0xff /* f0fb48c: 27bdff80 */ addiu $sp,$sp,-128 @@ -24368,6 +24355,8 @@ glabel var7f1b2af4 u32 var800714f0 = 1; +// There's a file split either above or below this function +// (zero-word in ntsc-beta rodata in func0f0fbc30) Gfx *func0f0fbba0(Gfx *gdl, u8 param_2, s32 arg2) { if (param_2 == 4 || param_2 == 9) { @@ -24392,6 +24381,10 @@ u32 var800714f4 = 0x00000001; GLOBAL_ASM( glabel func0f0fbc30 .late_rodata +glabel var7f1b2af0 +.word 0x3f847ae1 +glabel var7f1b2af4 +.word 0x47ae147b glabel var7f1b2af8 .word 0xc34d8000 glabel var7f1b2afc @@ -25366,6 +25359,10 @@ glabel var7f1b2afc GLOBAL_ASM( glabel func0f0fbc30 .late_rodata +glabel var7f1b2af0 +.word 0x3f847ae1 +glabel var7f1b2af4 +.word 0x47ae147b glabel var7f1b2af8 .word 0xc34d8000 glabel var7f1b2afc @@ -26346,6 +26343,12 @@ glabel var7f1b2afc GLOBAL_ASM( glabel func0f0fbc30 .late_rodata +glabel var7f1ace0cnb +.word 0 +glabel var7f1b2af0 +.word 0x3f847ae1 +glabel var7f1b2af4 +.word 0x47ae147b glabel var7f1b2af8 .word 0xc34d8000 glabel var7f1b2afc @@ -27940,18 +27943,6 @@ glabel var7f1b2b10 #else GLOBAL_ASM( glabel func0f0fd320 -.late_rodata -glabel var7f1b2b00 -.word func0f0fd320+0x6c # f0fd38c -glabel var7f1b2b04 -.word func0f0fd320+0x50 # f0fd370 -glabel var7f1b2b08 -.word func0f0fd320+0x50 # f0fd370 -glabel var7f1b2b0c -.word func0f0fd320+0x12c # f0fd44c -glabel var7f1b2b10 -.word func0f0fd320+0x148 # f0fd468 -.text /* f0f98c8: 27bdffe0 */ addiu $sp,$sp,-32 /* f0f98cc: 3c0e8007 */ lui $t6,0x8007 /* f0f98d0: 8dce3af0 */ lw $t6,0x3af0($t6) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 6e525cd55..2d1a12f47 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -3183,56 +3183,56 @@ glabel var7f1b2dfc GLOBAL_ASM( glabel menuhandler0010476c .late_rodata -glabel var7f1b2d9c -.word menuhandler0010476c+0x80 # f1047ec -glabel var7f1b2da0 -.word menuhandler0010476c+0x394 # f104b00 -glabel var7f1b2da4 -.word menuhandler0010476c+0x144 # f1048b0 -glabel var7f1b2da8 -.word menuhandler0010476c+0x400 # f104b6c -glabel var7f1b2dac -.word menuhandler0010476c+0x434 # f104ba0 -glabel var7f1b2db0 -.word menuhandler0010476c+0x1d0 # f10493c -glabel var7f1b2db4 -.word menuhandler0010476c+0x2a8 # f104a14 -glabel var7f1b2db8 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dbc -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dc0 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dc4 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dc8 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dcc -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dd0 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dd4 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dd8 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2ddc -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2de0 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2de4 -.word menuhandler0010476c+0x47c # f104be8 -glabel var7f1b2de8 -.word menuhandler0010476c+0xe10 # f10557c -glabel var7f1b2dec -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2df0 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2df4 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2df8 -.word menuhandler0010476c+0xe18 # f105584 -glabel var7f1b2dfc -.word menuhandler0010476c+0x2b8 # f104a24 +glabel var7f1ad09cnb +.word menuhandler0010476c+0x080 +glabel var7f1ad0a0nb +.word menuhandler0010476c+0x394 +glabel var7f1ad0a4nb +.word menuhandler0010476c+0x144 +glabel var7f1ad0a8nb +.word menuhandler0010476c+0x400 +glabel var7f1ad0acnb +.word menuhandler0010476c+0x434 +glabel var7f1ad0b0nb +.word menuhandler0010476c+0x1d0 +glabel var7f1ad0b4nb +.word menuhandler0010476c+0x2a8 +glabel var7f1ad0b8nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0bcnb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0c0nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0c4nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0c8nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0ccnb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0d0nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0d4nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0d8nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0dcnb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0e0nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0e4nb +.word menuhandler0010476c+0x47c +glabel var7f1ad0e8nb +.word menuhandler0010476c+0xd60 +glabel var7f1ad0ecnb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0f0nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0f4nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0f8nb +.word menuhandler0010476c+0xd68 +glabel var7f1ad0fcnb +.word menuhandler0010476c+0x2b8 .text /* f10056c: 27bdfe10 */ addiu $sp,$sp,-496 /* f100570: 3c0e8007 */ lui $t6,0x8007 diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index ca3bd34d3..05f942171 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -173,7 +173,9 @@ void filemgrGetFileName(char *buffer, struct savelocation000 *arg1, u32 filetype sprintf(buffer, "%s\n", tmpbuffer1); } +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b2f28[] = "Setup: item = %x\n"; +#endif const u32 var7f1b2f3c[] = {0xa0, 0x31, 0x4e, 0x4a0}; @@ -293,6 +295,7 @@ char *filemgrMenuTextDeviceNameForError(struct menuitem *item) return g_StringPointer; } +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b2f6c[] = "FileMan: Failure Handler\n"; const char var7f1b2f88[] = "Copy Memory Freed\n"; const char var7f1b2f9c[] = "FileMan: Success Handler\n"; @@ -302,6 +305,7 @@ const char var7f1b3000[] = "SaveElsewhere\n"; const char var7f1b3010[] = "DELETING: %x-%x\n"; const char var7f1b3024[] = "MyResult: %d\n"; const char var7f1b3034[] = "PakOperationSearch>> Search for pak: %x = %d\n"; +#endif void filemgrPushErrorDialog(u16 errno) { @@ -791,8 +795,44 @@ bool fileSave(s32 arg0, bool arg1) return errno; } #else +const s32 var7f1ad258nb[] = {0x80, 0x40, 0x20, 0x08}; + GLOBAL_ASM( glabel fileSave +.late_rodata +glabel var7f1ad3e8nb +.word fileSave+0x1a8 +glabel var7f1ad3ecnb +.word fileSave+0x1b8 +glabel var7f1ad3f0nb +.word fileSave+0x1d4 +glabel var7f1ad3f4nb +.word fileSave+0x210 +glabel var7f1ad3f8nb +.word fileSave+0x1ec +glabel var7f1ad3fcnb +.word fileSave+0x1ec +glabel var7f1ad400nb +.word fileSave+0x1ec +glabel var7f1ad404nb +.word fileSave+0x0dc +glabel var7f1ad408nb +.word fileSave+0x0dc +glabel var7f1ad40cnb +.word fileSave+0x0d4 +glabel var7f1ad410nb +.word fileSave+0x0f4 +glabel var7f1ad414nb +.word fileSave+0x110 +glabel var7f1ad418nb +.word fileSave+0x210 +glabel var7f1ad41cnb +.word fileSave+0x130 +glabel var7f1ad420nb +.word fileSave+0x130 +glabel var7f1ad424nb +.word fileSave+0x130 +.text /* f104a8c: 3c0e8007 */ lui $t6,0x8007 /* f104a90: 8dce3af0 */ lw $t6,0x3af0($t6) /* f104a94: 3c18800a */ lui $t8,0x800a @@ -983,6 +1023,7 @@ glabel fileSave ); #endif +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b3074[] = "FileAttemptOperation - pak %d op %d\n"; const char var7f1b309c[] = ">> blockWrite: file:%x pak:%x\n"; const char var7f1b30bc[] = ">> blockRead: file:%x pak:%x\n"; @@ -997,6 +1038,7 @@ const char var7f1b31b4[] = "YOUR TARGET: %x-%x\n"; const char var7f1b31c8[] = "MyResult: %d\n"; const char var7f1b31d8[] = "COULD NOT DELETE\n"; const char var7f1b31ec[] = "Multiplayer %d was using that file...\n"; +#endif bool func0f1094e4(struct savelocation_2d8 *arg0, s32 arg1, void *arg2) { @@ -1179,10 +1221,12 @@ void func0f1097d0(s32 device) } } +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b3234[] = "DestPakNo: %d (guid F:%x-%x:P)\n"; const char var7f1b3254[] = "Copy Memory Alloced\n"; const char var7f1b326c[] = "COULDNT GET THE RAM!\n"; const char var7f1b3284[] = "Saving...\n"; +#endif u32 var8007465c = 0x01020304; u32 var80074660 = 0x00000000; @@ -1869,6 +1913,7 @@ glabel func0f1053a0nb ); #endif +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b33fc[] = "GOT OKed!, item->data = %d\n"; const char var7f1b3418[] = "GOT CANCELLED!\n"; const char var7f1b3428[] = "Picking Location, type %d wadtype %d wad %d\n"; @@ -1878,6 +1923,7 @@ const char var7f1b3480[] = "item: %x\n"; const char var7f1b348c[] = "Switched Wads Back\n"; const char var7f1b34a0[] = "MenuClosed\n"; const char var7f1b34ac[] = "Deleting files, wad %d\n"; +#endif #if VERSION >= VERSION_NTSC_1_0 /** @@ -2317,8 +2363,10 @@ s32 pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handl return 0; } +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b34dc[] = "GOT OKed!\n"; const char var7f1b34e8[] = "Try to find last opened file...\n"; +#endif s32 pakGameNotesMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data) { diff --git a/src/game/game_129210.c b/src/game/game_129210.c index bb1585f74..f7a67e107 100644 --- a/src/game/game_129210.c +++ b/src/game/game_129210.c @@ -10,6 +10,29 @@ #include "data.h" #include "types.h" +const char var7f1b5230[] = "VTXSTORE : vtxfixrefs -> Start - p1=%x, p2=%x\n"; +const char var7f1b5260[] = "vtxfixrefs : Part=%x -- Mapping ptr %x -> %x\n"; +const char var7f1b5290[] = "VTXSTORE : vtxfixrefs -> End - Done=%d\n"; +const char var7f1b52b8[] = "vtxstorecheck : memaFree -> %u bytes at Ptr=%x(%x)\n"; +const char var7f1b52ec[] = "vtxstorecheck : At block 1 %d -> Ref1=%x, Ref2=%x\n"; +const char var7f1b5320[] = "vtxstorecheck : At block 2 %d -> Ref1=%x, Ref2=%x\n"; +const char var7f1b5354[] = "vtx buffer low, need to delete objects\n"; +const char var7f1b537c[] = "getfreevertices : %d of type %d -> ref1=%x, ref2=%x\n"; +const char var7f1b53b4[] = "vtxstore: 1st mema alloc of %u bytes\n"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1af8ecnb[] = "vtxstore: Trying to free %d from mema (bgRooms)\n"; +#endif + +const char var7f1b53dc[] = "getfreevertices : Return ptr = %x\n"; +const char var7f1b5400[] = "vtxstore: Out of mema (returning NULL)\n"; +const char var7f1b5428[] = "vtxstore: GROSS! CorspeCount > MAX_CORPSES corpses! Freeing corpse %x\n"; +const char var7f1b5470[] = "vtxstore: CorpseCount %d, Trying to free %d\n"; +const char var7f1b54a0[] = "vtxstore: Freeing corpse %x\n"; +const char var7f1b54c0[] = "vtxstore: Out of vertices type %d wanted %d free %d (returning NULL)\n"; +const char var7f1b5508[] = "vtxstore: freevertices type %d, list %x\n"; +const char var7f1b5534[] = "freevertices: address not found in array %x\n"; + struct var8007e3d0 var8007e3d0[] = { { 3000, 120, 3000, 80, 0, 0, 500, 20, 12, 0, 0, 0, 0 }, { 1500, 40, 500, 20, 0, 0, 500, 20, 12, 0, 0, 0, 0 }, diff --git a/src/game/game_175f90.c b/src/game/game_175f90.c index 776f734e4..4ac8a95b7 100644 --- a/src/game/game_175f90.c +++ b/src/game/game_175f90.c @@ -29,7 +29,9 @@ char *func0f175ff0(void) { #if VERSION >= VERSION_PAL_FINAL return "Apr 28 2000 14:40:49"; -#else +#elif VERSION >= VERSION_NTSC_1_0 return "Apr 6 2000 15:05:01"; +#else + return "Mar 22 2000 00:26:50"; #endif } diff --git a/src/game/game_190260.c b/src/game/game_190260.c index 8e4c6a00f..de90edc57 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -1131,6 +1131,98 @@ u32 propobjHandlePickupByAibot(struct prop *prop, struct chrdata *chr) #else GLOBAL_ASM( glabel propobjHandlePickupByAibot +.late_rodata +glabel var7f1b33d0nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33d4nb +.word propobjHandlePickupByAibot+0x080 +glabel var7f1b33d8nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33dcnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33e0nb +.word propobjHandlePickupByAibot+0x080 +glabel var7f1b33e4nb +.word propobjHandlePickupByAibot+0x1f4 +glabel var7f1b33e8nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33ecnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33f0nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33f4nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33f8nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b33fcnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3400nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3404nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3408nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b340cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3410nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3414nb +.word propobjHandlePickupByAibot+0x130 +glabel var7f1b3418nb +.word propobjHandlePickupByAibot+0x314 +glabel var7f1b341cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3420nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3424nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3428nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b342cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3430nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3434nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3438nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b343cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3440nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3444nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3448nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b344cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3450nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3454nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3458nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b345cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3460nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3464nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3468nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b346cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3470nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3474nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3478nb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b347cnb +.word propobjHandlePickupByAibot+0x3ac +glabel var7f1b3480nb +.word propobjHandlePickupByAibot+0x3ac +.text /* f18a918: 27bdff80 */ addiu $sp,$sp,-128 /* f18a91c: afbf0054 */ sw $ra,0x54($sp) /* f18a920: afb20050 */ sw $s2,0x50($sp) @@ -3941,6 +4033,12 @@ void func0f1921f8(struct chrdata *chr, f32 *move, s32 numupdates, f32 arg3) #else GLOBAL_ASM( glabel func0f1921f8 +.late_rodata +glabel var7f1b3510nb +.word 0x3d6147b0 +glabel var7f1b3514nb +.word 0x3f71eb85 +.text /* f18c2dc: 27bdffa8 */ addiu $sp,$sp,-88 /* f18c2e0: afb00028 */ sw $s0,0x28($sp) /* f18c2e4: 00808025 */ or $s0,$a0,$zero diff --git a/src/game/game_197600.c b/src/game/game_197600.c index 232b6f2e3..f4b952abd 100644 --- a/src/game/game_197600.c +++ b/src/game/game_197600.c @@ -167,6 +167,12 @@ void func0f197600(struct chrdata *chr) #else GLOBAL_ASM( glabel func0f197600 +.late_rodata +glabel var7f1b35b0 +.word 0x48742400 +glabel var7f1b35b4 +.word 0x3eb33333 +.text /* f191680: 27bdff98 */ addiu $sp,$sp,-104 /* f191684: afbf0014 */ sw $ra,0x14($sp) /* f191688: afa40068 */ sw $a0,0x68($sp) diff --git a/src/game/game_19aa80.c b/src/game/game_19aa80.c index 679258b82..fcd02e2a5 100644 --- a/src/game/game_19aa80.c +++ b/src/game/game_19aa80.c @@ -107,6 +107,9 @@ void func0f19ab40(void) } } #else +const char var7f1b3750nb[] = "VM: Page Misses %d (%d Replaces)"; +const char var7f1b3774nb[] = "VM: TLB Misses %d"; + GLOBAL_ASM( glabel func0f19ab40 /* f194b20: 3c0e8009 */ lui $t6,0x8009 diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index 2bd61e6d6..d0291e580 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -3479,15 +3479,15 @@ GLOBAL_ASM( glabel func0f0de7fc .late_rodata glabel var7f1adeb0 -.word func0f0de7fc+0x490 # f0dec8c +.word func0f0de7fc+0x33c glabel var7f1adeb4 -.word func0f0de7fc+0x498 # f0dec94 +.word func0f0de7fc+0x348 glabel var7f1adeb8 -.word func0f0de7fc+0x4ac # f0deca8 +.word func0f0de7fc+0x35c glabel var7f1adebc -.word func0f0de7fc+0x648 # f0dee44 +.word func0f0de7fc+0x4e4 glabel var7f1adec0 -.word func0f0de7fc+0x678 # f0dee74 +.word func0f0de7fc+0x514 .text /* f0dbe14: 27bdffd0 */ addiu $sp,$sp,-48 /* f0dbe18: 3c058008 */ lui $a1,0x8008 @@ -5667,17 +5667,17 @@ GLOBAL_ASM( glabel hudmsgsTick .late_rodata glabel var7f1adec4 -.word hudmsgsTick+0x680 # f0df9e4 +.word hudmsgsTick+0x5a8 glabel var7f1adec8 -.word hudmsgsTick+0x1e4 # f0df548 +.word hudmsgsTick+0x168 glabel var7f1adecc -.word hudmsgsTick+0x39c # f0df700 +.word hudmsgsTick+0x2dc glabel var7f1aded0 -.word hudmsgsTick+0x3dc # f0df740 +.word hudmsgsTick+0x318 glabel var7f1aded4 -.word hudmsgsTick+0x564 # f0df8c8 +.word hudmsgsTick+0x48c glabel var7f1aded8 -.word hudmsgsTick+0x604 # f0df968 +.word hudmsgsTick+0x52c .text /* f0dc81c: 27bdff98 */ addiu $sp,$sp,-104 /* f0dc820: 3c0e8007 */ lui $t6,0x8007 @@ -7809,17 +7809,17 @@ glabel hudmsgsRender glabel var7f1adedc .word 0x40490fdb glabel var7f1adee0 -.word hudmsgsRender+0xa34 # f0e0504 +.word hudmsgsRender+0xa5c glabel var7f1adee4 -.word hudmsgsRender+0xa34 # f0e0504 +.word hudmsgsRender+0xa5c glabel var7f1adee8 -.word hudmsgsRender+0xa34 # f0e0504 +.word hudmsgsRender+0xa5c glabel var7f1adeec -.word hudmsgsRender+0x3ec # f0dfebc +.word hudmsgsRender+0x414 glabel var7f1adef0 -.word hudmsgsRender+0x644 # f0e0114 +.word hudmsgsRender+0x66c glabel var7f1adef4 -.word hudmsgsRender+0x7c8 # f0e0298 +.word hudmsgsRender+0x7f0 .text /* f0dceb0: 27bdff00 */ addiu $sp,$sp,-256 /* f0dceb4: 3c0f8007 */ lui $t7,0x8007 diff --git a/src/game/menu/items.c b/src/game/menu/items.c index 0946cb9ba..30103f8ac 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -9562,6 +9562,12 @@ Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context) return func0f153780(gdl); } #else +const char var7f1ac174nb[] = "%d\n"; +const char var7f1ac178nb[] = "%d\n"; +const char var7f1ac17cnb[] = "%d\n"; +const char var7f1ac180nb[] = "%d\n"; +const char var7f1ac184nb[] = "%d\n"; + GLOBAL_ASM( glabel menuRenderItemRanking /* f0eab98: 27bdfe50 */ addiu $sp,$sp,-432 diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index c2c84daa9..f7fa537bc 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -47,7 +47,9 @@ u32 var800acc28[18]; struct mpweaponset g_MpWeaponSets[12]; u32 var800874c8; +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b8a00[] = "||||||||||||| Starting game... players %d\n"; +#endif s32 var80087260 = 0x00000000; u32 var80087264 = 0x00000000; @@ -1388,8 +1390,11 @@ char *mpGetWeaponLabel(s32 weaponnum) return ""; } +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b8a5c[] = "Gun index %d -> slot %d = gun %d\n\n"; const char var7f1b8a80[] = "HOLDER: selecting weapon set %d\n"; +#endif + const char var7f1b8aa4[] = "%d\n"; void mpSetWeaponSlot(s32 slot, s32 mpweaponnum) @@ -3812,6 +3817,7 @@ glabel mpCalculatePlayerTitle ); #endif +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b8ad0[] = "%s%sAccuracy Peak! real value: %f (*100)\n"; const char var7f1b8afc[] = ""; const char var7f1b8b00[] = ""; @@ -3820,14 +3826,21 @@ const char var7f1b8b20[] = ""; const char var7f1b8b24[] = "%splayer %d dist:%f -> %f = %d\n"; const char var7f1b8b44[] = ""; const char var7f1b8b48[] = "Player %d TitleCalc ============\n"; +#else +const u32 var7f1b3324nb[] = {2, 4, 8, 0x10, 0x1c, 0x30, 0x4e, 0x8a, 0xc6, 0x12c }; +#endif + const char var7f1b8b6c[] = "Sim\n"; const char var7f1b8b74[] = "%s:%d\n"; const char var7f1b8b7c[] = "%s\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b8b80[] = "Adding GBCHead to load to slot %d: guid is %x-%x, player is %d\n"; const char var7f1b8bc0[] = "PakId for player %d: %d\n"; const char var7f1b8bdc[] = "Save Player Result: %d New GUID: %x\n"; const char var7f1b8c04[] = "PakId for player %d: %d\n"; const char var7f1b8c20[] = "Load Player - Result: %d\n"; +#endif struct mphead g_MpBeauHeads[NUM_MPBEAUHEADS] = { // head, require feature @@ -9300,6 +9313,7 @@ char *mpGetPresetNameBySlot(s32 slot) return ""; } +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b8c40[] = "bot %d headId %d bodyId %d\n"; const char var7f1b8c5c[] = "team change %s %d\n"; @@ -9322,6 +9336,7 @@ const char var7f1b8ccc[] = "SaveGame Result: %d New GUID: %x\n"; const char var7f1b8cf0[] = "LoadMultiGameFile : PakId=0x%x, FileId=0x%x\n"; const char var7f1b8d20[] = "LoadGame Result: %d\n"; const char var7f1b8d38[] = "GBCHead: Call to create head for slot %d (gbcheadobjs[slotno]=%x)\n"; +#endif // >= VERSION_NTSC_1_0 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 497da5fb5..d95e1ea51 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -1110,48 +1110,48 @@ glabel var7f1b80dc GLOBAL_ASM( glabel func0f179da4 .late_rodata -glabel var7f1b8078 -.word func0f179da4+0x34 # f179dd8 -glabel var7f1b807c -.word func0f179da4+0x270 # f17a014 -glabel var7f1b8080 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b8084 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b8088 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b808c -.word func0f179da4+0x168 # f179f0c -glabel var7f1b8090 -.word func0f179da4+0x160 # f179f04 -glabel var7f1b8094 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b8098 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b809c -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80a0 -.word func0f179da4+0x48 # f179dec -glabel var7f1b80a4 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80a8 -.word func0f179da4+0x128 # f179ecc -glabel var7f1b80ac -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80b0 -.word func0f179da4+0x168 # f179f0c -glabel var7f1b80b4 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80b8 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80bc -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80c0 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80c4 -.word func0f179da4+0x270 # f17a014 -glabel var7f1b80c8 -.word func0f179da4+0x108 # f179eac +glabel var7f1b2978nb +.word func0f179da4+0x030 +glabel var7f1b297cnb +.word func0f179da4+0x21c +glabel var7f1b2980nb +.word func0f179da4+0x21c +glabel var7f1b2984nb +.word func0f179da4+0x21c +glabel var7f1b2988nb +.word func0f179da4+0x21c +glabel var7f1b298cnb +.word func0f179da4+0x12c +glabel var7f1b2990nb +.word func0f179da4+0x124 +glabel var7f1b2994nb +.word func0f179da4+0x21c +glabel var7f1b2998nb +.word func0f179da4+0x21c +glabel var7f1b299cnb +.word func0f179da4+0x21c +glabel var7f1b29a0nb +.word func0f179da4+0x044 +glabel var7f1b29a4nb +.word func0f179da4+0x21c +glabel var7f1b29a8nb +.word func0f179da4+0x21c +glabel var7f1b29acnb +.word func0f179da4+0x21c +glabel var7f1b29b0nb +.word func0f179da4+0x12c +glabel var7f1b29b4nb +.word func0f179da4+0x21c +glabel var7f1b29b8nb +.word func0f179da4+0x21c +glabel var7f1b29bcnb +.word func0f179da4+0x21c +glabel var7f1b29c0nb +.word func0f179da4+0x21c +glabel var7f1b29c4nb +.word func0f179da4+0x21c +glabel var7f1b29c8nb +.word func0f179da4+0x104 glabel var7f1b80cc .word 0x3c23d70a glabel var7f1b80d0 @@ -1807,7 +1807,7 @@ char *mpMenuTextAccuracy(struct menuitem *item) { #if VERSION < VERSION_NTSC_1_0 if (g_MpPlayers[g_MpPlayerNum].ammoused < 8) { - return "-"; + return "-\n"; } #endif @@ -1842,7 +1842,7 @@ void mpFormatDamageValue(char *dst, f32 damage) damage = damage / 1000; sprintf(dst, "%s%s%.1fKL", "", "", damage); } else { - sprintf(dst, "%s%s%.1f", "", "", damage); + sprintf(dst, "%s%s%.1fL", "", "", damage); } #endif } @@ -3121,48 +3121,48 @@ glabel var7f1b814c GLOBAL_ASM( glabel func0f17b4f8 .late_rodata -glabel var7f1b80f0 -.word func0f17b4f8+0x34 # f17b52c -glabel var7f1b80f4 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b80f8 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b80fc -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8100 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8104 -.word func0f17b4f8+0x214 # f17b70c -glabel var7f1b8108 -.word func0f17b4f8+0x208 # f17b700 -glabel var7f1b810c -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8110 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8114 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8118 -.word func0f17b4f8+0x48 # f17b540 -glabel var7f1b811c -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8120 -.word func0f17b4f8+0x214 # f17b70c -glabel var7f1b8124 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8128 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b812c -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8130 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8134 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8138 -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b813c -.word func0f17b4f8+0x334 # f17b82c -glabel var7f1b8140 -.word func0f17b4f8+0x1e8 # f17b6e0 +glabel var7f1b29e4nb +.word func0f17b4f8+0x034 +glabel var7f1b29e8nb +.word func0f17b4f8+0x304 +glabel var7f1b29ecnb +.word func0f17b4f8+0x304 +glabel var7f1b29f0nb +.word func0f17b4f8+0x304 +glabel var7f1b29f4nb +.word func0f17b4f8+0x304 +glabel var7f1b29f8nb +.word func0f17b4f8+0x214 +glabel var7f1b29fcnb +.word func0f17b4f8+0x208 +glabel var7f1b2a00nb +.word func0f17b4f8+0x304 +glabel var7f1b2a04nb +.word func0f17b4f8+0x304 +glabel var7f1b2a08nb +.word func0f17b4f8+0x304 +glabel var7f1b2a0cnb +.word func0f17b4f8+0x048 +glabel var7f1b2a10nb +.word func0f17b4f8+0x304 +glabel var7f1b2a14nb +.word func0f17b4f8+0x214 +glabel var7f1b2a18nb +.word func0f17b4f8+0x304 +glabel var7f1b2a1cnb +.word func0f17b4f8+0x304 +glabel var7f1b2a20nb +.word func0f17b4f8+0x304 +glabel var7f1b2a24nb +.word func0f17b4f8+0x304 +glabel var7f1b2a28nb +.word func0f17b4f8+0x304 +glabel var7f1b2a2cnb +.word func0f17b4f8+0x304 +glabel var7f1b2a30nb +.word func0f17b4f8+0x304 +glabel var7f1b2a34nb +.word func0f17b4f8+0x1e8 glabel var7f1b8144 .word 0x3c23d70a glabel var7f1b8148 @@ -6757,54 +6757,54 @@ glabel var7f1b8288 GLOBAL_ASM( glabel menuhandler0017e4d4 .late_rodata -glabel var7f1b822c -.word menuhandler0017e4d4+0x6c # f17e540 -glabel var7f1b8230 -.word menuhandler0017e4d4+0x12c # f17e600 -glabel var7f1b8234 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8238 -.word menuhandler0017e4d4+0x134 # f17e608 -glabel var7f1b823c -.word menuhandler0017e4d4+0x13c # f17e610 -glabel var7f1b8240 -.word menuhandler0017e4d4+0x7c # f17e550 -glabel var7f1b8244 -.word menuhandler0017e4d4+0x11c # f17e5f0 -glabel var7f1b8248 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b824c -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8250 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8254 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8258 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b825c -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8260 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8264 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8268 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b826c -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8270 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8274 -.word menuhandler0017e4d4+0x144 # f17e618 -glabel var7f1b8278 -.word menuhandler0017e4d4+0x4cc # f17e9a0 -glabel var7f1b827c -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8280 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8284 -.word menuhandler0017e4d4+0x4d4 # f17e9a8 -glabel var7f1b8288 -.word menuhandler0017e4d4+0x50 # f17e524 +glabel var7f1b2b20nb +.word menuhandler0017e4d4+0x068 +glabel var7f1b2b24nb +.word menuhandler0017e4d4+0x128 +glabel var7f1b2b28nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b2cnb +.word menuhandler0017e4d4+0x130 +glabel var7f1b2b30nb +.word menuhandler0017e4d4+0x138 +glabel var7f1b2b34nb +.word menuhandler0017e4d4+0x078 +glabel var7f1b2b38nb +.word menuhandler0017e4d4+0x118 +glabel var7f1b2b3cnb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b40nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b44nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b48nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b4cnb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b50nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b54nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b58nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b5cnb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b60nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b64nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b68nb +.word menuhandler0017e4d4+0x140 +glabel var7f1b2b6cnb +.word menuhandler0017e4d4+0x498 +glabel var7f1b2b70nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b74nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b78nb +.word menuhandler0017e4d4+0x4a0 +glabel var7f1b2b7cnb +.word menuhandler0017e4d4+0x04c .text /* f178bdc: 27bdff48 */ addiu $sp,$sp,-184 /* f178be0: 248effff */ addiu $t6,$a0,-1 diff --git a/src/game/music.c b/src/game/music.c index 6c1759a91..6570cf556 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -36,6 +36,25 @@ u32 var800840f4 = 0x00000000; u32 var800840f8 = PAL ? 100 : 120; u32 var800840fc = 0x00000000; +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b2030nb[] = "MUSIC : musicPlayLevel\n"; +const char var7f1b2048nb[] = "MUSIC : SWITCHING TO CORRECT AMBIENT TUNE\n"; +const char var7f1b2074nb[] = "musicStartLevel\n"; +const char var7f1b2088nb[] = "musicEndLevel\n"; +const char var7f1b2098nb[] = "musicStartNRG\n"; +const char var7f1b20a8nb[] = "musicEndNRG\n"; +const char var7f1b20b8nb[] = "musicStartWatch start\n"; +const char var7f1b20d0nb[] = "musicEndWatch start\n"; +const char var7f1b20e8nb[] = "musicEndWatch end\n"; +const char var7f1b20fcnb[] = "musicStartDead\n"; +const char var7f1b210cnb[] = "musicStartTemporary\n"; +const char var7f1b2124nb[] = "musicEndTemporary\n"; +const char var7f1b2138nb[] = "musicStartCutscene\n"; +const char var7f1b214cnb[] = "musicEndCutscene\n"; +const char var7f1b2160nb[] = "musicStartAmbient : Tune=%d\n"; +const char var7f1b2180nb[] = "musicEndAmbient\n"; +#endif + char *var80084100[] = { "null", "leveltune", diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index ba4c7b23b..469137294 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -30,9 +30,6 @@ const char var7f1b3a90[] = "\0************** 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#'*+,-./:=?@"; const char var7f1b3ad4[] = "Pak %d -> Pak_UpdateAndGetPakNoteInfo - ERROR - ekPakErrorPakFatal\n"; const char var7f1b3b18[] = "Pak %d -> Pak_UpdateAndGetPakNoteInfo - ERROR - ekPakErrorNoPakPresent\n"; -const char var7f1b3b60[] = "-> Unknown PakFileType_e - %d\n"; -const char var7f1b3b80[] = "-forceversion"; -const char var7f1b3b90[] = "Pak %d -> Header Cache 2 - FATAL ERROR\n"; struct var800a2380 var800a2380[5]; u32 var800a317c; @@ -416,6 +413,32 @@ s32 func0f116e84(s8 device, u16 company_code, u32 game_code, char *game_name, ch return 1; } +#if VERSION >= VERSION_NTSC_1_0 +const char var7f1b3b60[] = "-> Unknown PakFileType_e - %d\n"; +#else +const char var7f1b3b60[] = "-> Unknown PakFileType_e - %d"; +#endif + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ad850nb[] = "Bad "; +const char var7f1ad85cnb[] = "Blank "; +const char var7f1ad868nb[] = "Swap "; +const char var7f1ad874nb[] = "Camera "; +const char var7f1ad880nb[] = "GmSetup "; +const char var7f1ad88cnb[] = "Boss "; +const char var7f1ad898nb[] = "Multi Pl"; +const char var7f1ad8a4nb[] = "Multi Gm"; +const char var7f1ad8b0n0[] = "????????"; +#endif + +const char var7f1b3b80[] = "-forceversion"; + +#if VERSION >= VERSION_NTSC_1_0 +const char var7f1b3b90[] = "Pak %d -> Header Cache 2 - FATAL ERROR\n"; +#else +const char var7f1b3b90[] = "Pak %d -> Header Cache 2 - FATAL ERROR"; +#endif + #if VERSION >= VERSION_NTSC_1_0 bool func0f116fa0(s8 device, s32 arg1) { @@ -543,6 +566,72 @@ s32 func0f117094(s8 arg0, u32 arg1) #if VERSION < VERSION_NTSC_1_0 GLOBAL_ASM( glabel func0f1114a0nb +.late_rodata +glabel var7f1aefa8nb +.word func0f1114a0nb+0x5c +glabel var7f1aefacnb +.word func0f1114a0nb+0x5c +glabel var7f1aefb0nb +.word func0f1114a0nb+0x5c +glabel var7f1aefb4nb +.word func0f1114a0nb+0x5c +glabel var7f1aefb8nb +.word func0f1114a0nb+0x5c +glabel var7f1aefbcnb +.word func0f1114a0nb+0x5c +glabel var7f1aefc0nb +.word func0f1114a0nb+0x5c +glabel var7f1aefc4nb +.word func0f1114a0nb+0x5c +glabel var7f1aefc8nb +.word func0f1114a0nb+0x5c +glabel var7f1aefccnb +.word func0f1114a0nb+0x5c +glabel var7f1aefd0nb +.word func0f1114a0nb+0x5c +glabel var7f1aefd4nb +.word func0f1114a0nb+0x5c +glabel var7f1aefd8nb +.word func0f1114a0nb+0x5c +glabel var7f1aefdcnb +.word func0f1114a0nb+0x5c +glabel var7f1aefe0nb +.word func0f1114a0nb+0x5c +glabel var7f1aefe4nb +.word func0f1114a0nb+0x5c +glabel var7f1aefe8nb +.word func0f1114a0nb+0x5c +glabel var7f1aefecnb +.word func0f1114a0nb+0x5c +glabel var7f1aeff0nb +.word func0f1114a0nb+0x5c +glabel var7f1aeff4nb +.word func0f1114a0nb+0x5c +glabel var7f1aeff8nb +.word func0f1114a0nb+0x5c +glabel var7f1aeffcnb +.word func0f1114a0nb+0x5c +glabel var7f1af000nb +.word func0f1114a0nb+0x5c +glabel var7f1af004nb +.word func0f1114a0nb+0x5c +glabel var7f1af008nb +.word func0f1114a0nb+0x5c +glabel var7f1af00cnb +.word func0f1114a0nb+0x5c +glabel var7f1af010nb +.word func0f1114a0nb+0x5c +glabel var7f1af014nb +.word func0f1114a0nb+0x5c +glabel var7f1af018nb +.word func0f1114a0nb+0x5c +glabel var7f1af01cnb +.word func0f1114a0nb+0x5c +glabel var7f1af020nb +.word func0f1114a0nb+0x5c +glabel var7f1af024nb +.word func0f1114a0nb+0x5c +.text /* f1114a0: 2c810041 */ sltiu $at,$a0,0x41 /* f1114a4: 14200005 */ bnez $at,.NB0f1114bc /* f1114a8: 24010080 */ addiu $at,$zero,0x80 @@ -1147,16 +1236,6 @@ void pakDumpEeprom(void) } const char var7f1b3be8[] = "PakSaveAtGuid: new guid = %x\n"; -const char var7f1b3c08[] = "Call to osPfsReSizeFile -> pfs=%x, cc=%u, gc=%u, gn=%s, en=%s, l=%d\n"; -const char var7f1b3c50[] = "Pak %d -> Pak_AddOneCameraFile\n"; -const char var7f1b3c70[] = "Pak %d -> Pak_AddOneCameraFile - Making one default camera file\n"; -const char var7f1b3cb4[] = "Pak %d -> Pak_AddOneCameraFile : Got Space - No need for resize\n"; -const char var7f1b3cf8[] = "Pak %d -> Pak_AddOneCameraFile : No Space - Need to resize by %d pages\n"; -const char var7f1b3d40[] = "Pak %d -> Pak_AddOneCameraFile - Make of one default camera files failed\n"; -const char var7f1b3d8c[] = "Pak %d -> Pak_AddOneCameraFile : Error - No Room\n"; -const char var7f1b3dc0[] = "Pak %d -> Pak_GameNoteResetSize : New=%u\n"; -const char var7f1b3dec[] = "bDoUpdate7\n"; -const char var7f1b3df8[] = "Pak_SetThisGameSetupFile -> Pak=%d, File=%d, EEPROM=%d\n"; #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( @@ -1550,13 +1629,13 @@ s32 func0f117c0c(s32 arg0, s32 *arg1, s32 *arg2) #if VERSION >= VERSION_NTSC_1_0 func000150e8(); #else - func000150e8(123, "pak.c"); + func000150e8(1308, "pak.c"); #endif result = func000508d0(arg0, arg1, arg2); #if VERSION >= VERSION_NTSC_1_0 func00015144(); #else - func00015144(123, "pak.c"); + func00015144(1310, "pak.c"); #endif return result; @@ -1580,13 +1659,13 @@ s32 func0f117c80(struct var800a3180 *arg0, s32 *arg1) #if VERSION >= VERSION_NTSC_1_0 func000150e8(); #else - func000150e8(123, "pak.c"); + func000150e8(1337, "pak.c"); #endif result = func0004ce60(arg0, arg1); #if VERSION >= VERSION_NTSC_1_0 func00015144(); #else - func00015144(123, "pak.c"); + func00015144(1339, "pak.c"); #endif return result; @@ -1609,13 +1688,13 @@ s32 func0f117ce4(s32 arg0, s32 arg1, OSPfsState *note) #if VERSION >= VERSION_NTSC_1_0 func000150e8(); #else - func000150e8(123, "pak.c"); + func000150e8(1363, "pak.c"); #endif result = func00050a00(arg0, arg1, note); #if VERSION >= VERSION_NTSC_1_0 func00015144(); #else - func00015144(123, "pak.c"); + func00015144(1365, "pak.c"); #endif return result; @@ -1637,6 +1716,8 @@ s32 func0f117ce4(s32 arg0, s32 arg1, OSPfsState *note) return 0; } +const char var7f1b3c08[] = "Call to osPfsReSizeFile -> pfs=%x, cc=%u, gc=%u, gn=%s, en=%s, l=%d\n"; + u32 func0f117d90(u32 arg0, u16 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5, u32 *arg6) { if (arg0) { @@ -1710,13 +1791,13 @@ s32 func0f117ec0(struct var800a3180 *arg0, u16 company_code, u32 game_code, u8 * #if VERSION >= VERSION_NTSC_1_0 func000150e8(); #else - func000150e8(123, "pak.c"); + func000150e8(1496, "pak.c"); #endif result = func00006550(arg0, company_code, game_code, game_name, ext_name, numbytes); #if VERSION >= VERSION_NTSC_1_0 func00015144(); #else - func00015144(123, "pak.c"); + func00015144(1498, "pak.c"); #endif return result; @@ -1729,6 +1810,34 @@ s32 func0f117ec0(struct var800a3180 *arg0, u16 company_code, u32 game_code, u8 * return 0; } +const char var7f1b3c50[] = "Pak %d -> Pak_AddOneCameraFile\n"; + +#if VERSION >= VERSION_NTSC_1_0 +const char var7f1b3c70[] = "Pak %d -> Pak_AddOneCameraFile - Making one default camera file\n"; +#else +const char var7f1b3c70[] = "Pak %d -> Pak_AddOneCameraFile - Making one default camera file"; +#endif + +const char var7f1b3cb4[] = "Pak %d -> Pak_AddOneCameraFile : Got Space - No need for resize\n"; +const char var7f1b3cf8[] = "Pak %d -> Pak_AddOneCameraFile : No Space - Need to resize by %d pages\n"; +const char var7f1b3d40[] = "Pak %d -> Pak_AddOneCameraFile - Make of one default camera files failed\n"; +const char var7f1b3d8c[] = "Pak %d -> Pak_AddOneCameraFile : Error - No Room\n"; +const char var7f1b3dc0[] = "Pak %d -> Pak_GameNoteResetSize : New=%u\n"; +const char var7f1b3dec[] = "bDoUpdate7\n"; +const char var7f1b3df8[] = "Pak_SetThisGameSetupFile -> Pak=%d, File=%d, EEPROM=%d\n"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1adbd8nb[] = "RWI : Pak_OneNewFile - Using a snug in a bug offset\n"; +const char var7f1adc10nb[] = "pak.c"; +const char var7f1adc18nb[] = "Pak_Make -> Dumping details of file types found\n"; +const char var7f1adc4cnb[] = "Type %d -> "; +const char var7f1adc58nb[] = ", dSize=%u, fSize=%u\n"; +const char var7f1adc70nb[] = "Pak_Make -> Checking for inserted pakz\n"; +const char var7f1adc98nb[] = "Pak_Make -> Loading Boss File\n"; +const char var7f1adcb8nb[] = "Pak_Make -> Boss file load failed - Try to make a new one\n"; +const char var7f1adcf4nb[] = "Pak_Make -> Setting up default game file\n"; +#endif + s32 func0f117f30(s8 device) { return var800a2380[device].unk2a4; @@ -2944,7 +3053,13 @@ const char var7f1b3fc0[] = "Pak Return Code = ekPakErrorPakWaitingForInit"; const char var7f1b3ff0[] = "Pak Return Code = ekPakErrorHeaderCrcCheckFail"; const char var7f1b4020[] = "Pak Return Code = ekPakErrorDataCrcCheckFail"; const char var7f1b4050[] = "Pak Return Code = ekPakErrorDataNotValid"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b407c[] = "Pak Return Code = Unknown - %d\n"; +#else +const char var7f1b407c[] = "Pak Return Code = Unknown - %d"; +#endif + #if VERSION < VERSION_NTSC_FINAL const char var7f1b407c_2[] = "Pak %d -> Pak_RepairAsBlank : Repairing as Blank, Offset=%u, pH=%x\n"; const char var7f1b407c_3[] = "Pak %d -> Pak_RepairAsBlank -> Summing @ offset=%u, ret=%d\n"; @@ -2952,6 +3067,17 @@ const char var7f1b407c_4[] = "Pak %d -> Pak_RepairAsBlank -> Fault Speads Over M #endif const char var7f1b409c[] = "Pak %d -> Pak_RepairAsBlank - St=%u, Ed=%u, Gap=%u, Blank Size=%u\n"; const char var7f1b40e0[] = "Pak %d -> Pak_RepairAsBlank - Fatal Error at tOffset %u\n"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b423c[] = "BOS"; +const char var7f1b4244[] = "CAM"; +const char var7f1b424c[] = "MPP"; +const char var7f1b4254[] = "MPG"; +const char var7f1b425c[] = "GAM"; +const char var7f1ae0e4nb[] = "Pak %d -> Pak_GetCurrentSaveId - SaveID = %u\n"; +#endif + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b411c[] = "Pak %d -> Pak_ValidateVersion - Start - Game File Size = %d\n"; const char var7f1b415c[] = "Pak %d -> Pak_ValidateVersion - Clearing cache 2\n"; const char var7f1b4190[] = "Pak %d -> Pak_ValidateVersion 1 - Loaded with ret=%d at offset %u\n"; @@ -2962,36 +3088,152 @@ const char var7f1b4244[] = "CAM\n"; const char var7f1b424c[] = "MPP\n"; const char var7f1b4254[] = "MPG\n"; const char var7f1b425c[] = "GAM"; +#endif + const char var7f1b4260[] = "> Pak_DefragPak_Level1 - Merge of two blanks failed"; const char var7f1b4294[] = "Pak %d - Pak_StartOne called from line %d in %s -> Flags = %0x\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b42d4[] = "\nPak_StartOne -> Pak%d, Modes -\n"; +#else +const char var7f1b42d4[] = "\nPak_StartOne -> Pak%d, Modes -"; +#endif + const char var7f1b42f8[] = "Memory,"; const char var7f1b4300[] = "Rumble,"; const char var7f1b4308[] = "Game Boy"; const char var7f1b4314[] = "\n"; const char var7f1b4318[] = "Pak %d -> %u Bytes of scratch for cache 2 memory at %0x\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4354[] = "\nPak%d -> Pak_EndOne - Called from line %d in %s : Modes -\n"; +#else +const char var7f1b4354[] = "\nPak%d -> Pak_EndOne - Called from line %d in %s : Modes -"; +#endif + const char var7f1b4390[] = "Memory,"; const char var7f1b4398[] = "Rumble,"; const char var7f1b43a0[] = "Game Boy"; const char var7f1b43ac[] = "\n"; const char var7f1b43b0[] = "Pak -> FATAL ERROR -> MEMORY INSTANCE ENDING IS NO LONGER SUPPORTED\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b43f8[] = "Pak -> Pak_MakeOne - Id=%d is finished\n"; +#else +const char var7f1b43f8[] = "Pak -> Pak_MakeOne - Id=%d is finished"; +#endif + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ae2d0nb[] = "pak.c"; +const char var7f1ae2d8nb[] = "pak.c"; +#endif + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4420[] = "Pak %d -> Pak_Memory_UpdateNoteInfo\n"; +#else +const char var7f1b4420[] = "Pak %d -> Pak_Memory_UpdateNoteInfo"; +#endif + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ae304nb[] = "pak.c"; +const char var7f1ae30cnb[] = "pak.c"; +#endif + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4448[] = "Pak %d -> Couldn't assertain the game note size\n"; const char var7f1b447c[] = "Pak %d -> Pak_AnalyseCurrentGameNote - Game note size = %uk\n"; +#else +const char var7f1b4448[] = "Pak %d -> Couldn't assertain the game note size"; +const char var7f1b447c[] = "Pak %d -> Pak_AnalyseCurrentGameNote - Game note size = %uk"; +const char var7f1ae380nb[] = "Pak %d -> Pak_Memory_Init1"; +const char var7f1ae39cnb[] = "pak.c"; +const char var7f1ae3a4nb[] = "pak.c"; +#endif + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b44bc[] = "Pak %d -> Searching for the game file\n"; +#else +const char var7f1b44bc[] = "Pak %d -> Searching for the game file"; +#endif + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ae3d4nb[] = "pak.c"; +const char var7f1ae3dcnb[] = "pak.c"; +const char var7f1ae3e4nb[] = "pak.c"; +const char var7f1ae3ecnb[] = "pak.c"; +const char var7f1ae3f4nb[] = "-forcewipe"; +const char var7f1ae400nb[] = "-forcescrub"; +const char var7f1ae40cnb[] = "Pak %d -> Initialisation - No swap file"; +const char var7f1ae434nb[] = "Pak %d -> Initialisation - Found a swap file"; +const char var7f1ae464nb[] = "pak.c"; +const char var7f1ae46cnb[] = "pak.c"; +const char var7f1ae474nb[] = "pak.c"; +const char var7f1ae47cnb[] = "pak.c"; +const char var7f1ae484nb[] = "pak.c"; +const char var7f1ae48cnb[] = "pak.c"; +const char var7f1ae494nb[] = "pak.c"; +const char var7f1ae49cnb[] = "Pak %d -> About to wipe blocks %d to %d of the game file with the wipe byte %d"; +#endif + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b44e4[] = "Pak %d -> Game file wipe failed\n"; +#else +const char var7f1b44e4[] = "Pak %d -> Game file wipe failed"; +#endif + const char var7f1b4508[] = "RWI : Warning : tOffset > gPakObj[PakNum].GameFileSize\n"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ae544nb[] = "pak.c"; +const char var7f1ae54cnb[] = "pak.c"; +const char var7f1ae554nb[] = "pak.c"; +#endif + const char var7f1b4540[] = "Pak %d -> Pak_DeleteFile_Offset - DataSize = %u\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4574[] = "Pak %d -> Delete file offset (file id %d) failed\n"; const char var7f1b45a8[] = "Pak %d -> Delete file offset failed - Bad Offset passed\n"; +#else +const char var7f1b4574[] = "Pak %d -> Delete file offset (file id %d) failed"; +const char var7f1b45a8[] = "Pak %d -> Delete file offset failed - Bad Offset passed"; +#endif + const char var7f1b45e4[] = "-forceversion"; + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ae60cnb[] = "pak.c"; +const char var7f1ae614nb[] = "pak.c"; +const char var7f1ae61cnb[] = "pak.c"; +const char var7f1ae624nb[] = "pak.c"; +const char var7f1ae62cnb[] = "pak.c"; +#endif + const char var7f1b45f4[] = "PakMac_PaksLive()=%x\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b460c[] = "paksNeedToBeLive4Game=%x\n"; const char var7f1b4628[] = "paksNeedToBeLive4Menu=%x\n"; +#endif + const char var7f1b4644[] = "g_LastPackPattern=%x\n"; +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ae664nb[] = "lvGetPause = %s"; +const char var7f1ae678nb[] = "TRUE"; +const char var7f1ae680nb[] = "FALSE"; +const char var7f1ae688nb[] = "MP_GetPause = %s"; +const char var7f1ae69cnb[] = "TRUE"; +const char var7f1ae6a4nb[] = "FALSE"; +const char var7f1ae6acnb[] = "getnumplayers = %d"; +const char var7f1ae6c0nb[] = "forcecrc"; +const char var7f1ae6ccnb[] = "forcescrub"; +const char var7f1ae6d8nb[] = "dumph"; +const char var7f1ae6e0nb[] = "pakcache"; +const char var7f1ae6ecnb[] = "pakinit"; +const char var7f1ae6f4nb[] = "dumpeeprom"; +#endif + #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( glabel func0f118ae4 @@ -11917,64 +12159,60 @@ glabel var7f1b4f0c GLOBAL_ASM( glabel func0f11c39c .late_rodata -glabel var7f1b4e9c -.word func0f11c39c+0x44 # f11c3e0 -glabel var7f1b4ea0 -.word func0f11c39c+0x150 # f11c4ec -glabel var7f1b4ea4 -.word func0f11c39c+0xcc # f11c468 -glabel var7f1b4ea8 -.word func0f11c39c+0x150 # f11c4ec -glabel var7f1b4eac -.word func0f11c39c+0x150 # f11c4ec -glabel var7f1b4eb0 -.word func0f11c39c+0x150 # f11c4ec -glabel var7f1b4eb4 -.word func0f11c39c+0x110 # f11c4ac -glabel var7f1b4eb8 -.word func0f11c39c+0x110 # f11c4ac -glabel var7f1b4ebc -.word func0f11c39c+0x150 # f11c4ec -glabel var7f1b4ec0 -.word func0f11c39c+0xcc # f11c468 -glabel var7f1b4ec4 -.word func0f11c39c+0x88 # f11c424 -glabel var7f1b4ec8 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ecc -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ed0 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ed4 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ed8 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4edc -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ee0 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ee4 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ee8 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4eec -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ef0 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ef4 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4ef8 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4efc -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4f00 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4f04 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4f08 -.word func0f11c39c+0x1a4 # f11c540 -glabel var7f1b4f0c -.word func0f11c39c+0x1a4 # f11c540 +glabel var7f1af094nb +.word func0f11c39c+0x080 +glabel var7f1af098nb +.word func0f11c39c+0x0f4 +glabel var7f1af09cnb +.word func0f11c39c+0x0f4 +glabel var7f1af0a0nb +.word func0f11c39c+0x0f4 +glabel var7f1af0a4nb +.word func0f11c39c+0x0bc +glabel var7f1af0a8nb +.word func0f11c39c+0x0bc +glabel var7f1af0acnb +.word func0f11c39c+0x0f4 +glabel var7f1af0b0nb +.word func0f11c39c+0x080 +glabel var7f1af0b4nb +.word func0f11c39c+0x044 +glabel var7f1af0b8nb +.word func0f11c39c+0x148 +glabel var7f1af0bcnb +.word func0f11c39c+0x148 +glabel var7f1af0c0nb +.word func0f11c39c+0x148 +glabel var7f1af0c4nb +.word func0f11c39c+0x148 +glabel var7f1af0c8nb +.word func0f11c39c+0x148 +glabel var7f1af0ccnb +.word func0f11c39c+0x148 +glabel var7f1af0d0nb +.word func0f11c39c+0x148 +glabel var7f1af0d4nb +.word func0f11c39c+0x148 +glabel var7f1af0d8nb +.word func0f11c39c+0x148 +glabel var7f1af0dcnb +.word func0f11c39c+0x148 +glabel var7f1af0e0nb +.word func0f11c39c+0x148 +glabel var7f1af0e4nb +.word func0f11c39c+0x148 +glabel var7f1af0e8nb +.word func0f11c39c+0x148 +glabel var7f1af0ecnb +.word func0f11c39c+0x148 +glabel var7f1af0f0nb +.word func0f11c39c+0x148 +glabel var7f1af0f4nb +.word func0f11c39c+0x148 +glabel var7f1af0f8nb +.word func0f11c39c+0x148 +glabel var7f1af0fcnb +.word func0f11c39c+0x148 .text /* f11632c: afa50004 */ sw $a1,0x4($sp) /* f116330: 00057600 */ sll $t6,$a1,0x18 @@ -12420,6 +12658,8 @@ const char var7f1b46c8[] = "\nOS_GBPAK_GBCART_PULL - "; const char var7f1b46e8[] = "\nOS_GBPAK_POWER - "; const char var7f1b4708[] = "\nOS_GBPAK_RSTB_DETECTION - "; const char var7f1b4728[] = "Pak -> Dumping contents of Game Boy Pack(TM) Id file"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4760[] = "(u16) - Fixed1 - %d\n"; const char var7f1b4784[] = "(u16) - StartAddress - %d\n"; const char var7f1b47a8[] = "(u8*) - Nintendo chr data - %s\n"; @@ -12433,8 +12673,30 @@ const char var7f1b48a4[] = "(u8 ) - Fixed 2 (0x33) - %d\n"; const char var7f1b48c8[] = "(u8 ) - Version Number - %d\n"; const char var7f1b48ec[] = "(u8 ) - isum - %d\n"; const char var7f1b4910[] = "(u16) - sum - %d\n"; +#else +const char var7f1b4760[] = "(u16) - Fixed1 - %d"; +const char var7f1b4784[] = "(u16) - StartAddress - %d"; +const char var7f1b47a8[] = "(u8*) - Nintendo chr data - %s"; +const char var7f1b47cc[] = "(u8*) - Game Title - %s"; +const char var7f1b47f0[] = "(u16) - Company Code - %d"; +const char var7f1b4814[] = "(u8 ) - Body Code - %d"; +const char var7f1b4838[] = "(u8 ) - Rom Size - %d"; +const char var7f1b485c[] = "(u8 ) - Ram Size - %d"; +const char var7f1b4880[] = "(u8 ) - country_code - %d"; +const char var7f1b48a4[] = "(u8 ) - Fixed 2 (0x33) - %d"; +const char var7f1b48c8[] = "(u8 ) - Version Number - %d"; +const char var7f1b48ec[] = "(u8 ) - isum - %d"; +const char var7f1b4910[] = "(u16) - sum - %d"; +#endif + const char var7f1b4934[] = "Pak -> Finished Dump"; +#if VERSION < VERSION_NTSC_1_0 +const char var7f1ae980nb[] = "Pak -> Game Boy Pack reset was sucessful\n"; +const char var7f1ae9acnb[] = "Pak -> Connector Check Failed"; +const char var7f1ae9ccnb[] = "Pak -> osGbpakReadId - Failed"; +#endif + const u32 var7f1b494c[] = {0x43000000}; const u32 var7f1b4950[] = {0x43140000}; const u32 var7f1b4954[] = {0x435c0000}; @@ -12537,24 +12799,51 @@ const u32 var7f1b4ad4[] = {0x40800000}; const u32 var7f1b4ad8[] = {0x41200000}; const char var7f1b4adc[] = "Pak_StartCapture -> Failed - Code = %d\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4b04[] = "Pak_DownloadNextBlockToPackBuffer : eQuality=ekCapQualityHeader, BufferNum=%d\n"; +#else +const char var7f1b4b04[] = "Pak_DownloadNextBlockToPackBuffer : eQuality=ekCapQualityHeader, BufferNum=%d"; +#endif + const char var7f1b4b54[] = "Pak : Doing Frame - Top = %d\n"; const char var7f1b4b78[] = "Pak : Doing Frame - Height = %d\n"; const char var7f1b4b9c[] = "Pak : Doing Frame - Bottom = %d\n"; -#if VERSION < VERSION_NTSC_FINAL + +#if VERSION == VERSION_NTSC_1_0 const char var7f1b4b9c_2[] = "Pak %d - PakDamage_UjiWipedMyAss\n"; #endif + +#if VERSION < VERSION_NTSC_1_0 +const char var7f1aec60nb[] = "Pak %d -> ekPakInitStatusInitMemoryPak1\n"; +const char var7f1aec8cnb[] = "Pak %d -> ekPakInitStatusInitMemoryPak2\n"; +const char var7f1aecb8nb[] = "Pak %d -> ekPakInitStatusInitMemoryPak3\n"; +const char var7f1aece4nb[] = "pak.c"; +const char var7f1aececnb[] = "pak.c"; +const char var7f1aecf4nb[] = "pak.c"; +const char var7f1aecfcnb[] = "pak.c"; +#endif + const char var7f1b4bc0[] = "Pak %d - ekPakInitStatusError_CorruptedPak\n"; + +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4bec[] = "Pak %d - ekPakInitStatusInitGameBoy_PDGB_Check_Error\n"; +#endif + const char var7f1b4c24[] = "Pak %d - ekPakInitStatusError_DamagedPak\n"; const char var7f1b4c50[] = "Pak %d - ekPakInitStatusError_StuffedPak\n"; const char var7f1b4c7c[] = "Pak %d - ekPakInitStatusError_StuffedAndCheckedPak\n"; const char var7f1b4cb0[] = "Pak %d - ekPakInitStatusVoid\n"; const char var7f1b4cd0[] = "Pak %d -> Unhandled Init Status - %d\n"; + #if VERSION >= VERSION_NTSC_FINAL const char var7f1b4cf8[] = "Pak %d - PakDamage_UjiWipedMyAss\n"; #endif +#if VERSION < VERSION_NTSC_1_0 +const char var7f1aee04nb[] = "Pak_EEPROM_Init"; +#endif + u32 var80075d58 = 0x00000000; u32 var80075d5c = 0x00000000; @@ -15871,62 +16160,58 @@ glabel var7f1b4fd8 GLOBAL_ASM( glabel func0f11df94 .late_rodata -glabel var7f1b4f6c -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4f70 -.word func0f11df94+0x68 # f11dffc -glabel var7f1b4f74 -.word func0f11df94+0xb4 # f11e048 -glabel var7f1b4f78 -.word func0f11df94+0xe8 # f11e07c -glabel var7f1b4f7c -.word func0f11df94+0x154 # f11e0e8 -glabel var7f1b4f80 -.word func0f11df94+0x184 # f11e118 -glabel var7f1b4f84 -.word func0f11df94+0x1a4 # f11e138 -glabel var7f1b4f88 -.word func0f11df94+0x12c # f11e0c0 -glabel var7f1b4f8c -.word func0f11df94+0x1cc # f11e160 -glabel var7f1b4f90 -.word func0f11df94+0x1e4 # f11e178 -glabel var7f1b4f94 -.word func0f11df94+0x1f4 # f11e188 -glabel var7f1b4f98 -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4f9c -.word func0f11df94+0x218 # f11e1ac -glabel var7f1b4fa0 -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4fa4 -.word func0f11df94+0x2b8 # f11e24c -glabel var7f1b4fa8 -.word func0f11df94+0x224 # f11e1b8 -glabel var7f1b4fac -.word func0f11df94+0x318 # f11e2ac -glabel var7f1b4fb0 -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4fb4 -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4fb8 -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4fbc -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4fc0 -.word func0f11df94+0x378 # f11e30c -glabel var7f1b4fc4 -.word func0f11df94+0x39c # f11e330 -glabel var7f1b4fc8 -.word func0f11df94+0x3b8 # f11e34c -glabel var7f1b4fcc -.word func0f11df94+0x200 # f11e194 -glabel var7f1b4fd0 -.word func0f11df94+0x20c # f11e1a0 -glabel var7f1b4fd4 -.word func0f11df94+0x284 # f11e218 -glabel var7f1b4fd8 -.word func0f11df94+0x2ac # f11e240 +glabel var7f1af100nb +.word func0f11df94+0x404 +glabel var7f1af104nb +.word func0f11df94+0x064 +glabel var7f1af108nb +.word func0f11df94+0x098 +glabel var7f1af10cnb +.word func0f11df94+0x0bc +glabel var7f1af110nb +.word func0f11df94+0x140 +glabel var7f1af114nb +.word func0f11df94+0x168 +glabel var7f1af118nb +.word func0f11df94+0x180 +glabel var7f1af11cnb +.word func0f11df94+0x110 +glabel var7f1af120nb +.word func0f11df94+0x1a0 +glabel var7f1af124nb +.word func0f11df94+0x1c0 +glabel var7f1af128nb +.word func0f11df94+0x278 +glabel var7f1af12cnb +.word func0f11df94+0x404 +glabel var7f1af130nb +.word func0f11df94+0x29c +glabel var7f1af134nb +.word func0f11df94+0x404 +glabel var7f1af138nb +.word func0f11df94+0x34c +glabel var7f1af13cnb +.word func0f11df94+0x300 +glabel var7f1af140nb +.word func0f11df94+0x398 +glabel var7f1af144nb +.word func0f11df94+0x404 +glabel var7f1af148nb +.word func0f11df94+0x404 +glabel var7f1af14cnb +.word func0f11df94+0x404 +glabel var7f1af150nb +.word func0f11df94+0x404 +glabel var7f1af154nb +.word func0f11df94+0x3e4 +glabel var7f1af158nb +.word func0f11df94+0x3f8 +glabel var7f1af15cnb +.word func0f11df94+0x404 +glabel var7f1af160nb +.word func0f11df94+0x284 +glabel var7f1af164nb +.word func0f11df94+0x290 .text /* f117b80: 00043600 */ sll $a2,$a0,0x18 /* f117b84: 00067603 */ sra $t6,$a2,0x18 @@ -16418,8 +16703,6 @@ void pakProbeEeprom(void) } } -const char var7f1b4d24[] = "Pak %d -> Pak_PdGameBoySetRWByte - Fatal Error\n"; - s32 pakReadEeprom(u8 address, u8 *buffer, u32 len) { s32 result; @@ -16624,6 +16907,12 @@ bool func0f11e7f0(char *a, char *b) return true; } +#if VERSION >= VERSION_NTSC_1_0 +const char var7f1b4d24[] = "Pak %d -> Pak_PdGameBoySetRWByte - Fatal Error\n"; +#else +const char var7f1b4d24[] = "Pak %d -> Pak_PdGameBoySetRWByte - Fatal Error"; +#endif + #if VERSION >= VERSION_NTSC_1_0 s32 func0f11e844(s8 device) { @@ -16700,6 +16989,17 @@ s32 func0f11e844(s8 device) return 0; } #else +const char var7f1aee7c[] = "pak.c"; +const char var7f1aee84[] = "pak.c"; +const char var7f1aee8c[] = "pak.c"; +const char var7f1aee94[] = "pak.c"; +const char var7f1aee9c[] = "pak.c"; +const char var7f1aeea4[] = "pak.c"; +const char var7f1aeeac[] = "pak.c"; +const char var7f1aeeb4[] = "pak.c"; +const char var7f1aeebc[] = "pak.c"; +const char var7f1aeec4[] = "pak.c"; + GLOBAL_ASM( glabel func0f11e844 /* f1186c0: 27bdff80 */ addiu $sp,$sp,-128 @@ -16935,7 +17235,11 @@ bool func0f11ea34(s8 arg0) return true; } +#if VERSION >= VERSION_NTSC_1_0 const char var7f1b4d80[] = "PerfDark\n"; +#else +const char var7f1b4d80[] = "PerfDark"; +#endif GLOBAL_ASM( glabel func0f11eaec diff --git a/src/game/prop.c b/src/game/prop.c index 91d1f1801..b5cc34551 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -6452,21 +6452,21 @@ GLOBAL_ASM( glabel func0f0641f4 .late_rodata glabel var7f1a9f30 -.word func0f0641f4+0x144 # f064338 +.word func0f0641f4+0x138 glabel var7f1a9f34 -.word func0f0641f4+0x160 # f064354 +.word func0f0641f4+0x154 glabel var7f1a9f38 -.word func0f0641f4+0x160 # f064354 +.word func0f0641f4+0x154 glabel var7f1a9f3c -.word func0f0641f4+0x154 # f064348 +.word func0f0641f4+0x148 glabel var7f1a9f40 -.word func0f0641f4+0x160 # f064354 +.word func0f0641f4+0x154 glabel var7f1a9f44 -.word func0f0641f4+0x160 # f064354 +.word func0f0641f4+0x154 glabel var7f1a9f48 -.word func0f0641f4+0x160 # f064354 +.word func0f0641f4+0x154 glabel var7f1a9f4c -.word func0f0641f4+0x160 # f064354 +.word func0f0641f4+0x154 .text /* f063468: 27bdfd70 */ addiu $sp,$sp,-656 /* f06346c: afb40028 */ sw $s4,0x28($sp) diff --git a/src/game/propobj.c b/src/game/propobj.c index acdc06f9b..7d146b1bb 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -34309,9 +34309,9 @@ GLOBAL_ASM( glabel platformDisplaceProps .late_rodata glabel var7f1aa450 -.word 0x3d3a5e30 -glabel var7f1aa454 .word 0x411ffffe +glabel var7f1aa454 +.word 0x3d3a5e30 .text /* f076270: 27bdff70 */ addiu $sp,$sp,-144 /* f076274: afbf0044 */ sw $ra,0x44($sp) @@ -46008,8 +46008,6 @@ glabel var7f1aa6dc .word 0x40c907a9 glabel var7f1aa6e0 .word 0x40c907a9 -glabel var7f1aa6e4 -.word 0xc7c35000 .text /* f07bc90: 27bdfd88 */ addiu $sp,$sp,-632 /* f07bc94: afbf004c */ sw $ra,0x4c($sp) diff --git a/src/game/room.c b/src/game/room.c index 8bf43abf0..71244ea5a 100644 --- a/src/game/room.c +++ b/src/game/room.c @@ -42,6 +42,19 @@ #include "data.h" #include "types.h" +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b1970nb[] = "NumLightsChecksum failed %s %d"; +const char var7f1b1990nb[] = "LightsOffsetChecksum failed %s %d"; +const char var7f1b19b4nb[] = "bg.c"; +const char var7f1b19bcnb[] = "bg.c"; +const char var7f1b19c4nb[] = "bg.c"; +const char var7f1b19ccnb[] = "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"; +const char var7f1b1a24nb[] = "bg.c"; +const char var7f1b1a2cnb[] = "bg.c"; +const char var7f1b1a34nb[] = "bg.c: roominf[room].allocsize > calculated!"; +const char var7f1b1a60nb[] = "bg.c"; +#endif + const char var7f1b7420[] = "Checking Convex Room %d"; const char var7f1b7438[] = " Portal %d %s%s%.1f < %.1f"; const char var7f1b7454[] = ""; diff --git a/src/game/texture.c b/src/game/texture.c index 535128c80..d82adf4b6 100644 --- a/src/game/texture.c +++ b/src/game/texture.c @@ -11,6 +11,11 @@ #include "data.h" #include "types.h" +#if VERSION < VERSION_NTSC_1_0 +const char var7f1b2330nb[] = "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"; +const char var7f1b2388nb[] = "texdecompress.c"; +#endif + struct texture *g_Textures; u32 var800aabc4; u32 var800aabc8[4]; diff --git a/src/game/training/menus.c b/src/game/training/menus.c index 5308e82d9..ad427944e 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -471,46 +471,46 @@ glabel var7f1b9940 GLOBAL_ASM( glabel menuhandler001a348c .late_rodata -glabel var7f1b98f4 -.word menuhandler001a348c+0x54 # f1a34e0 -glabel var7f1b98f8 -.word menuhandler001a348c+0x3c # f1a34c8 -glabel var7f1b98fc -.word menuhandler001a348c+0x68 # f1a34f4 -glabel var7f1b9900 -.word menuhandler001a348c+0x44 # f1a34d0 -glabel var7f1b9904 -.word menuhandler001a348c+0x4c # f1a34d8 -glabel var7f1b9908 -.word menuhandler001a348c+0x70 # f1a34fc -glabel var7f1b990c -.word menuhandler001a348c+0xf8 # f1a3584 -glabel var7f1b9910 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9914 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9918 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b991c -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9920 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9924 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9928 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b992c -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9930 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9934 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b9938 -.word menuhandler001a348c+0x508 # f1a3994 -glabel var7f1b993c -.word menuhandler001a348c+0x10c # f1a3598 -glabel var7f1b9940 -.word menuhandler001a348c+0x30 # f1a34bc +glabel var7f1b3f14nb +.word menuhandler001a348c+0x054 +glabel var7f1b3f18nb +.word menuhandler001a348c+0x03c +glabel var7f1b3f1cnb +.word menuhandler001a348c+0x068 +glabel var7f1b3f20nb +.word menuhandler001a348c+0x044 +glabel var7f1b3f24nb +.word menuhandler001a348c+0x04c +glabel var7f1b3f28nb +.word menuhandler001a348c+0x070 +glabel var7f1b3f2cnb +.word menuhandler001a348c+0x16c +glabel var7f1b3f30nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f34nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f38nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f3cnb +.word menuhandler001a348c+0x558 +glabel var7f1b3f40nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f44nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f48nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f4cnb +.word menuhandler001a348c+0x558 +glabel var7f1b3f50nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f54nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f58nb +.word menuhandler001a348c+0x558 +glabel var7f1b3f5cnb +.word menuhandler001a348c+0x180 +glabel var7f1b3f60nb +.word menuhandler001a348c+0x030 .text /* f19d49c: 248effff */ addiu $t6,$a0,-1 /* f19d4a0: 27bdff58 */ addiu $sp,$sp,-168 diff --git a/src/game/training/training.c b/src/game/training/training.c index 3ed325756..89cdaf2fc 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -1715,22 +1715,22 @@ glabel var7f1b941c GLOBAL_ASM( glabel frExecuteTargetScript .late_rodata -glabel var7f1b93f0 -.word frExecuteTargetScript+0xa8 # f19e138 -glabel var7f1b93f4 -.word frExecuteTargetScript+0x254 # f19e2e4 -glabel var7f1b93f8 -.word frExecuteTargetScript+0x260 # f19e2f0 -glabel var7f1b93fc -.word frExecuteTargetScript+0x290 # f19e320 -glabel var7f1b9400 -.word frExecuteTargetScript+0x33c # f19e3cc -glabel var7f1b9404 -.word frExecuteTargetScript+0x33c # f19e3cc -glabel var7f1b9408 -.word frExecuteTargetScript+0x33c # f19e3cc -glabel var7f1b940c -.word frExecuteTargetScript+0x8c # f19e11c +glabel var7f1b3a10nb +.word frExecuteTargetScript+0x0a4 +glabel var7f1b3a14nb +.word frExecuteTargetScript+0x234 +glabel var7f1b3a18nb +.word frExecuteTargetScript+0x240 +glabel var7f1b3a1cnb +.word frExecuteTargetScript+0x270 +glabel var7f1b3a20nb +.word frExecuteTargetScript+0x31c +glabel var7f1b3a24nb +.word frExecuteTargetScript+0x31c +glabel var7f1b3a28nb +.word frExecuteTargetScript+0x31c +glabel var7f1b3a2cnb +.word frExecuteTargetScript+0x088 glabel var7f1b9410 .word 0xbfc90fdb glabel var7f1b9414 @@ -2149,6 +2149,12 @@ void frInitTargets(void) #else GLOBAL_ASM( glabel frInitTargets +.late_rodata +glabel var7f1b3a40 +.word 0x459c4000 +glabel var7f1b3a44 +.word 0x40490fdb +.text /* f198464: 27bdfec8 */ addiu $sp,$sp,-312 /* f198468: f7ba0030 */ sdc1 $f26,0x30($sp) /* f19846c: 3c017f1b */ lui $at,0x7f1b diff --git a/src/game/wallhit.c b/src/game/wallhit.c index 772778ea8..e1442b566 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -4141,44 +4141,44 @@ glabel var7f1b5d6c GLOBAL_ASM( glabel func0f13f504 .late_rodata -glabel var7f1b5d24 -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d28 -.word func0f13f504+0xe8 # f13f5ec -glabel var7f1b5d2c -.word func0f13f504+0xe8 # f13f5ec -glabel var7f1b5d30 -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d34 -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d38 -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d3c -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d40 -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d44 -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d48 -.word func0f13f504+0x104 # f13f608 -glabel var7f1b5d4c -.word func0f13f504+0xe8 # f13f5ec -glabel var7f1b5d50 -.word func0f13f504+0x104 # f13f608 +glabel var7f1b0264nb +.word func0f13f504+0xa0 +glabel var7f1b0268nb +.word func0f13f504+0x84 +glabel var7f1b026cnb +.word func0f13f504+0xa0 +glabel var7f1b0270nb +.word func0f13f504+0xa0 +glabel var7f1b0274nb +.word func0f13f504+0xa0 +glabel var7f1b0278nb +.word func0f13f504+0xa0 +glabel var7f1b027cnb +.word func0f13f504+0xa0 +glabel var7f1b0280nb +.word func0f13f504+0xa0 +glabel var7f1b0284nb +.word func0f13f504+0xa0 +glabel var7f1b0288nb +.word func0f13f504+0xa0 +glabel var7f1b028cnb +.word func0f13f504+0x84 +glabel var7f1b0290nb +.word func0f13f504+0xa0 glabel var7f1b5d54 .word 0x3c8efa35 glabel var7f1b5d58 .word 0x3b808081 -glabel var7f1b5d5c -.word func0f13f504+0xe48 # f14034c -glabel var7f1b5d60 -.word func0f13f504+0xdfc # f140300 -glabel var7f1b5d64 -.word func0f13f504+0xec0 # f1403c4 -glabel var7f1b5d68 -.word func0f13f504+0xf38 # f14043c -glabel var7f1b5d6c -.word func0f13f504+0xf58 # f14045c +glabel var7f1b029cnb +.word func0f13f504+0xe44 +glabel var7f1b02a0nb +.word func0f13f504+0xdf8 +glabel var7f1b02a4nb +.word func0f13f504+0xebc +glabel var7f1b02a8nb +.word func0f13f504+0xf34 +glabel var7f1b02acnb +.word func0f13f504+0xf54 .text /* f13a004: 27bdfe00 */ addiu $sp,$sp,-512 /* f13a008: afbf0024 */ sw $ra,0x24($sp) diff --git a/src/include/constants.h b/src/include/constants.h index 5de13d451..c22ea4f3c 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -64,7 +64,11 @@ // N64 font code uses 0x0f for space, 0x10-0x19 for 0-9 and 0x1a-0x33 for A-Z. #define N64CHAR(c) (c == ' ' ? 0x0f : (c >= 'A' && c <= 'Z' ? c - 0x27 : c - 0x20)) +#if VERSION >= VERSION_NTSC_1_0 #define ROM_COMPANYCODE 0x3459 +#else +#define ROM_COMPANYCODE 0x3031 +#endif #if PAL #define ROM_GAMECODE 'NPDP' // "NPDE" in ASCII