diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index 70fb02048..a40c59803 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -2128,12 +2128,12 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) return gdl; } - func0000db30("obcol", &obcol); - func0000db30("ibcol", &ibcol); - func0000db30("defcol", &defcol); - func0000db30("favcol", &favcol); - func0000db30("pickcol", &pickcol); - func0000db30("pickcol2", &pickcol2); + mainOverrideVariable("obcol", &obcol); + mainOverrideVariable("ibcol", &ibcol); + mainOverrideVariable("defcol", &defcol); + mainOverrideVariable("favcol", &favcol); + mainOverrideVariable("pickcol", &pickcol); + mainOverrideVariable("pickcol2", &pickcol2); // Render background colour colour = (u32)(g_AmMenus[g_AmIndex].alphafrac * (ibcol & 0xff)) | (ibcol & 0xffffff00); diff --git a/src/game/bg.c b/src/game/bg.c index bb3574655..e45908835 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -16011,7 +16011,7 @@ glabel func0f162d9c /* f162edc: 248475ac */ addiu $a0,$a0,%lo(var7f1b75ac) /* f162ee0: e6c6001c */ swc1 $f6,0x1c($s6) /* f162ee4: c7a8009c */ lwc1 $f8,0x9c($sp) -/* f162ee8: 0c0036cc */ jal func0000db30 +/* f162ee8: 0c0036cc */ jal mainOverrideVariable /* f162eec: e6c80020 */ swc1 $f8,0x20($s6) /* f162ef0: 0fc59570 */ jal stageGetCurrent /* f162ef4: 00000000 */ nop diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 8c6cb50b7..cdc6794e2 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -455,8 +455,8 @@ void eyespyUpdateVertical(void) } // Handle gravity - func0000db30("g", &g_EyespyFallAccel); - func0000db30("l", &g_EyespyMaxFallSpeed); + mainOverrideVariable("g", &g_EyespyFallAccel); + mainOverrideVariable("l", &g_EyespyMaxFallSpeed); accel = g_EyespyFallAccel * 0.01; // always 1 maxfallspeed = g_EyespyMaxFallSpeed * 0.01f; // always 30 diff --git a/src/game/bondgun.c b/src/game/bondgun.c index db571f2cc..4e9ee7f26 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -5815,12 +5815,12 @@ glabel var7f1ac320 /* f09a71c: afae0054 */ sw $t6,0x54($sp) /* f09a720: 2484b890 */ addiu $a0,$a0,%lo(var7f1ab890) /* f09a724: 24a50120 */ addiu $a1,$a1,%lo(var80070120) -/* f09a728: 0c0036cc */ jal func0000db30 +/* f09a728: 0c0036cc */ jal mainOverrideVariable /* f09a72c: afa70064 */ sw $a3,0x64($sp) /* f09a730: 3c047f1b */ lui $a0,%hi(var7f1ab898) /* f09a734: 3c058007 */ lui $a1,%hi(var80070124) /* f09a738: 24a50124 */ addiu $a1,$a1,%lo(var80070124) -/* f09a73c: 0c0036cc */ jal func0000db30 +/* f09a73c: 0c0036cc */ jal mainOverrideVariable /* f09a740: 2484b898 */ addiu $a0,$a0,%lo(var7f1ab898) /* f09a744: 8fa70064 */ lw $a3,0x64($sp) /* f09a748: 24060001 */ addiu $a2,$zero,0x1 @@ -6145,12 +6145,12 @@ glabel var7f1ac320 /* f09a71c: afae0054 */ sw $t6,0x54($sp) /* f09a720: 2484b890 */ addiu $a0,$a0,%lo(var7f1ab890) /* f09a724: 24a50120 */ addiu $a1,$a1,%lo(var80070120) -/* f09a728: 0c0036cc */ jal func0000db30 +/* f09a728: 0c0036cc */ jal mainOverrideVariable /* f09a72c: afa70064 */ sw $a3,0x64($sp) /* f09a730: 3c047f1b */ lui $a0,%hi(var7f1ab898) /* f09a734: 3c058007 */ lui $a1,%hi(var80070124) /* f09a738: 24a50124 */ addiu $a1,$a1,%lo(var80070124) -/* f09a73c: 0c0036cc */ jal func0000db30 +/* f09a73c: 0c0036cc */ jal mainOverrideVariable /* f09a740: 2484b898 */ addiu $a0,$a0,%lo(var7f1ab898) /* f09a744: 8fa70064 */ lw $a3,0x64($sp) /* f09a748: 24060001 */ addiu $a2,$zero,0x1 @@ -6475,12 +6475,12 @@ glabel var7f1ac320 /* f098758: afae004c */ sw $t6,0x4c($sp) /* f09875c: 24845be0 */ addiu $a0,$a0,0x5be0 /* f098760: 24a527e0 */ addiu $a1,$a1,0x27e0 -/* f098764: 0c00381c */ jal func0000db30 +/* f098764: 0c00381c */ jal mainOverrideVariable /* f098768: afa7005c */ sw $a3,0x5c($sp) /* f09876c: 3c047f1a */ lui $a0,0x7f1a /* f098770: 3c058007 */ lui $a1,0x8007 /* f098774: 24a527e4 */ addiu $a1,$a1,0x27e4 -/* f098778: 0c00381c */ jal func0000db30 +/* f098778: 0c00381c */ jal mainOverrideVariable /* f09877c: 24845be8 */ addiu $a0,$a0,0x5be8 /* f098780: 8fa7005c */ lw $a3,0x5c($sp) /* f098784: 24060001 */ addiu $a2,$zero,0x1 @@ -6787,8 +6787,8 @@ const char var7f1ab898[] = "rofftime"; // static u32 rontime = 2; // static u32 rofftime = 4; // -// func0000db30("rontime", &rontime); -// func0000db30("rofftime", &rofftime); +// mainOverrideVariable("rontime", &rontime); +// mainOverrideVariable("rofftime", &rofftime); // // hand->firing = true; // @@ -7091,7 +7091,7 @@ bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct if (hand->stateminor == 0) { sp64 = 1; - func0000db30("gkef", &var80070128); + mainOverrideVariable("gkef", &var80070128); if (hand->statecycles == 0) { hand->gs_float1 = 0; diff --git a/src/game/bondview.c b/src/game/bondview.c index e05f3bef6..586749f14 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -41,12 +41,12 @@ glabel func7f13c2d0nb /* f13c2d8: 3c047f1b */ lui $a0,0x7f1b /* f13c2dc: 3c058008 */ lui $a1,0x8008 /* f13c2e0: 24a520ac */ addiu $a1,$a1,0x20ac -/* f13c2e4: 0c00381c */ jal func0000db30 +/* f13c2e4: 0c00381c */ jal mainOverrideVariable /* f13c2e8: 248402b0 */ addiu $a0,$a0,0x2b0 /* f13c2ec: 3c047f1b */ lui $a0,0x7f1b /* f13c2f0: 3c058008 */ lui $a1,0x8008 /* f13c2f4: 24a520b0 */ addiu $a1,$a1,0x20b0 -/* f13c2f8: 0c00381c */ jal func0000db30 +/* f13c2f8: 0c00381c */ jal mainOverrideVariable /* f13c2fc: 248402b8 */ addiu $a0,$a0,0x2b8 /* f13c300: 8fbf0014 */ lw $ra,0x14($sp) /* f13c304: 27bd0018 */ addiu $sp,$sp,0x18 @@ -448,8 +448,8 @@ Gfx *bviewPrepareStaticRgba16(Gfx *gdl, u32 colour, u32 alpha) static u32 envcol = 0xffffffff; static u32 primcol = 0x7f7f7fff; - func0000db30("envcol", &envcol); - func0000db30("primcol", &primcol); + mainOverrideVariable("envcol", &envcol); + mainOverrideVariable("primcol", &primcol); gDPPipeSync(gdl++); gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 5, 0, @@ -482,8 +482,8 @@ Gfx *bviewPrepareStaticI8(Gfx *gdl, u32 colour, u32 alpha) static u32 envcol = 0xffffffff; static u32 primcol = 0x7f7f7fff; - func0000db30("envcol", &envcol); - func0000db30("primcol", &primcol); + mainOverrideVariable("envcol", &envcol); + mainOverrideVariable("primcol", &primcol); gDPPipeSync(gdl++); gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_8b, 0, 0x0000, 5, 0, @@ -542,9 +542,9 @@ Gfx *bviewRenderMotionBlur(Gfx *gdl, u32 colour, u32 alpha) var8007f844 = 0; - func0000db30("sfxxx", &sfxxx); + mainOverrideVariable("sfxxx", &sfxxx); fxxx = sfxxx / 1000.0f; - func0000db30("sfyyy", &sfyyy); + mainOverrideVariable("sfyyy", &sfyyy); fyyy = sfyyy / 1000.0f; gDPPipeSync(gdl++); diff --git a/src/game/camdraw.c b/src/game/camdraw.c index fead8d512..9f1940408 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -1429,13 +1429,13 @@ void func0f14b8ac(s32 index) { struct var8007f8dc *thing = &var8007f8dc[index]; - func0000db30("kg", &var8007f8e8); - func0000db30("Kp", &var8007f8ec); - func0000db30("Ki", &var8007f8f0); - func0000db30("Kd", &var8007f8f4); - func0000db30("tInt", &var8007f8f8); - func0000db30("gocal", &var8007f8fc); - func0000db30("aim", &var8007f900); + mainOverrideVariable("kg", &var8007f8e8); + mainOverrideVariable("Kp", &var8007f8ec); + mainOverrideVariable("Ki", &var8007f8f0); + mainOverrideVariable("Kd", &var8007f8f4); + mainOverrideVariable("tInt", &var8007f8f8); + mainOverrideVariable("gocal", &var8007f8fc); + mainOverrideVariable("aim", &var8007f900); if (thing->unk0d4_00) { func0f14cf6c(); diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 793623fbc..8f2e23b7e 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -15179,7 +15179,7 @@ void func0f02855c(s32 arg0) { var80062978 = arg0; - func0000db30("selectanimnum", &g_SelectedAnimNum); + mainOverrideVariable("selectanimnum", &g_SelectedAnimNum); } void chrsCheckForNoise(f32 noiseradius) diff --git a/src/game/credits.c b/src/game/credits.c index 8a1d67e33..40791e755 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -2186,12 +2186,12 @@ glabel var7f1b5850 /* f1392d8: f7b60030 */ sdc1 $f22,0x30($sp) /* f1392dc: f7b40028 */ sdc1 $f20,0x28($sp) /* f1392e0: 24a5f468 */ addiu $a1,$a1,%lo(var8007f468) -/* f1392e4: 0c0036cc */ jal func0000db30 +/* f1392e4: 0c0036cc */ jal mainOverrideVariable /* f1392e8: 248457c0 */ addiu $a0,$a0,%lo(var7f1b57c0) /* f1392ec: 3c047f1b */ lui $a0,%hi(var7f1b57c8) /* f1392f0: 3c058008 */ lui $a1,%hi(var8007f46c) /* f1392f4: 24a5f46c */ addiu $a1,$a1,%lo(var8007f46c) -/* f1392f8: 0c0036cc */ jal func0000db30 +/* f1392f8: 0c0036cc */ jal mainOverrideVariable /* f1392fc: 248457c8 */ addiu $a0,$a0,%lo(var7f1b57c8) /* f139300: 0fc59e73 */ jal gfxAllocateColours /* f139304: 2404003c */ addiu $a0,$zero,0x3c @@ -4808,7 +4808,7 @@ void creditsTick(void) creditsCreatePendingBgLayers(0xffffffff); } - func0000db30("for", &var8007f6d8); + mainOverrideVariable("for", &var8007f6d8); if (var8007f6d8 < 0xffff) { for (i = 0; i < 4; i++) { @@ -4816,7 +4816,7 @@ void creditsTick(void) } } - func0000db30("flick", &var8007f6d4); + mainOverrideVariable("flick", &var8007f6d4); if (var8007f6d4 != 0) { creditsCreatePendingBgLayers(0xffffffff); @@ -4866,7 +4866,7 @@ glabel var7f1afe70nb /* f135920: 3c058008 */ lui $a1,0x8008 /* f135924: afb00018 */ sw $s0,0x18($sp) /* f135928: 24a51f2c */ addiu $a1,$a1,0x1f2c -/* f13592c: 0c00381c */ jal func0000db30 +/* f13592c: 0c00381c */ jal mainOverrideVariable /* f135930: 2484fd10 */ addiu $a0,$a0,-752 /* f135934: 3c0e8008 */ lui $t6,0x8008 /* f135938: 8dce1f2c */ lw $t6,0x1f2c($t6) @@ -4891,7 +4891,7 @@ glabel var7f1afe70nb /* f13597c: 3c10800b */ lui $s0,0x800b /* f135980: 3c058008 */ lui $a1,0x8008 /* f135984: 26108730 */ addiu $s0,$s0,-30928 -/* f135988: 0c00381c */ jal func0000db30 +/* f135988: 0c00381c */ jal mainOverrideVariable /* f13598c: 24a51f28 */ addiu $a1,$a1,0x1f28 /* f135990: 3c088008 */ lui $t0,0x8008 /* f135994: 8d081f28 */ lw $t0,0x1f28($t0) diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 4f9121867..2ac468a92 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -1025,7 +1025,7 @@ s32 menuhandlerEndscreenCheats(s32 operation, struct menuitem *item, union handl // Timed cheat just got unlocked, and this item is the timed cheat name u32 weight = func0f006b08(40) * 255; - func0000db30("ctcol", &g_CheatColour); + mainOverrideVariable("ctcol", &g_CheatColour); if (item->param == 0 && cheatGetTime(g_Menus[g_MpPlayerNum].endscreen.cheatinfo & 0xff) == 0) { diff --git a/src/game/explosions/explosions.c b/src/game/explosions/explosions.c index fd8352253..8e6f9ec1e 100644 --- a/src/game/explosions/explosions.c +++ b/src/game/explosions/explosions.c @@ -5192,7 +5192,7 @@ Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool withalpha) *colour = red << 24 | green << 16 | alpha | 0x80800000; } else { static u32 var8007e93c = 0xffffffff; - func0000db30("ecol", &var8007e93c); + mainOverrideVariable("ecol", &var8007e93c); *colour = 0xffffffff; *colour = var8007e93c; } diff --git a/src/game/game_01d860.c b/src/game/game_01d860.c index c6c2c897e..2bfd0a081 100644 --- a/src/game/game_01d860.c +++ b/src/game/game_01d860.c @@ -15,7 +15,7 @@ glabel func0f01d860 /* f01d938: 3c047f1b */ lui $a0,0x7f1b /* f01d93c: 3c058006 */ lui $a1,0x8006 /* f01d940: 24a52630 */ addiu $a1,$a1,0x2630 -/* f01d944: 0c003624 */ jal func0000db30 +/* f01d944: 0c003624 */ jal mainOverrideVariable /* f01d948: 24849880 */ addiu $a0,$a0,-26496 /* f01d94c: 3c048006 */ lui $a0,0x8006 /* f01d950: 8c842630 */ lw $a0,0x2630($a0) diff --git a/src/game/game_091e10.c b/src/game/game_091e10.c index 998032c92..2995e5631 100644 --- a/src/game/game_091e10.c +++ b/src/game/game_091e10.c @@ -18,7 +18,7 @@ u32 setupGetCommandLength(u32 *cmd) #if VERSION < VERSION_NTSC_1_0 static u32 crash1; - func0000db30("crash1", &crash1); + mainOverrideVariable("crash1", &crash1); #endif switch ((u8)cmd[0]) { diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index e4ba7ea0f..c6c8747e7 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -4232,27 +4232,27 @@ glabel var7f1acd8c /* f0af190: f7b40028 */ sdc1 $f20,0x28($sp) /* f0af194: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f0af198: 24a50574 */ addiu $a1,$a1,%lo(var80070574) -/* f0af19c: 0c0036cc */ jal func0000db30 +/* f0af19c: 0c0036cc */ jal mainOverrideVariable /* f0af1a0: 2484cc10 */ addiu $a0,$a0,%lo(var7f1acc10) /* f0af1a4: 3c047f1b */ lui $a0,%hi(var7f1acc14) /* f0af1a8: 3c058007 */ lui $a1,%hi(var80070578) /* f0af1ac: 24a50578 */ addiu $a1,$a1,%lo(var80070578) -/* f0af1b0: 0c0036cc */ jal func0000db30 +/* f0af1b0: 0c0036cc */ jal mainOverrideVariable /* f0af1b4: 2484cc14 */ addiu $a0,$a0,%lo(var7f1acc14) /* f0af1b8: 3c047f1b */ lui $a0,%hi(var7f1acc18) /* f0af1bc: 3c058007 */ lui $a1,%hi(var8007057c) /* f0af1c0: 24a5057c */ addiu $a1,$a1,%lo(var8007057c) -/* f0af1c4: 0c0036cc */ jal func0000db30 +/* f0af1c4: 0c0036cc */ jal mainOverrideVariable /* f0af1c8: 2484cc18 */ addiu $a0,$a0,%lo(var7f1acc18) /* f0af1cc: 3c047f1b */ lui $a0,%hi(var7f1acc1c) /* f0af1d0: 3c058007 */ lui $a1,%hi(var80070580) /* f0af1d4: 24a50580 */ addiu $a1,$a1,%lo(var80070580) -/* f0af1d8: 0c0036cc */ jal func0000db30 +/* f0af1d8: 0c0036cc */ jal mainOverrideVariable /* f0af1dc: 2484cc1c */ addiu $a0,$a0,%lo(var7f1acc1c) /* f0af1e0: 3c047f1b */ lui $a0,%hi(var7f1acc20) /* f0af1e4: 3c058007 */ lui $a1,%hi(var80070584) /* f0af1e8: 24a50584 */ addiu $a1,$a1,%lo(var80070584) -/* f0af1ec: 0c0036cc */ jal func0000db30 +/* f0af1ec: 0c0036cc */ jal mainOverrideVariable /* f0af1f0: 2484cc20 */ addiu $a0,$a0,%lo(var7f1acc20) /* f0af1f4: 8fae0200 */ lw $t6,0x200($sp) /* f0af1f8: 3c18ba00 */ lui $t8,0xba00 @@ -4827,11 +4827,11 @@ glabel var7f1acd8c // static u32 spb = 24; // static u32 spi = 6; // -// func0000db30("sp1", &sp1); -// func0000db30("sp2", &sp2); -// func0000db30("sp3", &sp3); -// func0000db30("spb", &spb); -// func0000db30("spi", &spi); +// mainOverrideVariable("sp1", &sp1); +// mainOverrideVariable("sp2", &sp2); +// mainOverrideVariable("sp3", &sp3); +// mainOverrideVariable("spb", &spb); +// mainOverrideVariable("spi", &spi); // // gDPSetCycleType(gdl++, G_CYC_1CYCLE); // gDPSetTextureFilter(gdl++, G_TF_BILERP); diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index ad4581715..6d2436799 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.c @@ -5251,7 +5251,7 @@ glabel var7f1ad6ac /* f0bdfac: 3c047f1b */ lui $a0,0x7f1b /* f0bdfb0: 2484e7d4 */ addiu $a0,$a0,-6188 /* f0bdfb4: 02002825 */ move $a1,$s0 -/* f0bdfb8: 0c003624 */ jal func0000db30 +/* f0bdfb8: 0c003624 */ jal mainOverrideVariable /* f0bdfbc: e7ae032c */ swc1 $f14,0x32c($sp) /* f0bdfc0: 8e0f0000 */ lw $t7,0x0($s0) /* f0bdfc4: 51e00008 */ beqzl $t7,.PF0f0bdfe8 @@ -7652,7 +7652,7 @@ glabel var7f1ad6ac /* f0bda40: 2610083c */ addiu $s0,$s0,%lo(var8007083c) /* f0bda44: 3c047f1b */ lui $a0,%hi(var7f1ad524) /* f0bda48: 2484d524 */ addiu $a0,$a0,%lo(var7f1ad524) -/* f0bda4c: 0c0036cc */ jal func0000db30 +/* f0bda4c: 0c0036cc */ jal mainOverrideVariable /* f0bda50: 02002825 */ or $a1,$s0,$zero /* f0bda54: 8e180000 */ lw $t8,0x0($s0) /* f0bda58: 53000008 */ beqzl $t8,.L0f0bda7c @@ -10053,7 +10053,7 @@ glabel var7f1ad6ac /* f0bb6a8: 26102efc */ addiu $s0,$s0,0x2efc /* f0bb6ac: 3c047f1a */ lui $a0,0x7f1a /* f0bb6b0: 24847874 */ addiu $a0,$a0,0x7874 -/* f0bb6b4: 0c00381c */ jal func0000db30 +/* f0bb6b4: 0c00381c */ jal mainOverrideVariable /* f0bb6b8: 02002825 */ or $a1,$s0,$zero /* f0bb6bc: 8e180000 */ lw $t8,0x0($s0) /* f0bb6c0: 53000008 */ beqzl $t8,.NB0f0bb6e4 @@ -12322,7 +12322,7 @@ glabel var7f1ad6ac // } // // // da3c -// func0000db30("tps", &var8007083c); // var7f1ad524 +// mainOverrideVariable("tps", &var8007083c); // var7f1ad524 // // if (var8007083c != TELEPORTSTATE_INACTIVE) { // var8007083c = TELEPORTSTATE_INACTIVE; diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index 70f973b0f..9c90de77b 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -62,7 +62,7 @@ glabel menuCreateBlur /* f0e0e48: 24a51460 */ addiu $a1,$a1,0x1460 /* f0e0e4c: 2484f1f0 */ addiu $a0,$a0,-3600 /* f0e0e50: afad0070 */ sw $t5,0x70($sp) -/* f0e0e54: 0c003624 */ jal func0000db30 +/* f0e0e54: 0c003624 */ jal mainOverrideVariable /* f0e0e58: e7a0006c */ swc1 $f0,0x6c($sp) /* f0e0e5c: 8fad0070 */ lw $t5,0x70($sp) /* f0e0e60: 3c15800a */ lui $s5,0x800a @@ -233,7 +233,7 @@ glabel menuCreateBlur /* f0e0800: 3c058007 */ lui $a1,%hi(var80071180) /* f0e0804: afbf0070 */ sw $ra,0x70($sp) /* f0e0808: 24a51180 */ addiu $a1,$a1,%lo(var80071180) -/* f0e080c: 0c0036cc */ jal func0000db30 +/* f0e080c: 0c0036cc */ jal mainOverrideVariable /* f0e0810: 2484df00 */ addiu $a0,$a0,%lo(var7f1adf00) /* f0e0814: 8fbf0070 */ lw $ra,0x70($sp) /* f0e0818: 3c17800a */ lui $s7,%hi(g_BlurBuffer) @@ -385,7 +385,7 @@ u32 var80071180 = 1; // fb = viGetFrontBuffer(); // } // -// func0000db30("cccc", &var80071180); +// mainOverrideVariable("cccc", &var80071180); // // for (dsty = 0; dsty < 30; dsty++) { // for (dstx = 0; dstx < 40; dstx++) { @@ -439,7 +439,7 @@ u32 var80071180 = 1; // fb = viGetFrontBuffer(); // } // -// func0000db30("cccc", &var80071180); +// mainOverrideVariable("cccc", &var80071180); // // for (dsty = 0; dsty < BLURIMG_HEIGHT; dsty++) { // for (dstx = 0; dstx < BLURIMG_WIDTH; dstx++) { diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index f980e3ff0..f237836d7 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -6219,12 +6219,12 @@ glabel var7f1b3c40pf /* f0f4efc: 248438e0 */ addiu $a0,$a0,0x38e0 /* f0f4f00: 46805120 */ cvt.s.w $f4,$f10 /* f0f4f04: 46122403 */ div.s $f16,$f4,$f18 -/* f0f4f08: 0c003624 */ jal func0000db30 +/* f0f4f08: 0c003624 */ jal mainOverrideVariable /* f0f4f0c: e7b0017c */ swc1 $f16,0x17c($sp) /* f0f4f10: 3c047f1b */ lui $a0,0x7f1b /* f0f4f14: 3c058007 */ lui $a1,0x8007 /* f0f4f18: 24a517a4 */ addiu $a1,$a1,0x17a4 -/* f0f4f1c: 0c003624 */ jal func0000db30 +/* f0f4f1c: 0c003624 */ jal mainOverrideVariable /* f0f4f20: 248438e4 */ addiu $a0,$a0,0x38e4 /* f0f4f24: 0fc353da */ jal func0f0d49c8 /* f0f4f28: 8fa40440 */ lw $a0,0x440($sp) @@ -7832,12 +7832,12 @@ glabel var7f1b2948 /* f0f47cc: 248425f0 */ addiu $a0,$a0,%lo(var7f1b25f0) /* f0f47d0: 468041a0 */ cvt.s.w $f6,$f8 /* f0f47d4: 460a3203 */ div.s $f8,$f6,$f10 -/* f0f47d8: 0c0036cc */ jal func0000db30 +/* f0f47d8: 0c0036cc */ jal mainOverrideVariable /* f0f47dc: e7a8017c */ swc1 $f8,0x17c($sp) /* f0f47e0: 3c047f1b */ lui $a0,%hi(var7f1b25f4) /* f0f47e4: 3c058007 */ lui $a1,%hi(var800714c4) /* f0f47e8: 24a514c4 */ addiu $a1,$a1,%lo(var800714c4) -/* f0f47ec: 0c0036cc */ jal func0000db30 +/* f0f47ec: 0c0036cc */ jal mainOverrideVariable /* f0f47f0: 248425f4 */ addiu $a0,$a0,%lo(var7f1b25f4) /* f0f47f4: 0fc35272 */ jal func0f0d49c8 /* f0f47f8: 8fa40440 */ lw $a0,0x440($sp) @@ -9466,12 +9466,12 @@ glabel var7f1b2948 /* f0f1370: 2484c91c */ addiu $a0,$a0,-14052 /* f0f1374: 468041a0 */ cvt.s.w $f6,$f8 /* f0f1378: 460a3203 */ div.s $f8,$f6,$f10 -/* f0f137c: 0c00381c */ jal func0000db30 +/* f0f137c: 0c00381c */ jal mainOverrideVariable /* f0f1380: e7a80180 */ swc1 $f8,0x180($sp) /* f0f1384: 3c047f1b */ lui $a0,0x7f1b /* f0f1388: 3c058007 */ lui $a1,0x8007 /* f0f138c: 24a53b78 */ addiu $a1,$a1,0x3b78 -/* f0f1390: 0c00381c */ jal func0000db30 +/* f0f1390: 0c00381c */ jal mainOverrideVariable /* f0f1394: 2484c920 */ addiu $a0,$a0,-14048 /* f0f1398: 0fc34852 */ jal func0f0d49c8 /* f0f139c: 8fa40468 */ lw $a0,0x468($sp) @@ -16622,7 +16622,7 @@ glabel func0f0f8634 /* f0f864c: afa60020 */ sw $a2,0x20($sp) /* f0f8650: afa70024 */ sw $a3,0x24($sp) /* f0f8654: 248426f8 */ addiu $a0,$a0,%lo(var7f1b26f8) -/* f0f8658: 0c0036cc */ jal func0000db30 +/* f0f8658: 0c0036cc */ jal mainOverrideVariable /* f0f865c: 24a514dc */ addiu $a1,$a1,%lo(var800714dc) /* f0f8660: 8fa2001c */ lw $v0,0x1c($sp) /* f0f8664: 3c068007 */ lui $a2,%hi(var800714dc) @@ -24211,7 +24211,7 @@ glabel var7f1b2aec /* f0fb97c: 3c058007 */ lui $a1,%hi(var800714ec) /* f0fb980: 24a514ec */ addiu $a1,$a1,%lo(var800714ec) /* f0fb984: 24842778 */ addiu $a0,$a0,%lo(var7f1b2778) -/* f0fb988: 0c0036cc */ jal func0000db30 +/* f0fb988: 0c0036cc */ jal mainOverrideVariable /* f0fb98c: e7ac0088 */ swc1 $f12,0x88($sp) /* f0fb990: 3c0e800a */ lui $t6,%hi(g_MenuData+0x16) /* f0fb994: 91ce19d6 */ lbu $t6,%lo(g_MenuData+0x16)($t6) @@ -24360,7 +24360,7 @@ u32 var800714f0 = 1; Gfx *func0f0fbba0(Gfx *gdl, u8 param_2, s32 arg2) { if (param_2 == 4 || param_2 == 9) { - func0000db30("cone", &var800714f0); + mainOverrideVariable("cone", &var800714f0); if (var800714f0 && (g_MenuData.unk015 == 4 || g_MenuData.unk015 == 0 || g_MenuData.unk015 == 255)) { gdl = func0f0e4190(gdl); @@ -24628,7 +24628,7 @@ glabel var7f1b2afc /* f0fc72c: aee0059c */ sw $zero,0x59c($s7) /* f0fc730: a2e005d4 */ sb $zero,0x5d4($s7) .PF0f0fc734: -/* f0fc734: 0c003624 */ jal func0000db30 +/* f0fc734: 0c003624 */ jal mainOverrideVariable /* f0fc738: 24a517d4 */ addiu $a1,$a1,0x17d4 /* f0fc73c: 3c0f8007 */ lui $t7,0x8007 /* f0fc740: 8def17d4 */ lw $t7,0x17d4($t7) @@ -25617,7 +25617,7 @@ glabel var7f1b2afc /* f0fbfc0: aee0059c */ sw $zero,0x59c($s7) /* f0fbfc4: a2e005d4 */ sb $zero,0x5d4($s7) .L0f0fbfc8: -/* f0fbfc8: 0c0036cc */ jal func0000db30 +/* f0fbfc8: 0c0036cc */ jal mainOverrideVariable /* f0fbfcc: 24a514f4 */ addiu $a1,$a1,%lo(var800714f4) /* f0fbfd0: 3c188007 */ lui $t8,%hi(var800714f4) /* f0fbfd4: 8f1814f4 */ lw $t8,%lo(var800714f4)($t8) @@ -26603,7 +26603,7 @@ glabel var7f1b2afc /* f0f8710: aee0059c */ sw $zero,0x59c($s7) /* f0f8714: a2e005d4 */ sb $zero,0x5d4($s7) .NB0f0f8718: -/* f0f8718: 0c00381c */ jal func0000db30 +/* f0f8718: 0c00381c */ jal mainOverrideVariable /* f0f871c: 24a53ba0 */ addiu $a1,$a1,0x3ba0 /* f0f8720: 3c0c8007 */ lui $t4,0x8007 /* f0f8724: 8d8c3ba0 */ lw $t4,0x3ba0($t4) diff --git a/src/game/game_13b670.c b/src/game/game_13b670.c index 9c74d526e..dfb8d72ce 100644 --- a/src/game/game_13b670.c +++ b/src/game/game_13b670.c @@ -233,12 +233,12 @@ glabel var7f1b5970 /* f13b8e8: f7b60018 */ sdc1 $f22,0x18($sp) /* f13b8ec: f7b40010 */ sdc1 $f20,0x10($sp) /* f13b8f0: 24a5f700 */ addiu $a1,$a1,%lo(var8007f700) -/* f13b8f4: 0c0036cc */ jal func0000db30 +/* f13b8f4: 0c0036cc */ jal mainOverrideVariable /* f13b8f8: 24845960 */ addiu $a0,$a0,%lo(var7f1b5960) /* f13b8fc: 3c047f1b */ lui $a0,%hi(var7f1b5968) /* f13b900: 3c058008 */ lui $a1,%hi(var8007f6fc) /* f13b904: 24a5f6fc */ addiu $a1,$a1,%lo(var8007f6fc) -/* f13b908: 0c0036cc */ jal func0000db30 +/* f13b908: 0c0036cc */ jal mainOverrideVariable /* f13b90c: 24845968 */ addiu $a0,$a0,%lo(var7f1b5968) /* f13b910: 924e0001 */ lbu $t6,0x1($s2) /* f13b914: 00009825 */ or $s3,$zero,$zero diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index 3dfdff03d..28ab2926c 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -1421,7 +1421,7 @@ glabel func0f1543ac /* f154abc: afa20024 */ sw $v0,0x24($sp) /* f154ac0: 248473b0 */ addiu $a0,$a0,%lo(var7f1b73b0) /* f154ac4: e7ac0084 */ swc1 $f12,0x84($sp) -/* f154ac8: 0c0036cc */ jal func0000db30 +/* f154ac8: 0c0036cc */ jal mainOverrideVariable /* f154acc: e7ae00a4 */ swc1 $f14,0xa4($sp) /* f154ad0: 3c09800a */ lui $t1,%hi(var800a45d0) /* f154ad4: 252945d0 */ addiu $t1,$t1,%lo(var800a45d0) @@ -4530,7 +4530,7 @@ glabel textRenderProjected /* f1572e8: 01415824 */ and $t3,$t2,$at /* f1572ec: 01696025 */ or $t4,$t3,$t1 /* f1572f0: 44d9f800 */ ctc1 $t9,$31 -/* f1572f4: 0c003624 */ jal func0000db30 +/* f1572f4: 0c003624 */ jal mainOverrideVariable /* f1572f8: afac0094 */ sw $t4,0x94($sp) /* f1572fc: 3c028008 */ lui $v0,0x8008 /* f157300: 8c420130 */ lw $v0,0x130($v0) @@ -4563,37 +4563,37 @@ glabel textRenderProjected /* f157364: 3c058008 */ lui $a1,0x8008 /* f157368: 8fb400d0 */ lw $s4,0xd0($sp) /* f15736c: 24a5010c */ addiu $a1,$a1,0x10c -/* f157370: 0c003624 */ jal func0000db30 +/* f157370: 0c003624 */ jal mainOverrideVariable /* f157374: 248486f0 */ addiu $a0,$a0,-30992 /* f157378: 3c047f1c */ lui $a0,0x7f1c /* f15737c: 3c058008 */ lui $a1,0x8008 /* f157380: 24a50118 */ addiu $a1,$a1,0x118 -/* f157384: 0c003624 */ jal func0000db30 +/* f157384: 0c003624 */ jal mainOverrideVariable /* f157388: 248486f8 */ addiu $a0,$a0,-30984 /* f15738c: 3c047f1c */ lui $a0,0x7f1c /* f157390: 3c058008 */ lui $a1,0x8008 /* f157394: 24a5011c */ addiu $a1,$a1,0x11c -/* f157398: 0c003624 */ jal func0000db30 +/* f157398: 0c003624 */ jal mainOverrideVariable /* f15739c: 24848704 */ addiu $a0,$a0,-30972 /* f1573a0: 3c047f1c */ lui $a0,0x7f1c /* f1573a4: 3c058008 */ lui $a1,0x8008 /* f1573a8: 24a50124 */ addiu $a1,$a1,0x124 -/* f1573ac: 0c003624 */ jal func0000db30 +/* f1573ac: 0c003624 */ jal mainOverrideVariable /* f1573b0: 24848710 */ addiu $a0,$a0,-30960 /* f1573b4: 3c047f1c */ lui $a0,0x7f1c /* f1573b8: 3c058008 */ lui $a1,0x8008 /* f1573bc: 24a50120 */ addiu $a1,$a1,0x120 -/* f1573c0: 0c003624 */ jal func0000db30 +/* f1573c0: 0c003624 */ jal mainOverrideVariable /* f1573c4: 24848718 */ addiu $a0,$a0,-30952 /* f1573c8: 3c047f1c */ lui $a0,0x7f1c /* f1573cc: 3c058008 */ lui $a1,0x8008 /* f1573d0: 24a50110 */ addiu $a1,$a1,0x110 -/* f1573d4: 0c003624 */ jal func0000db30 +/* f1573d4: 0c003624 */ jal mainOverrideVariable /* f1573d8: 24848720 */ addiu $a0,$a0,-30944 /* f1573dc: 3c047f1c */ lui $a0,0x7f1c /* f1573e0: 3c058008 */ lui $a1,0x8008 /* f1573e4: 24a50114 */ addiu $a1,$a1,0x114 -/* f1573e8: 0c003624 */ jal func0000db30 +/* f1573e8: 0c003624 */ jal mainOverrideVariable /* f1573ec: 24848728 */ addiu $a0,$a0,-30936 /* f1573f0: 8e0b0000 */ lw $t3,0x0($s0) /* f1573f4: 8e320000 */ lw $s2,0x0($s1) @@ -4931,7 +4931,7 @@ glabel textRenderProjected /* f1561f0: 2401ff00 */ addiu $at,$zero,-256 /* f1561f4: 01415824 */ and $t3,$t2,$at /* f1561f8: 44c8f800 */ ctc1 $t0,$31 -/* f1561fc: 0c0036cc */ jal func0000db30 +/* f1561fc: 0c0036cc */ jal mainOverrideVariable /* f156200: 01699025 */ or $s2,$t3,$t1 /* f156204: 3c028008 */ lui $v0,%hi(var8007fbe8) /* f156208: 8c42fbe8 */ lw $v0,%lo(var8007fbe8)($v0) @@ -4962,37 +4962,37 @@ glabel textRenderProjected /* f156264: 3c047f1b */ lui $a0,%hi(var7f1b73c0) /* f156268: 3c058008 */ lui $a1,%hi(var8007fbac) /* f15626c: 24a5fbac */ addiu $a1,$a1,%lo(var8007fbac) -/* f156270: 0c0036cc */ jal func0000db30 +/* f156270: 0c0036cc */ jal mainOverrideVariable /* f156274: 248473c0 */ addiu $a0,$a0,%lo(var7f1b73c0) /* f156278: 3c047f1b */ lui $a0,%hi(var7f1b73c8) /* f15627c: 3c058008 */ lui $a1,%hi(var8007fbb8) /* f156280: 24a5fbb8 */ addiu $a1,$a1,%lo(var8007fbb8) -/* f156284: 0c0036cc */ jal func0000db30 +/* f156284: 0c0036cc */ jal mainOverrideVariable /* f156288: 248473c8 */ addiu $a0,$a0,%lo(var7f1b73c8) /* f15628c: 3c047f1b */ lui $a0,%hi(var7f1b73d4) /* f156290: 3c058008 */ lui $a1,%hi(var8007fbbc) /* f156294: 24a5fbbc */ addiu $a1,$a1,%lo(var8007fbbc) -/* f156298: 0c0036cc */ jal func0000db30 +/* f156298: 0c0036cc */ jal mainOverrideVariable /* f15629c: 248473d4 */ addiu $a0,$a0,%lo(var7f1b73d4) /* f1562a0: 3c047f1b */ lui $a0,%hi(var7f1b73e0) /* f1562a4: 3c058008 */ lui $a1,%hi(var8007fbc4) /* f1562a8: 24a5fbc4 */ addiu $a1,$a1,%lo(var8007fbc4) -/* f1562ac: 0c0036cc */ jal func0000db30 +/* f1562ac: 0c0036cc */ jal mainOverrideVariable /* f1562b0: 248473e0 */ addiu $a0,$a0,%lo(var7f1b73e0) /* f1562b4: 3c047f1b */ lui $a0,%hi(var7f1b73e8) /* f1562b8: 3c058008 */ lui $a1,%hi(var8007fbc0) /* f1562bc: 24a5fbc0 */ addiu $a1,$a1,%lo(var8007fbc0) -/* f1562c0: 0c0036cc */ jal func0000db30 +/* f1562c0: 0c0036cc */ jal mainOverrideVariable /* f1562c4: 248473e8 */ addiu $a0,$a0,%lo(var7f1b73e8) /* f1562c8: 3c047f1b */ lui $a0,%hi(var7f1b73f0) /* f1562cc: 3c058008 */ lui $a1,%hi(var8007fbb0) /* f1562d0: 24a5fbb0 */ addiu $a1,$a1,%lo(var8007fbb0) -/* f1562d4: 0c0036cc */ jal func0000db30 +/* f1562d4: 0c0036cc */ jal mainOverrideVariable /* f1562d8: 248473f0 */ addiu $a0,$a0,%lo(var7f1b73f0) /* f1562dc: 3c047f1b */ lui $a0,%hi(var7f1b73f8) /* f1562e0: 3c058008 */ lui $a1,%hi(var8007fbb4) /* f1562e4: 24a5fbb4 */ addiu $a1,$a1,%lo(var8007fbb4) -/* f1562e8: 0c0036cc */ jal func0000db30 +/* f1562e8: 0c0036cc */ jal mainOverrideVariable /* f1562ec: 248473f8 */ addiu $a0,$a0,%lo(var7f1b73f8) /* f1562f0: 8fa800e8 */ lw $t0,0xe8($sp) /* f1562f4: 8e910000 */ lw $s1,0x0($s4) diff --git a/src/game/healthbar.c b/src/game/healthbar.c index 873599dab..63f3dfa45 100644 --- a/src/game/healthbar.c +++ b/src/game/healthbar.c @@ -357,107 +357,107 @@ glabel healthbarRender /* f0d5e00: afb5009c */ sw $s5,0x9c($sp) /* f0d5e04: afb300a0 */ sw $s3,0xa0($sp) /* f0d5e08: 24a50f20 */ addiu $a1,$a1,%lo(var80070f20) -/* f0d5e0c: 0c0036cc */ jal func0000db30 +/* f0d5e0c: 0c0036cc */ jal mainOverrideVariable /* f0d5e10: 2484dbf0 */ addiu $a0,$a0,%lo(var7f1adbf0) /* f0d5e14: 3c047f1b */ lui $a0,%hi(var7f1adbf8) /* f0d5e18: 3c058007 */ lui $a1,%hi(var80070f24) /* f0d5e1c: 24a50f24 */ addiu $a1,$a1,%lo(var80070f24) -/* f0d5e20: 0c0036cc */ jal func0000db30 +/* f0d5e20: 0c0036cc */ jal mainOverrideVariable /* f0d5e24: 2484dbf8 */ addiu $a0,$a0,%lo(var7f1adbf8) /* f0d5e28: 3c047f1b */ lui $a0,%hi(var7f1adc00) /* f0d5e2c: 3c058007 */ lui $a1,%hi(var80070f28) /* f0d5e30: 24a50f28 */ addiu $a1,$a1,%lo(var80070f28) -/* f0d5e34: 0c0036cc */ jal func0000db30 +/* f0d5e34: 0c0036cc */ jal mainOverrideVariable /* f0d5e38: 2484dc00 */ addiu $a0,$a0,%lo(var7f1adc00) /* f0d5e3c: 3c047f1b */ lui $a0,%hi(var7f1adc08) /* f0d5e40: 3c058007 */ lui $a1,%hi(var80070f2c) /* f0d5e44: 24a50f2c */ addiu $a1,$a1,%lo(var80070f2c) -/* f0d5e48: 0c0036cc */ jal func0000db30 +/* f0d5e48: 0c0036cc */ jal mainOverrideVariable /* f0d5e4c: 2484dc08 */ addiu $a0,$a0,%lo(var7f1adc08) /* f0d5e50: 3c047f1b */ lui $a0,%hi(var7f1adc10) /* f0d5e54: 3c058007 */ lui $a1,%hi(var80070f30) /* f0d5e58: 24a50f30 */ addiu $a1,$a1,%lo(var80070f30) -/* f0d5e5c: 0c0036cc */ jal func0000db30 +/* f0d5e5c: 0c0036cc */ jal mainOverrideVariable /* f0d5e60: 2484dc10 */ addiu $a0,$a0,%lo(var7f1adc10) /* f0d5e64: 3c047f1b */ lui $a0,%hi(var7f1adc18) /* f0d5e68: 3c058007 */ lui $a1,%hi(var80070f34) /* f0d5e6c: 24a50f34 */ addiu $a1,$a1,%lo(var80070f34) -/* f0d5e70: 0c0036cc */ jal func0000db30 +/* f0d5e70: 0c0036cc */ jal mainOverrideVariable /* f0d5e74: 2484dc18 */ addiu $a0,$a0,%lo(var7f1adc18) /* f0d5e78: 3c047f1b */ lui $a0,%hi(var7f1adc20) /* f0d5e7c: 3c058007 */ lui $a1,%hi(var80070f48) /* f0d5e80: 24a50f48 */ addiu $a1,$a1,%lo(var80070f48) -/* f0d5e84: 0c0036cc */ jal func0000db30 +/* f0d5e84: 0c0036cc */ jal mainOverrideVariable /* f0d5e88: 2484dc20 */ addiu $a0,$a0,%lo(var7f1adc20) /* f0d5e8c: 3c047f1b */ lui $a0,%hi(var7f1adc28) /* f0d5e90: 3c058007 */ lui $a1,%hi(var80070f4c) /* f0d5e94: 24a50f4c */ addiu $a1,$a1,%lo(var80070f4c) -/* f0d5e98: 0c0036cc */ jal func0000db30 +/* f0d5e98: 0c0036cc */ jal mainOverrideVariable /* f0d5e9c: 2484dc28 */ addiu $a0,$a0,%lo(var7f1adc28) /* f0d5ea0: 3c047f1b */ lui $a0,%hi(var7f1adc30) /* f0d5ea4: 3c058007 */ lui $a1,%hi(var80070f38) /* f0d5ea8: 24a50f38 */ addiu $a1,$a1,%lo(var80070f38) -/* f0d5eac: 0c0036cc */ jal func0000db30 +/* f0d5eac: 0c0036cc */ jal mainOverrideVariable /* f0d5eb0: 2484dc30 */ addiu $a0,$a0,%lo(var7f1adc30) /* f0d5eb4: 3c047f1b */ lui $a0,%hi(var7f1adc3c) /* f0d5eb8: 3c058007 */ lui $a1,%hi(var80070f3c) /* f0d5ebc: 24a50f3c */ addiu $a1,$a1,%lo(var80070f3c) -/* f0d5ec0: 0c0036cc */ jal func0000db30 +/* f0d5ec0: 0c0036cc */ jal mainOverrideVariable /* f0d5ec4: 2484dc3c */ addiu $a0,$a0,%lo(var7f1adc3c) /* f0d5ec8: 3c047f1b */ lui $a0,%hi(var7f1adc48) /* f0d5ecc: 3c058007 */ lui $a1,%hi(var80070f40) /* f0d5ed0: 24a50f40 */ addiu $a1,$a1,%lo(var80070f40) -/* f0d5ed4: 0c0036cc */ jal func0000db30 +/* f0d5ed4: 0c0036cc */ jal mainOverrideVariable /* f0d5ed8: 2484dc48 */ addiu $a0,$a0,%lo(var7f1adc48) /* f0d5edc: 3c047f1b */ lui $a0,%hi(var7f1adc54) /* f0d5ee0: 3c058007 */ lui $a1,%hi(var80070f44) /* f0d5ee4: 24a50f44 */ addiu $a1,$a1,%lo(var80070f44) -/* f0d5ee8: 0c0036cc */ jal func0000db30 +/* f0d5ee8: 0c0036cc */ jal mainOverrideVariable /* f0d5eec: 2484dc54 */ addiu $a0,$a0,%lo(var7f1adc54) /* f0d5ef0: 3c047f1b */ lui $a0,%hi(var7f1adc5c) /* f0d5ef4: 3c058007 */ lui $a1,%hi(var80070f50) /* f0d5ef8: 24a50f50 */ addiu $a1,$a1,%lo(var80070f50) -/* f0d5efc: 0c0036cc */ jal func0000db30 +/* f0d5efc: 0c0036cc */ jal mainOverrideVariable /* f0d5f00: 2484dc5c */ addiu $a0,$a0,%lo(var7f1adc5c) /* f0d5f04: 3c047f1b */ lui $a0,%hi(var7f1adc68) /* f0d5f08: 3c058007 */ lui $a1,%hi(var80070f54) /* f0d5f0c: 24a50f54 */ addiu $a1,$a1,%lo(var80070f54) -/* f0d5f10: 0c0036cc */ jal func0000db30 +/* f0d5f10: 0c0036cc */ jal mainOverrideVariable /* f0d5f14: 2484dc68 */ addiu $a0,$a0,%lo(var7f1adc68) /* f0d5f18: 3c047f1b */ lui $a0,%hi(var7f1adc74) /* f0d5f1c: 3c058007 */ lui $a1,%hi(var80070f58) /* f0d5f20: 24a50f58 */ addiu $a1,$a1,%lo(var80070f58) -/* f0d5f24: 0c0036cc */ jal func0000db30 +/* f0d5f24: 0c0036cc */ jal mainOverrideVariable /* f0d5f28: 2484dc74 */ addiu $a0,$a0,%lo(var7f1adc74) /* f0d5f2c: 3c047f1b */ lui $a0,%hi(var7f1adc80) /* f0d5f30: 3c058007 */ lui $a1,%hi(var80070f5c) /* f0d5f34: 24a50f5c */ addiu $a1,$a1,%lo(var80070f5c) -/* f0d5f38: 0c0036cc */ jal func0000db30 +/* f0d5f38: 0c0036cc */ jal mainOverrideVariable /* f0d5f3c: 2484dc80 */ addiu $a0,$a0,%lo(var7f1adc80) /* f0d5f40: 3c047f1b */ lui $a0,%hi(var7f1adc8c) /* f0d5f44: 3c058007 */ lui $a1,%hi(var80070f60) /* f0d5f48: 24a50f60 */ addiu $a1,$a1,%lo(var80070f60) -/* f0d5f4c: 0c0036cc */ jal func0000db30 +/* f0d5f4c: 0c0036cc */ jal mainOverrideVariable /* f0d5f50: 2484dc8c */ addiu $a0,$a0,%lo(var7f1adc8c) /* f0d5f54: 3c047f1b */ lui $a0,%hi(var7f1adc98) /* f0d5f58: 3c058007 */ lui $a1,%hi(var80070f64) /* f0d5f5c: 24a50f64 */ addiu $a1,$a1,%lo(var80070f64) -/* f0d5f60: 0c0036cc */ jal func0000db30 +/* f0d5f60: 0c0036cc */ jal mainOverrideVariable /* f0d5f64: 2484dc98 */ addiu $a0,$a0,%lo(var7f1adc98) /* f0d5f68: 3c047f1b */ lui $a0,%hi(var7f1adca4) /* f0d5f6c: 3c058007 */ lui $a1,%hi(var80070f68) /* f0d5f70: 24a50f68 */ addiu $a1,$a1,%lo(var80070f68) -/* f0d5f74: 0c0036cc */ jal func0000db30 +/* f0d5f74: 0c0036cc */ jal mainOverrideVariable /* f0d5f78: 2484dca4 */ addiu $a0,$a0,%lo(var7f1adca4) /* f0d5f7c: 3c047f1b */ lui $a0,%hi(var7f1adcb0) /* f0d5f80: 3c058007 */ lui $a1,%hi(var80070f6c) /* f0d5f84: 24a50f6c */ addiu $a1,$a1,%lo(var80070f6c) -/* f0d5f88: 0c0036cc */ jal func0000db30 +/* f0d5f88: 0c0036cc */ jal mainOverrideVariable /* f0d5f8c: 2484dcb0 */ addiu $a0,$a0,%lo(var7f1adcb0) /* f0d5f90: 3c047f1b */ lui $a0,%hi(var7f1adcbc) /* f0d5f94: 3c058007 */ lui $a1,%hi(var80070f70) /* f0d5f98: 24a50f70 */ addiu $a1,$a1,%lo(var80070f70) -/* f0d5f9c: 0c0036cc */ jal func0000db30 +/* f0d5f9c: 0c0036cc */ jal mainOverrideVariable /* f0d5fa0: 2484dcbc */ addiu $a0,$a0,%lo(var7f1adcbc) /* f0d5fa4: 12000008 */ beqz $s0,.L0f0d5fc8 /* f0d5fa8: 00000000 */ nop diff --git a/src/game/menu/items.c b/src/game/menu/items.c index e4dd9db50..f7b5d74bb 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -4662,7 +4662,7 @@ glabel menuRenderObjective /* f0e98dc: 3c058007 */ lui $a1,%hi(var800711e8) /* f0e98e0: 24a511e8 */ addiu $a1,$a1,%lo(var800711e8) /* f0e98e4: 2484dfa0 */ addiu $a0,$a0,%lo(var7f1adfa0) -/* f0e98e8: 0c0036cc */ jal func0000db30 +/* f0e98e8: 0c0036cc */ jal mainOverrideVariable /* f0e98ec: afa200bc */ sw $v0,0xbc($sp) /* f0e98f0: 8faf0138 */ lw $t7,0x138($sp) /* f0e98f4: 3c04800a */ lui $a0,%hi(g_Briefing+0x2) @@ -5315,7 +5315,7 @@ glabel menuRenderObjective /* f0e98dc: 3c058007 */ lui $a1,%hi(var800711e8) /* f0e98e0: 24a511e8 */ addiu $a1,$a1,%lo(var800711e8) /* f0e98e4: 2484dfa0 */ addiu $a0,$a0,%lo(var7f1adfa0) -/* f0e98e8: 0c0036cc */ jal func0000db30 +/* f0e98e8: 0c0036cc */ jal mainOverrideVariable /* f0e98ec: afa200bc */ sw $v0,0xbc($sp) /* f0e98f0: 8faf0138 */ lw $t7,0x138($sp) /* f0e98f4: 3c04800a */ lui $a0,%hi(g_Briefing+0x2) diff --git a/src/game/pak/pak.c b/src/game/pak/pak.c index 281bdcf54..3e69e2132 100644 --- a/src/game/pak/pak.c +++ b/src/game/pak/pak.c @@ -6983,13 +6983,13 @@ void pakExecuteDebugOperations(void) s32 pass = false; s8 i; - func0000db30("forcescrub", &g_PakDebugForceScrub); - func0000db30("pakdump", &g_PakDebugPakDump); - func0000db30("pakcache", &g_PakDebugPakCache); - func0000db30("pakinit", &g_PakDebugPakInit); - func0000db30("corruptme", &g_PakDebugCorruptMe); - func0000db30("wipeeeprom", &g_PakDebugWipeEeprom); - func0000db30("dumpeeprom", &g_PakDebugDumpEeprom); + mainOverrideVariable("forcescrub", &g_PakDebugForceScrub); + mainOverrideVariable("pakdump", &g_PakDebugPakDump); + mainOverrideVariable("pakcache", &g_PakDebugPakCache); + mainOverrideVariable("pakinit", &g_PakDebugPakInit); + mainOverrideVariable("corruptme", &g_PakDebugCorruptMe); + mainOverrideVariable("wipeeeprom", &g_PakDebugWipeEeprom); + mainOverrideVariable("dumpeeprom", &g_PakDebugDumpEeprom); if (g_PakDebugCorruptMe) { g_PakDebugCorruptMe = false; @@ -7064,32 +7064,32 @@ glabel pakExecuteDebugOperations /* f116498: 3c047f1b */ lui $a0,0x7f1b /* f11649c: 3c058008 */ lui $a1,0x8008 /* f1164a0: 24a580a4 */ addiu $a1,$a1,-32604 -/* f1164a4: 0c00381c */ jal func0000db30 +/* f1164a4: 0c00381c */ jal mainOverrideVariable /* f1164a8: 2484e6c0 */ addiu $a0,$a0,-6464 /* f1164ac: 3c047f1b */ lui $a0,0x7f1b /* f1164b0: 3c058008 */ lui $a1,0x8008 /* f1164b4: 24a580a8 */ addiu $a1,$a1,-32600 -/* f1164b8: 0c00381c */ jal func0000db30 +/* f1164b8: 0c00381c */ jal mainOverrideVariable /* f1164bc: 2484e6cc */ addiu $a0,$a0,-6452 /* f1164c0: 3c047f1b */ lui $a0,0x7f1b /* f1164c4: 3c058008 */ lui $a1,0x8008 /* f1164c8: 24a580ac */ addiu $a1,$a1,-32596 -/* f1164cc: 0c00381c */ jal func0000db30 +/* f1164cc: 0c00381c */ jal mainOverrideVariable /* f1164d0: 2484e6d8 */ addiu $a0,$a0,-6440 /* f1164d4: 3c047f1b */ lui $a0,0x7f1b /* f1164d8: 3c058008 */ lui $a1,0x8008 /* f1164dc: 24a580b0 */ addiu $a1,$a1,-32592 -/* f1164e0: 0c00381c */ jal func0000db30 +/* f1164e0: 0c00381c */ jal mainOverrideVariable /* f1164e4: 2484e6e0 */ addiu $a0,$a0,-6432 /* f1164e8: 3c047f1b */ lui $a0,0x7f1b /* f1164ec: 3c058008 */ lui $a1,0x8008 /* f1164f0: 24a580b4 */ addiu $a1,$a1,-32588 -/* f1164f4: 0c00381c */ jal func0000db30 +/* f1164f4: 0c00381c */ jal mainOverrideVariable /* f1164f8: 2484e6ec */ addiu $a0,$a0,-6420 /* f1164fc: 3c047f1b */ lui $a0,0x7f1b /* f116500: 3c058008 */ lui $a1,0x8008 /* f116504: 24a58110 */ addiu $a1,$a1,-32496 -/* f116508: 0c00381c */ jal func0000db30 +/* f116508: 0c00381c */ jal mainOverrideVariable /* f11650c: 2484e6f4 */ addiu $a0,$a0,-6412 /* f116510: 3c0e8008 */ lui $t6,0x8008 /* f116514: 8dce8110 */ lw $t6,-0x7ef0($t6) diff --git a/src/game/propobj.c b/src/game/propobj.c index 0d483a659..1201b4e6a 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -3047,7 +3047,7 @@ glabel func0f068c04 /* f068c60: 0000a825 */ or $s5,$zero,$zero /* f068c64: 24a59974 */ addiu $a1,$a1,%lo(var80069974) /* f068c68: 24849f60 */ addiu $a0,$a0,%lo(var7f1a9f60) -/* f068c6c: 0c0036cc */ jal func0000db30 +/* f068c6c: 0c0036cc */ jal mainOverrideVariable /* f068c70: afaf012c */ sw $t7,0x12c($sp) /* f068c74: 8fa3012c */ lw $v1,0x12c($sp) /* f068c78: 10600092 */ beqz $v1,.L0f068ec4 @@ -3416,12 +3416,12 @@ glabel var7f1aa1d8 /* f06915c: 3c058007 */ lui $a1,%hi(var80069978) /* f069160: afa60078 */ sw $a2,0x78($sp) /* f069164: 24a59978 */ addiu $a1,$a1,%lo(var80069978) -/* f069168: 0c0036cc */ jal func0000db30 +/* f069168: 0c0036cc */ jal mainOverrideVariable /* f06916c: 24849f6c */ addiu $a0,$a0,%lo(var7f1a9f6c) /* f069170: 3c047f1b */ lui $a0,%hi(var7f1a9f74) /* f069174: 3c058007 */ lui $a1,%hi(var8006997c) /* f069178: 24a5997c */ addiu $a1,$a1,%lo(var8006997c) -/* f06917c: 0c0036cc */ jal func0000db30 +/* f06917c: 0c0036cc */ jal mainOverrideVariable /* f069180: 24849f74 */ addiu $a0,$a0,%lo(var7f1a9f74) /* f069184: 8fae0070 */ lw $t6,0x70($sp) /* f069188: 24010001 */ addiu $at,$zero,0x1 @@ -3765,12 +3765,12 @@ glabel var7f1aa1d8 /* f0683dc: 3c058007 */ lui $a1,0x8007 /* f0683e0: afa60078 */ sw $a2,0x78($sp) /* f0683e4: 24a5c078 */ addiu $a1,$a1,-16264 -/* f0683e8: 0c00381c */ jal func0000db30 +/* f0683e8: 0c00381c */ jal mainOverrideVariable /* f0683ec: 2484428c */ addiu $a0,$a0,0x428c /* f0683f0: 3c047f1a */ lui $a0,0x7f1a /* f0683f4: 3c058007 */ lui $a1,0x8007 /* f0683f8: 24a5c07c */ addiu $a1,$a1,-16260 -/* f0683fc: 0c00381c */ jal func0000db30 +/* f0683fc: 0c00381c */ jal mainOverrideVariable /* f068400: 24844294 */ addiu $a0,$a0,0x4294 /* f068404: 8fae0070 */ lw $t6,0x70($sp) /* f068408: 24010001 */ addiu $at,$zero,0x1 @@ -22445,17 +22445,17 @@ glabel var7f1ab6dcpf /* f075254: 4500009c */ bc1f .PF0f0754c8 .PF0f075258: /* f075258: 24a598a4 */ addiu $a1,$a1,-26460 -/* f07525c: 0c003624 */ jal func0000db30 +/* f07525c: 0c003624 */ jal mainOverrideVariable /* f075260: e7ae029c */ swc1 $f14,0x29c($sp) /* f075264: 3c047f1b */ lui $a0,0x7f1b /* f075268: 3c058007 */ lui $a1,0x8007 /* f07526c: 24a598a8 */ addiu $a1,$a1,-26456 -/* f075270: 0c003624 */ jal func0000db30 +/* f075270: 0c003624 */ jal mainOverrideVariable /* f075274: 2484b264 */ addiu $a0,$a0,-19868 /* f075278: 3c047f1b */ lui $a0,0x7f1b /* f07527c: 3c058007 */ lui $a1,0x8007 /* f075280: 24a598ac */ addiu $a1,$a1,-26452 -/* f075284: 0c003624 */ jal func0000db30 +/* f075284: 0c003624 */ jal mainOverrideVariable /* f075288: 2484b268 */ addiu $a0,$a0,-19864 /* f07528c: 3c188007 */ lui $t8,0x8007 /* f075290: 8f1898a8 */ lw $t8,-0x6758($t8) @@ -25983,17 +25983,17 @@ glabel var7f1aa438 /* f074fd0: 4500009c */ bc1f .L0f075244 .L0f074fd4: /* f074fd4: 24a59bc8 */ addiu $a1,$a1,%lo(var80069bc8) -/* f074fd8: 0c0036cc */ jal func0000db30 +/* f074fd8: 0c0036cc */ jal mainOverrideVariable /* f074fdc: e7a2029c */ swc1 $f2,0x29c($sp) /* f074fe0: 3c047f1b */ lui $a0,%hi(var7f1a9fd4) /* f074fe4: 3c058007 */ lui $a1,%hi(var80069bcc) /* f074fe8: 24a59bcc */ addiu $a1,$a1,%lo(var80069bcc) -/* f074fec: 0c0036cc */ jal func0000db30 +/* f074fec: 0c0036cc */ jal mainOverrideVariable /* f074ff0: 24849fd4 */ addiu $a0,$a0,%lo(var7f1a9fd4) /* f074ff4: 3c047f1b */ lui $a0,%hi(var7f1a9fd8) /* f074ff8: 3c058007 */ lui $a1,%hi(var80069bd0) /* f074ffc: 24a59bd0 */ addiu $a1,$a1,%lo(var80069bd0) -/* f075000: 0c0036cc */ jal func0000db30 +/* f075000: 0c0036cc */ jal mainOverrideVariable /* f075004: 24849fd8 */ addiu $a0,$a0,%lo(var7f1a9fd8) /* f075008: 3c188007 */ lui $t8,%hi(var80069bcc) /* f07500c: 8f189bcc */ lw $t8,%lo(var80069bcc)($t8) @@ -29508,17 +29508,17 @@ glabel var7f1aa438 /* f073d4c: 4500009c */ bc1f .NB0f073fc0 .NB0f073d50: /* f073d50: 24a5c2c8 */ addiu $a1,$a1,-15672 -/* f073d54: 0c00381c */ jal func0000db30 +/* f073d54: 0c00381c */ jal mainOverrideVariable /* f073d58: e7a2029c */ swc1 $f2,0x29c($sp) /* f073d5c: 3c047f1a */ lui $a0,0x7f1a /* f073d60: 3c058007 */ lui $a1,0x8007 /* f073d64: 24a5c2cc */ addiu $a1,$a1,-15668 -/* f073d68: 0c00381c */ jal func0000db30 +/* f073d68: 0c00381c */ jal mainOverrideVariable /* f073d6c: 248442f4 */ addiu $a0,$a0,0x42f4 /* f073d70: 3c047f1a */ lui $a0,0x7f1a /* f073d74: 3c058007 */ lui $a1,0x8007 /* f073d78: 24a5c2d0 */ addiu $a1,$a1,-15664 -/* f073d7c: 0c00381c */ jal func0000db30 +/* f073d7c: 0c00381c */ jal mainOverrideVariable /* f073d80: 248442f8 */ addiu $a0,$a0,0x42f8 /* f073d84: 3c0f8007 */ lui $t7,0x8007 /* f073d88: 8defc2cc */ lw $t7,-0x3d34($t7) @@ -31579,7 +31579,7 @@ void doorTick(struct prop *doorprop) #if VERSION < VERSION_PAL_FINAL static u32 debugdoor = 0; - func0000db30("debugdoor", &debugdoor); + mainOverrideVariable("debugdoor", &debugdoor); // If debugdoor is set to 1 or to the address of this door, // print the distance to the door to console diff --git a/src/game/savebuffer.c b/src/game/savebuffer.c index 6691dc4b5..4ad301587 100644 --- a/src/game/savebuffer.c +++ b/src/game/savebuffer.c @@ -214,7 +214,7 @@ glabel func0f0d4d0c /* f0d4d4c: 2484dba0 */ addiu $a0,$a0,%lo(var7f1adba0) /* f0d4d50: afa20040 */ sw $v0,0x40($sp) /* f0d4d54: e7b20030 */ swc1 $f18,0x30($sp) -/* f0d4d58: 0c0036cc */ jal func0000db30 +/* f0d4d58: 0c0036cc */ jal mainOverrideVariable /* f0d4d5c: e7b20034 */ swc1 $f18,0x34($sp) /* f0d4d60: 3c02800a */ lui $v0,%hi(var8009de90) /* f0d4d64: 8fa90050 */ lw $t1,0x50($sp) @@ -295,7 +295,7 @@ glabel func0f0d4d0c /* f0d4e70: afac0048 */ sw $t4,0x48($sp) /* f0d4e74: afad0058 */ sw $t5,0x58($sp) /* f0d4e78: e7b00030 */ swc1 $f16,0x30($sp) -/* f0d4e7c: 0c0036cc */ jal func0000db30 +/* f0d4e7c: 0c0036cc */ jal mainOverrideVariable /* f0d4e80: e7b20034 */ swc1 $f18,0x34($sp) /* f0d4e84: 8fa70064 */ lw $a3,0x64($sp) /* f0d4e88: 3c014000 */ lui $at,0x4000 @@ -397,7 +397,7 @@ glabel func0f0d4d0c /* f0d4fdc: afac0048 */ sw $t4,0x48($sp) /* f0d4fe0: afad0058 */ sw $t5,0x58($sp) /* f0d4fe4: e7b20034 */ swc1 $f18,0x34($sp) -/* f0d4fe8: 0c0036cc */ jal func0000db30 +/* f0d4fe8: 0c0036cc */ jal mainOverrideVariable /* f0d4fec: e7b00030 */ swc1 $f16,0x30($sp) /* f0d4ff0: 3c058007 */ lui $a1,%hi(var80070f1c) /* f0d4ff4: 8ca50f1c */ lw $a1,%lo(var80070f1c)($a1) diff --git a/src/game/sight.c b/src/game/sight.c index 94e98905a..7fee4156d 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -2992,7 +2992,7 @@ glabel var7f1ade50 /* f0d90bc: 3c058007 */ lui $a1,%hi(var80070f94) /* f0d90c0: 24a50f94 */ addiu $a1,$a1,%lo(var80070f94) /* f0d90c4: 2484dda0 */ addiu $a0,$a0,%lo(var7f1adda0) -/* f0d90c8: 0c0036cc */ jal func0000db30 +/* f0d90c8: 0c0036cc */ jal mainOverrideVariable /* f0d90cc: afa30090 */ sw $v1,0x90($sp) /* f0d90d0: 3c028007 */ lui $v0,%hi(var80070f94) /* f0d90d4: 8c420f94 */ lw $v0,%lo(var80070f94)($v0) @@ -3454,7 +3454,7 @@ glabel var7f1ade50 /* f0d90bc: 3c058007 */ lui $a1,%hi(var80070f94) /* f0d90c0: 24a50f94 */ addiu $a1,$a1,%lo(var80070f94) /* f0d90c4: 2484dda0 */ addiu $a0,$a0,%lo(var7f1adda0) -/* f0d90c8: 0c0036cc */ jal func0000db30 +/* f0d90c8: 0c0036cc */ jal mainOverrideVariable /* f0d90cc: afa30090 */ sw $v1,0x90($sp) /* f0d90d0: 3c028007 */ lui $v0,%hi(var80070f94) /* f0d90d4: 8c420f94 */ lw $v0,%lo(var80070f94)($v0) @@ -3804,7 +3804,7 @@ glabel var7f1ade50 // } // // // 0b8 -// func0000db30("sight", &var80070f94); +// mainOverrideVariable("sight", &var80070f94); // // switch (var80070f94) { // case 0: @@ -8050,8 +8050,8 @@ Gfx *sightRenderTarget(Gfx *gdl) s32 x = (s32)g_Vars.currentplayer->crosspos[0] / g_ScaleX; s32 y = g_Vars.currentplayer->crosspos[1]; - func0000db30("sout", &var80070f9c); - func0000db30("sin", &var80070fa0); + mainOverrideVariable("sout", &var80070f9c); + mainOverrideVariable("sin", &var80070fa0); gdl = gfxSetPrimColour(gdl, 0x00ff0028); diff --git a/src/game/training/menus.c b/src/game/training/menus.c index acd559068..40494342d 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -1313,42 +1313,42 @@ glabel menuhandler001a44c0 /* f1a45c8: 0000c012 */ mflo $t8 /* f1a45cc: 00186202 */ srl $t4,$t8,0x8 /* f1a45d0: 032c4025 */ or $t0,$t9,$t4 -/* f1a45d4: 0c0036cc */ jal func0000db30 +/* f1a45d4: 0c0036cc */ jal mainOverrideVariable /* f1a45d8: afa800b0 */ sw $t0,0xb0($sp) /* f1a45dc: 3c047f1c */ lui $a0,%hi(var7f1b9860) /* f1a45e0: 3c058009 */ lui $a1,%hi(var80088c90) /* f1a45e4: 24a58c90 */ addiu $a1,$a1,%lo(var80088c90) -/* f1a45e8: 0c0036cc */ jal func0000db30 +/* f1a45e8: 0c0036cc */ jal mainOverrideVariable /* f1a45ec: 24849860 */ addiu $a0,$a0,%lo(var7f1b9860) /* f1a45f0: 3c047f1c */ lui $a0,%hi(var7f1b9864) /* f1a45f4: 3c058009 */ lui $a1,%hi(var80088c94) /* f1a45f8: 24a58c94 */ addiu $a1,$a1,%lo(var80088c94) -/* f1a45fc: 0c0036cc */ jal func0000db30 +/* f1a45fc: 0c0036cc */ jal mainOverrideVariable /* f1a4600: 24849864 */ addiu $a0,$a0,%lo(var7f1b9864) /* f1a4604: 3c047f1c */ lui $a0,%hi(var7f1b9868) /* f1a4608: 3c058009 */ lui $a1,%hi(var80088c98) /* f1a460c: 24a58c98 */ addiu $a1,$a1,%lo(var80088c98) -/* f1a4610: 0c0036cc */ jal func0000db30 +/* f1a4610: 0c0036cc */ jal mainOverrideVariable /* f1a4614: 24849868 */ addiu $a0,$a0,%lo(var7f1b9868) /* f1a4618: 3c047f1c */ lui $a0,%hi(var7f1b986c) /* f1a461c: 3c058009 */ lui $a1,%hi(var80088c9c) /* f1a4620: 24a58c9c */ addiu $a1,$a1,%lo(var80088c9c) -/* f1a4624: 0c0036cc */ jal func0000db30 +/* f1a4624: 0c0036cc */ jal mainOverrideVariable /* f1a4628: 2484986c */ addiu $a0,$a0,%lo(var7f1b986c) /* f1a462c: 3c047f1c */ lui $a0,%hi(var7f1b9870) /* f1a4630: 3c058009 */ lui $a1,%hi(var80088ca0) /* f1a4634: 24a58ca0 */ addiu $a1,$a1,%lo(var80088ca0) -/* f1a4638: 0c0036cc */ jal func0000db30 +/* f1a4638: 0c0036cc */ jal mainOverrideVariable /* f1a463c: 24849870 */ addiu $a0,$a0,%lo(var7f1b9870) /* f1a4640: 3c047f1c */ lui $a0,%hi(var7f1b9874) /* f1a4644: 3c058009 */ lui $a1,%hi(var80088ca4) /* f1a4648: 24a58ca4 */ addiu $a1,$a1,%lo(var80088ca4) -/* f1a464c: 0c0036cc */ jal func0000db30 +/* f1a464c: 0c0036cc */ jal mainOverrideVariable /* f1a4650: 24849874 */ addiu $a0,$a0,%lo(var7f1b9874) /* f1a4654: 3c047f1c */ lui $a0,%hi(var7f1b9878) /* f1a4658: 3c058009 */ lui $a1,%hi(var80088ca8) /* f1a465c: 24a58ca8 */ addiu $a1,$a1,%lo(var80088ca8) -/* f1a4660: 0c0036cc */ jal func0000db30 +/* f1a4660: 0c0036cc */ jal mainOverrideVariable /* f1a4664: 24849878 */ addiu $a0,$a0,%lo(var7f1b9878) /* f1a4668: 8faf015c */ lw $t7,0x15c($sp) /* f1a466c: 3c0ee700 */ lui $t6,0xe700 @@ -2896,42 +2896,42 @@ glabel menuhandler001a44c0 /* f19e5c4: 35ce0033 */ ori $t6,$t6,0x33 /* f19e5c8: afae00a8 */ sw $t6,0xa8($sp) .NB0f19e5cc: -/* f19e5cc: 0c00381c */ jal func0000db30 +/* f19e5cc: 0c00381c */ jal mainOverrideVariable /* f19e5d0: afa300b4 */ sw $v1,0xb4($sp) /* f19e5d4: 3c047f1b */ lui $a0,0x7f1b /* f19e5d8: 3c058009 */ lui $a1,0x8009 /* f19e5dc: 24a5b400 */ addiu $a1,$a1,-19456 -/* f19e5e0: 0c00381c */ jal func0000db30 +/* f19e5e0: 0c00381c */ jal mainOverrideVariable /* f19e5e4: 24843e80 */ addiu $a0,$a0,0x3e80 /* f19e5e8: 3c047f1b */ lui $a0,0x7f1b /* f19e5ec: 3c058009 */ lui $a1,0x8009 /* f19e5f0: 24a5b404 */ addiu $a1,$a1,-19452 -/* f19e5f4: 0c00381c */ jal func0000db30 +/* f19e5f4: 0c00381c */ jal mainOverrideVariable /* f19e5f8: 24843e84 */ addiu $a0,$a0,0x3e84 /* f19e5fc: 3c047f1b */ lui $a0,0x7f1b /* f19e600: 3c058009 */ lui $a1,0x8009 /* f19e604: 24a5b408 */ addiu $a1,$a1,-19448 -/* f19e608: 0c00381c */ jal func0000db30 +/* f19e608: 0c00381c */ jal mainOverrideVariable /* f19e60c: 24843e88 */ addiu $a0,$a0,0x3e88 /* f19e610: 3c047f1b */ lui $a0,0x7f1b /* f19e614: 3c058009 */ lui $a1,0x8009 /* f19e618: 24a5b40c */ addiu $a1,$a1,-19444 -/* f19e61c: 0c00381c */ jal func0000db30 +/* f19e61c: 0c00381c */ jal mainOverrideVariable /* f19e620: 24843e8c */ addiu $a0,$a0,0x3e8c /* f19e624: 3c047f1b */ lui $a0,0x7f1b /* f19e628: 3c058009 */ lui $a1,0x8009 /* f19e62c: 24a5b410 */ addiu $a1,$a1,-19440 -/* f19e630: 0c00381c */ jal func0000db30 +/* f19e630: 0c00381c */ jal mainOverrideVariable /* f19e634: 24843e90 */ addiu $a0,$a0,0x3e90 /* f19e638: 3c047f1b */ lui $a0,0x7f1b /* f19e63c: 3c058009 */ lui $a1,0x8009 /* f19e640: 24a5b414 */ addiu $a1,$a1,-19436 -/* f19e644: 0c00381c */ jal func0000db30 +/* f19e644: 0c00381c */ jal mainOverrideVariable /* f19e648: 24843e94 */ addiu $a0,$a0,0x3e94 /* f19e64c: 3c047f1b */ lui $a0,0x7f1b /* f19e650: 3c058009 */ lui $a1,0x8009 /* f19e654: 24a5b418 */ addiu $a1,$a1,-19432 -/* f19e658: 0c00381c */ jal func0000db30 +/* f19e658: 0c00381c */ jal mainOverrideVariable /* f19e65c: 24843e98 */ addiu $a0,$a0,0x3e98 /* f19e660: 8faf0154 */ lw $t7,0x154($sp) /* f19e664: 3c19e700 */ lui $t9,0xe700 diff --git a/src/game/wallhit.c b/src/game/wallhit.c index e1442b566..99d9216f0 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -891,7 +891,7 @@ glabel var7f1b5d18 /* f13ebbc: 3c058008 */ lui $a1,%hi(var8007f750) /* f13ebc0: 46000506 */ mov.s $f20,$f0 /* f13ebc4: 24a5f750 */ addiu $a1,$a1,%lo(var8007f750) -/* f13ebc8: 0c0036cc */ jal func0000db30 +/* f13ebc8: 0c0036cc */ jal mainOverrideVariable /* f13ebcc: 24845a54 */ addiu $a0,$a0,%lo(var7f1b5a54) /* f13ebd0: 44803000 */ mtc1 $zero,$f6 /* f13ebd4: 3c018008 */ lui $at,%hi(var8007f740) diff --git a/src/game/weather/tick.c b/src/game/weather/tick.c index 9465f725e..9e080b207 100644 --- a/src/game/weather/tick.c +++ b/src/game/weather/tick.c @@ -14,8 +14,8 @@ void weatherTick(void) return; } - func0000db30("wettick", (u32 *)&g_WeatherTickEnabled); - func0000db30("windspeed", &var80062950); + mainOverrideVariable("wettick", (u32 *)&g_WeatherTickEnabled); + mainOverrideVariable("windspeed", &var80062950); if (g_WeatherTickEnabled) { switch (g_WeatherData->type) { diff --git a/src/game/weather/weather.c b/src/game/weather/weather.c index 169e55226..e572fa137 100644 --- a/src/game/weather/weather.c +++ b/src/game/weather/weather.c @@ -290,7 +290,7 @@ void weatherTickRain(struct weatherdata *weather) f32 rand; s32 lvupdate; - func0000db30("rainspeedxtra", &g_RainSpeedExtra); + mainOverrideVariable("rainspeedxtra", &g_RainSpeedExtra); if (weather->unk90 > 0) { weather->unk88 += (weather->unk8c - weather->unk88) / weather->unk90; @@ -450,8 +450,8 @@ void weatherTickSnow(struct weatherdata *weather) s32 i; struct weatherparticledata *data; - func0000db30("snowspeed", &g_SnowSpeed); - func0000db30("snowspeedxtra", &g_SnowSpeedExtra); + mainOverrideVariable("snowspeed", &g_SnowSpeed); + mainOverrideVariable("snowspeedxtra", &g_SnowSpeedExtra); if (g_StageIndex == STAGEINDEX_AIRBASE) { weather->windanglerad = 1.5707963705063f; @@ -862,42 +862,42 @@ glabel var7f1b5780 /* f132e7c: 0000a025 */ or $s4,$zero,$zero /* f132e80: afa00708 */ sw $zero,0x708($sp) /* f132e84: 2484564c */ addiu $a0,$a0,%lo(var7f1b564c) -/* f132e88: 0c0036cc */ jal func0000db30 +/* f132e88: 0c0036cc */ jal mainOverrideVariable /* f132e8c: 24a5f0e4 */ addiu $a1,$a1,%lo(var8007f0e4) /* f132e90: 3c047f1b */ lui $a0,%hi(var7f1b5658) /* f132e94: 3c058008 */ lui $a1,%hi(var8007f0e8) /* f132e98: 24a5f0e8 */ addiu $a1,$a1,%lo(var8007f0e8) -/* f132e9c: 0c0036cc */ jal func0000db30 +/* f132e9c: 0c0036cc */ jal mainOverrideVariable /* f132ea0: 24845658 */ addiu $a0,$a0,%lo(var7f1b5658) /* f132ea4: 3c047f1b */ lui $a0,%hi(var7f1b5664) /* f132ea8: 3c058008 */ lui $a1,%hi(var8007f0e0) /* f132eac: 24a5f0e0 */ addiu $a1,$a1,%lo(var8007f0e0) -/* f132eb0: 0c0036cc */ jal func0000db30 +/* f132eb0: 0c0036cc */ jal mainOverrideVariable /* f132eb4: 24845664 */ addiu $a0,$a0,%lo(var7f1b5664) /* f132eb8: 3c047f1b */ lui $a0,%hi(var7f1b5670) /* f132ebc: 3c058008 */ lui $a1,%hi(var8007f0ec) /* f132ec0: 24a5f0ec */ addiu $a1,$a1,%lo(var8007f0ec) -/* f132ec4: 0c0036cc */ jal func0000db30 +/* f132ec4: 0c0036cc */ jal mainOverrideVariable /* f132ec8: 24845670 */ addiu $a0,$a0,%lo(var7f1b5670) /* f132ecc: 3c047f1b */ lui $a0,%hi(var7f1b5678) /* f132ed0: 3c058008 */ lui $a1,%hi(var8007f0f0) /* f132ed4: 24a5f0f0 */ addiu $a1,$a1,%lo(var8007f0f0) -/* f132ed8: 0c0036cc */ jal func0000db30 +/* f132ed8: 0c0036cc */ jal mainOverrideVariable /* f132edc: 24845678 */ addiu $a0,$a0,%lo(var7f1b5678) /* f132ee0: 3c047f1b */ lui $a0,%hi(var7f1b5680) /* f132ee4: 3c058008 */ lui $a1,%hi(var8007f0f4) /* f132ee8: 24a5f0f4 */ addiu $a1,$a1,%lo(var8007f0f4) -/* f132eec: 0c0036cc */ jal func0000db30 +/* f132eec: 0c0036cc */ jal mainOverrideVariable /* f132ef0: 24845680 */ addiu $a0,$a0,%lo(var7f1b5680) /* f132ef4: 3c047f1b */ lui $a0,%hi(var7f1b5688) /* f132ef8: 3c058008 */ lui $a1,%hi(var8007f0f8) /* f132efc: 24a5f0f8 */ addiu $a1,$a1,%lo(var8007f0f8) -/* f132f00: 0c0036cc */ jal func0000db30 +/* f132f00: 0c0036cc */ jal mainOverrideVariable /* f132f04: 24845688 */ addiu $a0,$a0,%lo(var7f1b5688) /* f132f08: 3c047f1b */ lui $a0,%hi(var7f1b5690) /* f132f0c: 3c058008 */ lui $a1,%hi(var8007f0fc) /* f132f10: 24a5f0fc */ addiu $a1,$a1,%lo(var8007f0fc) -/* f132f14: 0c0036cc */ jal func0000db30 +/* f132f14: 0c0036cc */ jal mainOverrideVariable /* f132f18: 24845690 */ addiu $a0,$a0,%lo(var7f1b5690) /* f132f1c: 3c13800a */ lui $s3,%hi(g_Vars) /* f132f20: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars) @@ -2609,22 +2609,22 @@ glabel var7f1b5790 /* f134818: af380004 */ sw $t8,0x4($t9) /* f13481c: 24a5f104 */ addiu $a1,$a1,%lo(var8007f104) /* f134820: 2484569c */ addiu $a0,$a0,%lo(var7f1b569c) -/* f134824: 0c0036cc */ jal func0000db30 +/* f134824: 0c0036cc */ jal mainOverrideVariable /* f134828: afa81268 */ sw $t0,0x1268($sp) /* f13482c: 3c047f1b */ lui $a0,%hi(var7f1b56a8) /* f134830: 3c058008 */ lui $a1,%hi(var8007f108) /* f134834: 24a5f108 */ addiu $a1,$a1,%lo(var8007f108) -/* f134838: 0c0036cc */ jal func0000db30 +/* f134838: 0c0036cc */ jal mainOverrideVariable /* f13483c: 248456a8 */ addiu $a0,$a0,%lo(var7f1b56a8) /* f134840: 3c047f1b */ lui $a0,%hi(var7f1b56b4) /* f134844: 3c058008 */ lui $a1,%hi(var8007f10c) /* f134848: 24a5f10c */ addiu $a1,$a1,%lo(var8007f10c) -/* f13484c: 0c0036cc */ jal func0000db30 +/* f13484c: 0c0036cc */ jal mainOverrideVariable /* f134850: 248456b4 */ addiu $a0,$a0,%lo(var7f1b56b4) /* f134854: 3c047f1b */ lui $a0,%hi(var7f1b56c0) /* f134858: 3c058008 */ lui $a1,%hi(var8007f110) /* f13485c: 24a5f110 */ addiu $a1,$a1,%lo(var8007f110) -/* f134860: 0c0036cc */ jal func0000db30 +/* f134860: 0c0036cc */ jal mainOverrideVariable /* f134864: 248456c0 */ addiu $a0,$a0,%lo(var7f1b56c0) /* f134868: 0013c880 */ sll $t9,$s3,0x2 /* f13486c: 02397021 */ addu $t6,$s1,$t9 diff --git a/src/include/lib/main.h b/src/include/lib/main.h index 3a197e1b3..3b22afdac 100644 --- a/src/include/lib/main.h +++ b/src/include/lib/main.h @@ -8,7 +8,7 @@ extern s32 var8005dd18; void mainInit(void); void mainProc(void); -void func0000db30(char *string, void *ptr); +void mainOverrideVariable(char *name, void *value); void mainLoop(void); void mainTick(void); void mainEndStage(void); diff --git a/src/lib/joy.c b/src/lib/joy.c index 34baca287..3eaf90eaa 100644 --- a/src/lib/joy.c +++ b/src/lib/joy.c @@ -572,9 +572,9 @@ u32 var8005ef08 = 0; void joyDebugJoy(void) { #if VERSION >= VERSION_NTSC_1_0 - func0000db30("debugjoy", &var8005ef08); + mainOverrideVariable("debugjoy", &var8005ef08); #else - func0000db30("joyforce", &var8005ef08); + mainOverrideVariable("joyforce", &var8005ef08); #endif #if VERSION >= VERSION_NTSC_1_0 diff --git a/src/lib/main.c b/src/lib/main.c index 8efe87341..376f688aa 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -1730,7 +1730,16 @@ void mainProc(void) } } -void func0000db30(char *string, void *ptr) +/** + * It's suspected that this function would have allowed developers to override + * the value of variables while the game is running in order to view their + * effects immediately rather than having to recompile the game each time. + * + * The developers would have used rmon to create a table of name/value pairs, + * then this function would have looked up the given variable name in the table + * and written the new value to the variable's address. + */ +void mainOverrideVariable(char *name, void *value) { // empty }