ntsc-beta: Get game .rodata matching

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)

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

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

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

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)

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

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

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

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

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)

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

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)

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

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;
 

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;
 

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

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)

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)

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

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)
 {

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 },

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
 }

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

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)

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

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

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

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(

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

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",

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

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)

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)

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[] = "";

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];

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

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

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)

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