diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 05db6268d..6fd396396 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -900,7 +900,7 @@ glabel func0f0d4d0c ); GLOBAL_ASM( -glabel scenarioDefaultCallback44 +glabel savefileGetSomething /* f0d52f8: 24ce001f */ addiu $t6,$a2,0x1f /* f0d52fc: 240f0001 */ addiu $t7,$zero,0x1 /* f0d5300: 01cf1004 */ sllv $v0,$t7,$t6 @@ -979,7 +979,7 @@ glabel func0f0d5360 ); GLOBAL_ASM( -glabel scenarioDefaultCallback40 +glabel savefileGetInteger /* f0d53f8: 24ae001f */ addiu $t6,$a1,0x1f /* f0d53fc: 240f0001 */ addiu $t7,$zero,0x1 /* f0d5400: 01cf1004 */ sllv $v0,$t7,$t6 @@ -1079,7 +1079,7 @@ glabel func0f0d54e4 /* f0d551c: 2414000a */ addiu $s4,$zero,0xa /* f0d5520: 02602025 */ or $a0,$s3,$zero .L0f0d5524: -/* f0d5524: 0fc354fe */ jal scenarioDefaultCallback40 +/* f0d5524: 0fc354fe */ jal savefileGetInteger /* f0d5528: 24050008 */ addiu $a1,$zero,0x8 /* f0d552c: 56200008 */ bnezl $s1,.L0f0d5550 /* f0d5530: 26100001 */ addiu $s0,$s0,0x1 @@ -1146,13 +1146,13 @@ glabel func0f0d55a4 /* f0d55fc: 24100001 */ addiu $s0,$zero,0x1 .L0f0d5600: /* f0d5600: 02402025 */ or $a0,$s2,$zero -/* f0d5604: 0fc354be */ jal scenarioDefaultCallback44 +/* f0d5604: 0fc354be */ jal savefileGetSomething /* f0d5608: 24060008 */ addiu $a2,$zero,0x8 .L0f0d560c: /* f0d560c: 12000004 */ beqz $s0,.L0f0d5620 /* f0d5610: 02402025 */ or $a0,$s2,$zero /* f0d5614: 00002825 */ or $a1,$zero,$zero -/* f0d5618: 0fc354be */ jal scenarioDefaultCallback44 +/* f0d5618: 0fc354be */ jal savefileGetSomething /* f0d561c: 24060008 */ addiu $a2,$zero,0x8 .L0f0d5620: /* f0d5620: 26310001 */ addiu $s1,$s1,0x1 @@ -1256,12 +1256,12 @@ glabel func0f0d575c /* f0d5764: afa40018 */ sw $a0,0x18($sp) /* f0d5768: afa5001c */ sw $a1,0x1c($sp) /* f0d576c: 8ca50000 */ lw $a1,0x0($a1) -/* f0d5770: 0fc354be */ jal scenarioDefaultCallback44 +/* f0d5770: 0fc354be */ jal savefileGetSomething /* f0d5774: 24060007 */ addiu $a2,$zero,0x7 /* f0d5778: 8faf001c */ lw $t7,0x1c($sp) /* f0d577c: 8fa40018 */ lw $a0,0x18($sp) /* f0d5780: 2406000d */ addiu $a2,$zero,0xd -/* f0d5784: 0fc354be */ jal scenarioDefaultCallback44 +/* f0d5784: 0fc354be */ jal savefileGetSomething /* f0d5788: 95e50004 */ lhu $a1,0x4($t7) /* f0d578c: 8fbf0014 */ lw $ra,0x14($sp) /* f0d5790: 27bd0018 */ addiu $sp,$sp,0x18 @@ -1275,12 +1275,12 @@ glabel func0f0d579c /* f0d57a0: afbf0014 */ sw $ra,0x14($sp) /* f0d57a4: afa5001c */ sw $a1,0x1c($sp) /* f0d57a8: afa40018 */ sw $a0,0x18($sp) -/* f0d57ac: 0fc354fe */ jal scenarioDefaultCallback40 +/* f0d57ac: 0fc354fe */ jal savefileGetInteger /* f0d57b0: 24050007 */ addiu $a1,$zero,0x7 /* f0d57b4: 8fae001c */ lw $t6,0x1c($sp) /* f0d57b8: 2405000d */ addiu $a1,$zero,0xd /* f0d57bc: adc20000 */ sw $v0,0x0($t6) -/* f0d57c0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f0d57c0: 0fc354fe */ jal savefileGetInteger /* f0d57c4: 8fa40018 */ lw $a0,0x18($sp) /* f0d57c8: 8faf001c */ lw $t7,0x1c($sp) /* f0d57cc: a5e20004 */ sh $v0,0x4($t7) diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 3210136b5..a68ac26ff 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -1788,12 +1788,12 @@ s32 menuhandlerMpHillTime(u32 operation, struct menuitem *item, union handlerdat void scenarioKohCallback40(s32 *arg0) { - g_Vars.mphilltime = scenarioDefaultCallback40(arg0, 8); + g_Vars.mphilltime = savefileGetInteger(arg0, 8); } void scenarioKohCallback44(s32 *arg0) { - scenarioDefaultCallback44(arg0, g_Vars.mphilltime, 8); + savefileGetSomething(arg0, g_Vars.mphilltime, 8); } void scenarioKohInit(void) @@ -5410,7 +5410,7 @@ void scenarioCallback40(s32 *arg0) if (g_MpScenarios[g_MpSetup.scenario].unk40) { g_MpScenarios[g_MpSetup.scenario].unk40(arg0); } else { - scenarioDefaultCallback40(arg0, 8); + savefileGetInteger(arg0, 8); } } @@ -5419,7 +5419,7 @@ void scenarioCallback44(s32 *arg0) if (g_MpScenarios[g_MpSetup.scenario].unk44) { g_MpScenarios[g_MpSetup.scenario].unk44(arg0); } else { - scenarioDefaultCallback44(arg0, 0, 8); + savefileGetSomething(arg0, 0, 8); } } diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 65ca43718..bd3e32a8b 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -317,7 +317,7 @@ glabel func0f10fac8 /* f10fb80: 0fc35539 */ jal func0f0d54e4 /* f10fb84: 00003025 */ or $a2,$zero,$zero /* f10fb88: 02802025 */ or $a0,$s4,$zero -/* f10fb8c: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fb8c: 0fc354fe */ jal savefileGetInteger /* f10fb90: 24050005 */ addiu $a1,$zero,0x5 /* f10fb94: 3c03800a */ lui $v1,%hi(g_SoloSaveFile) /* f10fb98: 24632200 */ addiu $v1,$v1,%lo(g_SoloSaveFile) @@ -327,12 +327,12 @@ glabel func0f10fac8 /* f10fba8: 314bff07 */ andi $t3,$t2,0xff07 /* f10fbac: 012b6025 */ or $t4,$t1,$t3 /* f10fbb0: a06c000b */ sb $t4,0xb($v1) -/* f10fbb4: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fbb4: 0fc354fe */ jal savefileGetInteger /* f10fbb8: 24050020 */ addiu $a1,$zero,0x20 /* f10fbbc: 3c01800a */ lui $at,%hi(g_SoloSaveFile+0x10) /* f10fbc0: ac222210 */ sw $v0,%lo(g_SoloSaveFile+0x10)($at) /* f10fbc4: 02802025 */ or $a0,$s4,$zero -/* f10fbc8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fbc8: 0fc354fe */ jal savefileGetInteger /* f10fbcc: 24050002 */ addiu $a1,$zero,0x2 /* f10fbd0: 3c03800a */ lui $v1,%hi(g_SoloSaveFile) /* f10fbd4: 24632200 */ addiu $v1,$v1,%lo(g_SoloSaveFile) @@ -342,12 +342,12 @@ glabel func0f10fac8 /* f10fbe4: 31f8fff8 */ andi $t8,$t7,0xfff8 /* f10fbe8: 01d8c825 */ or $t9,$t6,$t8 /* f10fbec: a079000b */ sb $t9,0xb($v1) -/* f10fbf0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fbf0: 0fc354fe */ jal savefileGetInteger /* f10fbf4: 24050005 */ addiu $a1,$zero,0x5 /* f10fbf8: 3c01800a */ lui $at,%hi(g_SoloSaveFile+0xc) /* f10fbfc: a022220c */ sb $v0,%lo(g_SoloSaveFile+0xc)($at) /* f10fc00: 02802025 */ or $a0,$s4,$zero -/* f10fc04: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fc04: 0fc354fe */ jal savefileGetInteger /* f10fc08: 24050006 */ addiu $a1,$zero,0x6 /* f10fc0c: 00022880 */ sll $a1,$v0,0x2 /* f10fc10: 2ca100fc */ sltiu $at,$a1,0xfc @@ -360,7 +360,7 @@ glabel func0f10fac8 /* f10fc28: 0c003a87 */ jal audioSetSfxVolume /* f10fc2c: 3104ffff */ andi $a0,$t0,0xffff /* f10fc30: 02802025 */ or $a0,$s4,$zero -/* f10fc34: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fc34: 0fc354fe */ jal savefileGetInteger /* f10fc38: 24050006 */ addiu $a1,$zero,0x6 /* f10fc3c: 00022880 */ sll $a1,$v0,0x2 /* f10fc40: 2ca100fc */ sltiu $at,$a1,0xfc @@ -373,18 +373,18 @@ glabel func0f10fac8 /* f10fc58: 0fc54bdc */ jal optionsSetMusicVolume /* f10fc5c: 3124ffff */ andi $a0,$t1,0xffff /* f10fc60: 02802025 */ or $a0,$s4,$zero -/* f10fc64: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fc64: 0fc354fe */ jal savefileGetInteger /* f10fc68: 24050002 */ addiu $a1,$zero,0x2 /* f10fc6c: 0c003ce3 */ jal audioSetSoundMode /* f10fc70: 00402025 */ or $a0,$v0,$zero /* f10fc74: 02802025 */ or $a0,$s4,$zero -/* f10fc78: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fc78: 0fc354fe */ jal savefileGetInteger /* f10fc7c: 24050003 */ addiu $a1,$zero,0x3 /* f10fc80: 02202025 */ or $a0,$s1,$zero /* f10fc84: 0fc549cb */ jal optionsSetControlMode /* f10fc88: 00402825 */ or $a1,$v0,$zero /* f10fc8c: 02802025 */ or $a0,$s4,$zero -/* f10fc90: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fc90: 0fc354fe */ jal savefileGetInteger /* f10fc94: 24050003 */ addiu $a1,$zero,0x3 /* f10fc98: 02402025 */ or $a0,$s2,$zero /* f10fc9c: 0fc549cb */ jal optionsSetControlMode @@ -395,14 +395,14 @@ glabel func0f10fac8 /* f10fcb0: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f10fcb4: /* f10fcb4: 02802025 */ or $a0,$s4,$zero -/* f10fcb8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fcb8: 0fc354fe */ jal savefileGetInteger /* f10fcbc: 24050008 */ addiu $a1,$zero,0x8 /* f10fcc0: 26100001 */ addiu $s0,$s0,0x1 /* f10fcc4: 0211082b */ sltu $at,$s0,$s1 /* f10fcc8: 1420fffa */ bnez $at,.L0f10fcb4 /* f10fccc: a2020013 */ sb $v0,0x13($s0) /* f10fcd0: 02802025 */ or $a0,$s4,$zero -/* f10fcd4: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fcd4: 0fc354fe */ jal savefileGetInteger /* f10fcd8: 24050010 */ addiu $a1,$zero,0x10 /* f10fcdc: 3c01800a */ lui $at,%hi(g_SoloSaveFile+0x1e) /* f10fce0: 3c13800a */ lui $s3,%hi(g_SoloSaveFile) @@ -414,7 +414,7 @@ glabel func0f10fac8 /* f10fcf4: 02608825 */ or $s1,$s3,$zero .L0f10fcf8: /* f10fcf8: 02802025 */ or $a0,$s4,$zero -/* f10fcfc: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fcfc: 0fc354fe */ jal savefileGetInteger /* f10fd00: 2405000c */ addiu $a1,$zero,0xc /* f10fd04: 26100001 */ addiu $s0,$s0,0x1 /* f10fd08: 26310002 */ addiu $s1,$s1,0x2 @@ -432,7 +432,7 @@ glabel func0f10fac8 .L0f10fd38: /* f10fd38: 02802025 */ or $a0,$s4,$zero .L0f10fd3c: -/* f10fd3c: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fd3c: 0fc354fe */ jal savefileGetInteger /* f10fd40: 24050001 */ addiu $a1,$zero,0x1 /* f10fd44: 02202025 */ or $a0,$s1,$zero /* f10fd48: 02002825 */ or $a1,$s0,$zero @@ -453,7 +453,7 @@ glabel func0f10fac8 /* f10fd84: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f10fd88: /* f10fd88: 02802025 */ or $a0,$s4,$zero -/* f10fd8c: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fd8c: 0fc354fe */ jal savefileGetInteger /* f10fd90: 24050015 */ addiu $a1,$zero,0x15 /* f10fd94: 26100004 */ addiu $s0,$s0,0x4 /* f10fd98: 0211082b */ sltu $at,$s0,$s1 @@ -471,7 +471,7 @@ glabel func0f10fac8 /* f10fdc4: 10000001 */ b .L0f10fdcc /* f10fdc8: 24050002 */ addiu $a1,$zero,0x2 .L0f10fdcc: -/* f10fdcc: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fdcc: 0fc354fe */ jal savefileGetInteger /* f10fdd0: 02802025 */ or $a0,$s4,$zero /* f10fdd4: 26100001 */ addiu $s0,$s0,0x1 /* f10fdd8: 0212082b */ sltu $at,$s0,$s2 @@ -483,7 +483,7 @@ glabel func0f10fac8 /* f10fdf0: 26102200 */ addiu $s0,$s0,%lo(g_SoloSaveFile) .L0f10fdf4: /* f10fdf4: 02802025 */ or $a0,$s4,$zero -/* f10fdf8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f10fdf8: 0fc354fe */ jal savefileGetInteger /* f10fdfc: 24050008 */ addiu $a1,$zero,0x8 /* f10fe00: 26100001 */ addiu $s0,$s0,0x1 /* f10fe04: 1611fffb */ bne $s0,$s1,.L0f10fdf4 @@ -831,21 +831,21 @@ glabel func0f10feac /* f110324: 02802025 */ or $a0,$s4,$zero /* f110328: 24060005 */ addiu $a2,$zero,0x5 /* f11032c: 000560c2 */ srl $t4,$a1,0x3 -/* f110330: 0fc354be */ jal scenarioDefaultCallback44 +/* f110330: 0fc354be */ jal savefileGetSomething /* f110334: 01802825 */ or $a1,$t4,$zero /* f110338: 02802025 */ or $a0,$s4,$zero /* f11033c: 8e450010 */ lw $a1,0x10($s2) -/* f110340: 0fc354be */ jal scenarioDefaultCallback44 +/* f110340: 0fc354be */ jal savefileGetSomething /* f110344: 24060020 */ addiu $a2,$zero,0x20 /* f110348: 8e450008 */ lw $a1,0x8($s2) /* f11034c: 02802025 */ or $a0,$s4,$zero /* f110350: 24060002 */ addiu $a2,$zero,0x2 /* f110354: 30ad0007 */ andi $t5,$a1,0x7 -/* f110358: 0fc354be */ jal scenarioDefaultCallback44 +/* f110358: 0fc354be */ jal savefileGetSomething /* f11035c: 01a02825 */ or $a1,$t5,$zero /* f110360: 02802025 */ or $a0,$s4,$zero /* f110364: 9245000c */ lbu $a1,0xc($s2) -/* f110368: 0fc354be */ jal scenarioDefaultCallback44 +/* f110368: 0fc354be */ jal savefileGetSomething /* f11036c: 24060005 */ addiu $a2,$zero,0x5 /* f110370: 3c028006 */ lui $v0,%hi(g_SfxVolume) /* f110374: 9442ddc8 */ lhu $v0,%lo(g_SfxVolume)($v0) @@ -860,7 +860,7 @@ glabel func0f10feac .L0f110398: /* f110398: 000729c3 */ sra $a1,$a3,0x7 /* f11039c: 00057082 */ srl $t6,$a1,0x2 -/* f1103a0: 0fc354be */ jal scenarioDefaultCallback44 +/* f1103a0: 0fc354be */ jal savefileGetSomething /* f1103a4: 01c02825 */ or $a1,$t6,$zero /* f1103a8: 0fc54bd4 */ jal optionsGetMusicVolume /* f1103ac: 00000000 */ nop @@ -868,24 +868,24 @@ glabel func0f10feac /* f1103b4: 00057882 */ srl $t7,$a1,0x2 /* f1103b8: 01e02825 */ or $a1,$t7,$zero /* f1103bc: 02802025 */ or $a0,$s4,$zero -/* f1103c0: 0fc354be */ jal scenarioDefaultCallback44 +/* f1103c0: 0fc354be */ jal savefileGetSomething /* f1103c4: 24060006 */ addiu $a2,$zero,0x6 /* f1103c8: 3c058006 */ lui $a1,%hi(g_SoundMode) /* f1103cc: 8ca5ddcc */ lw $a1,%lo(g_SoundMode)($a1) /* f1103d0: 02802025 */ or $a0,$s4,$zero -/* f1103d4: 0fc354be */ jal scenarioDefaultCallback44 +/* f1103d4: 0fc354be */ jal savefileGetSomething /* f1103d8: 24060002 */ addiu $a2,$zero,0x2 /* f1103dc: 0fc549c4 */ jal optionsGetControlMode /* f1103e0: 02602025 */ or $a0,$s3,$zero /* f1103e4: 02802025 */ or $a0,$s4,$zero /* f1103e8: 00402825 */ or $a1,$v0,$zero -/* f1103ec: 0fc354be */ jal scenarioDefaultCallback44 +/* f1103ec: 0fc354be */ jal savefileGetSomething /* f1103f0: 24060003 */ addiu $a2,$zero,0x3 /* f1103f4: 0fc549c4 */ jal optionsGetControlMode /* f1103f8: 02202025 */ or $a0,$s1,$zero /* f1103fc: 02802025 */ or $a0,$s4,$zero /* f110400: 00402825 */ or $a1,$v0,$zero -/* f110404: 0fc354be */ jal scenarioDefaultCallback44 +/* f110404: 0fc354be */ jal savefileGetSomething /* f110408: 24060003 */ addiu $a2,$zero,0x3 /* f11040c: 3c10800a */ lui $s0,%hi(g_SoloSaveFile) /* f110410: 3c11800a */ lui $s1,%hi(g_SoloSaveFile+0xa) @@ -894,7 +894,7 @@ glabel func0f10feac /* f11041c: 02802025 */ or $a0,$s4,$zero .L0f110420: /* f110420: 92050014 */ lbu $a1,0x14($s0) -/* f110424: 0fc354be */ jal scenarioDefaultCallback44 +/* f110424: 0fc354be */ jal savefileGetSomething /* f110428: 24060008 */ addiu $a2,$zero,0x8 /* f11042c: 26100001 */ addiu $s0,$s0,0x1 /* f110430: 0211082b */ sltu $at,$s0,$s1 @@ -902,7 +902,7 @@ glabel func0f10feac /* f110438: 02802025 */ or $a0,$s4,$zero /* f11043c: 02802025 */ or $a0,$s4,$zero /* f110440: 9645001e */ lhu $a1,0x1e($s2) -/* f110444: 0fc354be */ jal scenarioDefaultCallback44 +/* f110444: 0fc354be */ jal savefileGetSomething /* f110448: 24060010 */ addiu $a2,$zero,0x10 /* f11044c: 3c15800a */ lui $s5,%hi(g_SoloSaveFile) /* f110450: 26b52200 */ addiu $s5,$s5,%lo(g_SoloSaveFile) @@ -913,7 +913,7 @@ glabel func0f10feac .L0f110460: /* f110460: 02802025 */ or $a0,$s4,$zero /* f110464: 96450020 */ lhu $a1,0x20($s2) -/* f110468: 0fc354be */ jal scenarioDefaultCallback44 +/* f110468: 0fc354be */ jal savefileGetSomething /* f11046c: 2406000c */ addiu $a2,$zero,0xc /* f110470: 26310002 */ addiu $s1,$s1,0x2 /* f110474: 1633fffa */ bne $s1,$s3,.L0f110460 @@ -934,7 +934,7 @@ glabel func0f10feac /* f1104a8: 02002825 */ or $a1,$s0,$zero /* f1104ac: 02802025 */ or $a0,$s4,$zero /* f1104b0: 00402825 */ or $a1,$v0,$zero -/* f1104b4: 0fc354be */ jal scenarioDefaultCallback44 +/* f1104b4: 0fc354be */ jal savefileGetSomething /* f1104b8: 24060001 */ addiu $a2,$zero,0x1 /* f1104bc: 26100001 */ addiu $s0,$s0,0x1 /* f1104c0: 5612fff8 */ bnel $s0,$s2,.L0f1104a4 @@ -950,7 +950,7 @@ glabel func0f10feac /* f1104e8: 02802025 */ or $a0,$s4,$zero .L0f1104ec: /* f1104ec: 8e0500a0 */ lw $a1,0xa0($s0) -/* f1104f0: 0fc354be */ jal scenarioDefaultCallback44 +/* f1104f0: 0fc354be */ jal savefileGetSomething /* f1104f4: 24060015 */ addiu $a2,$zero,0x15 /* f1104f8: 26100004 */ addiu $s0,$s0,0x4 /* f1104fc: 0211082b */ sltu $at,$s0,$s1 @@ -971,7 +971,7 @@ glabel func0f10feac /* f110530: 24070008 */ addiu $a3,$zero,0x8 .L0f110534: /* f110534: 920500ac */ lbu $a1,0xac($s0) -/* f110538: 0fc354be */ jal scenarioDefaultCallback44 +/* f110538: 0fc354be */ jal savefileGetSomething /* f11053c: 00e03025 */ or $a2,$a3,$zero /* f110540: 26100001 */ addiu $s0,$s0,0x1 /* f110544: 0212082b */ sltu $at,$s0,$s2 @@ -984,7 +984,7 @@ glabel func0f10feac /* f110560: 02802025 */ or $a0,$s4,$zero .L0f110564: /* f110564: 920500b5 */ lbu $a1,0xb5($s0) -/* f110568: 0fc354be */ jal scenarioDefaultCallback44 +/* f110568: 0fc354be */ jal savefileGetSomething /* f11056c: 24060008 */ addiu $a2,$zero,0x8 /* f110570: 26100001 */ addiu $s0,$s0,0x1 /* f110574: 5611fffb */ bnel $s0,$s1,.L0f110564 @@ -1025,42 +1025,17 @@ glabel func0f10feac /* f1105f8: 27bd0148 */ addiu $sp,$sp,0x148 ); -GLOBAL_ASM( -glabel savefileGetOverview -/* f1105fc: 27bdff08 */ addiu $sp,$sp,-248 -/* f110600: afa500fc */ sw $a1,0xfc($sp) -/* f110604: 00802825 */ or $a1,$a0,$zero -/* f110608: afbf0014 */ sw $ra,0x14($sp) -/* f11060c: afa400f8 */ sw $a0,0xf8($sp) -/* f110610: afa60100 */ sw $a2,0x100($sp) -/* f110614: afa70104 */ sw $a3,0x104($sp) -/* f110618: 2406000f */ addiu $a2,$zero,0xf -/* f11061c: 0fc35521 */ jal func0f0d5484 -/* f110620: 27a40018 */ addiu $a0,$sp,0x18 -/* f110624: 27a40018 */ addiu $a0,$sp,0x18 -/* f110628: 8fa500fc */ lw $a1,0xfc($sp) -/* f11062c: 0fc35539 */ jal func0f0d54e4 -/* f110630: 00003025 */ or $a2,$zero,$zero -/* f110634: 27a40018 */ addiu $a0,$sp,0x18 -/* f110638: 0fc354fe */ jal scenarioDefaultCallback40 -/* f11063c: 24050005 */ addiu $a1,$zero,0x5 -/* f110640: 8fae0100 */ lw $t6,0x100($sp) -/* f110644: 27a40018 */ addiu $a0,$sp,0x18 -/* f110648: 24050020 */ addiu $a1,$zero,0x20 -/* f11064c: 0fc354fe */ jal scenarioDefaultCallback40 -/* f110650: a1c20000 */ sb $v0,0x0($t6) -/* f110654: 8faf0108 */ lw $t7,0x108($sp) -/* f110658: 27a40018 */ addiu $a0,$sp,0x18 -/* f11065c: 24050002 */ addiu $a1,$zero,0x2 -/* f110660: 0fc354fe */ jal scenarioDefaultCallback40 -/* f110664: ade20000 */ sw $v0,0x0($t7) -/* f110668: 8fb80104 */ lw $t8,0x104($sp) -/* f11066c: a3020000 */ sb $v0,0x0($t8) -/* f110670: 8fbf0014 */ lw $ra,0x14($sp) -/* f110674: 27bd00f8 */ addiu $sp,$sp,0xf8 -/* f110678: 03e00008 */ jr $ra -/* f11067c: 00000000 */ nop -); +void savefileGetOverview(char *arg0, char *name, u8 *stage, u8 *difficulty, u32 *time) +{ + s32 sp18[56]; + + func0f0d5484(sp18, arg0, 0xf); + func0f0d54e4(sp18, name, 0); + + *stage = savefileGetInteger(sp18, 5); + *time = savefileGetInteger(sp18, 0x20); + *difficulty = savefileGetInteger(sp18, 2); +} void func0f110680(void) { @@ -1210,12 +1185,12 @@ glabel func0f11080c /* f110894: 02402025 */ or $a0,$s2,$zero /* f110898: 24050001 */ addiu $a1,$zero,0x1 /* f11089c: ae39047c */ sw $t9,0x47c($s1) -/* f1108a0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f1108a0: 0fc354fe */ jal savefileGetInteger /* f1108a4: a6280480 */ sh $t0,0x480($s1) /* f1108a8: 3c01800b */ lui $at,%hi(g_MpSetup+0x89) /* f1108ac: a022cc11 */ sb $v0,%lo(g_MpSetup+0x89)($at) /* f1108b0: 02402025 */ or $a0,$s2,$zero -/* f1108b4: 0fc354fe */ jal scenarioDefaultCallback40 +/* f1108b4: 0fc354fe */ jal savefileGetInteger /* f1108b8: 24050004 */ addiu $a1,$zero,0x4 /* f1108bc: a6220482 */ sh $v0,0x482($s1) /* f1108c0: 3c11800b */ lui $s1,%hi(g_MpSetup+0x88) @@ -1232,7 +1207,7 @@ glabel func0f11080c /* f1108e8: 5420fffa */ bnezl $at,.L0f1108d4 /* f1108ec: 02402025 */ or $a0,$s2,$zero /* f1108f0: 02402025 */ or $a0,$s2,$zero -/* f1108f4: 0fc354fe */ jal scenarioDefaultCallback40 +/* f1108f4: 0fc354fe */ jal savefileGetInteger /* f1108f8: 24050008 */ addiu $a1,$zero,0x8 /* f1108fc: 304300ff */ andi $v1,$v0,0xff /* f110900: 240100ff */ addiu $at,$zero,0xff @@ -1251,23 +1226,23 @@ glabel func0f11080c /* f11092c: 2610cbb0 */ addiu $s0,$s0,%lo(g_MpSetup+0x28) .L0f110930: /* f110930: 02402025 */ or $a0,$s2,$zero -/* f110934: 0fc354fe */ jal scenarioDefaultCallback40 +/* f110934: 0fc354fe */ jal savefileGetInteger /* f110938: 24050008 */ addiu $a1,$zero,0x8 /* f11093c: 26100001 */ addiu $s0,$s0,0x1 /* f110940: 1611fffb */ bne $s0,$s1,.L0f110930 /* f110944: a2020064 */ sb $v0,0x64($s0) /* f110948: 02402025 */ or $a0,$s2,$zero -/* f11094c: 0fc354fe */ jal scenarioDefaultCallback40 +/* f11094c: 0fc354fe */ jal savefileGetInteger /* f110950: 24050001 */ addiu $a1,$zero,0x1 /* f110954: 3c01800b */ lui $at,%hi(g_MpSetup+0x8a) /* f110958: a022cc12 */ sb $v0,%lo(g_MpSetup+0x8a)($at) /* f11095c: 02402025 */ or $a0,$s2,$zero -/* f110960: 0fc354fe */ jal scenarioDefaultCallback40 +/* f110960: 0fc354fe */ jal savefileGetInteger /* f110964: 24050001 */ addiu $a1,$zero,0x1 /* f110968: 3c01800a */ lui $at,%hi(var800a2328+0x3) /* f11096c: a022232b */ sb $v0,%lo(var800a2328+0x3)($at) /* f110970: 02402025 */ or $a0,$s2,$zero -/* f110974: 0fc354fe */ jal scenarioDefaultCallback40 +/* f110974: 0fc354fe */ jal savefileGetInteger /* f110978: 24050001 */ addiu $a1,$zero,0x1 /* f11097c: 3c01800a */ lui $at,%hi(g_AltTitle) /* f110980: a022232c */ sb $v0,%lo(g_AltTitle)($at) @@ -1313,11 +1288,11 @@ glabel func0f1109c0 /* f110a08: 3c05800b */ lui $a1,%hi(g_MpSetup+0x89) /* f110a0c: 90a5cc11 */ lbu $a1,%lo(g_MpSetup+0x89)($a1) /* f110a10: 02402025 */ or $a0,$s2,$zero -/* f110a14: 0fc354be */ jal scenarioDefaultCallback44 +/* f110a14: 0fc354be */ jal savefileGetSomething /* f110a18: 24060001 */ addiu $a2,$zero,0x1 /* f110a1c: 02402025 */ or $a0,$s2,$zero /* f110a20: 96050482 */ lhu $a1,0x482($s0) -/* f110a24: 0fc354be */ jal scenarioDefaultCallback44 +/* f110a24: 0fc354be */ jal savefileGetSomething /* f110a28: 24060004 */ addiu $a2,$zero,0x4 /* f110a2c: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) /* f110a30: 3c11800b */ lui $s1,%hi(g_MpSetup+0x88) @@ -1339,12 +1314,12 @@ glabel func0f1109c0 /* f110a6c: 00402825 */ or $a1,$v0,$zero /* f110a70: 02402025 */ or $a0,$s2,$zero /* f110a74: 240500ff */ addiu $a1,$zero,0xff -/* f110a78: 0fc354be */ jal scenarioDefaultCallback44 +/* f110a78: 0fc354be */ jal savefileGetSomething /* f110a7c: 24060008 */ addiu $a2,$zero,0x8 /* f110a80: 10000003 */ b .L0f110a90 /* f110a84: 00000000 */ nop .L0f110a88: -/* f110a88: 0fc354be */ jal scenarioDefaultCallback44 +/* f110a88: 0fc354be */ jal savefileGetSomething /* f110a8c: 24060008 */ addiu $a2,$zero,0x8 .L0f110a90: /* f110a90: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28) @@ -1354,7 +1329,7 @@ glabel func0f1109c0 /* f110aa0: 02402025 */ or $a0,$s2,$zero .L0f110aa4: /* f110aa4: 92050065 */ lbu $a1,0x65($s0) -/* f110aa8: 0fc354be */ jal scenarioDefaultCallback44 +/* f110aa8: 0fc354be */ jal savefileGetSomething /* f110aac: 24060008 */ addiu $a2,$zero,0x8 /* f110ab0: 26100001 */ addiu $s0,$s0,0x1 /* f110ab4: 5611fffb */ bnel $s0,$s1,.L0f110aa4 @@ -1362,17 +1337,17 @@ glabel func0f1109c0 /* f110abc: 3c05800b */ lui $a1,%hi(g_MpSetup+0x8a) /* f110ac0: 90a5cc12 */ lbu $a1,%lo(g_MpSetup+0x8a)($a1) /* f110ac4: 02402025 */ or $a0,$s2,$zero -/* f110ac8: 0fc354be */ jal scenarioDefaultCallback44 +/* f110ac8: 0fc354be */ jal savefileGetSomething /* f110acc: 24060001 */ addiu $a2,$zero,0x1 /* f110ad0: 3c05800a */ lui $a1,%hi(var800a2328+0x3) /* f110ad4: 90a5232b */ lbu $a1,%lo(var800a2328+0x3)($a1) /* f110ad8: 02402025 */ or $a0,$s2,$zero -/* f110adc: 0fc354be */ jal scenarioDefaultCallback44 +/* f110adc: 0fc354be */ jal savefileGetSomething /* f110ae0: 24060001 */ addiu $a2,$zero,0x1 /* f110ae4: 3c05800a */ lui $a1,%hi(g_AltTitle) /* f110ae8: 90a5232c */ lbu $a1,%lo(g_AltTitle)($a1) /* f110aec: 02402025 */ or $a0,$s2,$zero -/* f110af0: 0fc354be */ jal scenarioDefaultCallback44 +/* f110af0: 0fc354be */ jal savefileGetSomething /* f110af4: 24060001 */ addiu $a2,$zero,0x1 /* f110af8: 0fc35531 */ jal func0f0d54c4 /* f110afc: 02402025 */ or $a0,$s2,$zero diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 737302e95..35daf4b8f 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -6181,7 +6181,7 @@ glabel func0f18d1b8 /* f18d1fc: 02002825 */ or $a1,$s0,$zero /* f18d200: 24050008 */ addiu $a1,$zero,0x8 .L0f18d204: -/* f18d204: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d204: 0fc354fe */ jal savefileGetInteger /* f18d208: 02402025 */ or $a0,$s2,$zero /* f18d20c: 2610fff8 */ addiu $s0,$s0,-8 /* f18d210: a2220097 */ sb $v0,0x97($s1) @@ -6220,7 +6220,7 @@ glabel func0f18d238 /* f18d280: 24060008 */ addiu $a2,$zero,0x8 .L0f18d284: /* f18d284: 02402025 */ or $a0,$s2,$zero -/* f18d288: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d288: 0fc354be */ jal savefileGetSomething /* f18d28c: 92250097 */ lbu $a1,0x97($s1) /* f18d290: 2610fff8 */ addiu $s0,$s0,-8 /* f18d294: 1613fff7 */ bne $s0,$s3,.L0f18d274 @@ -6258,16 +6258,16 @@ glabel func0f18d2b8 /* f18d304: 0fc35539 */ jal func0f0d54e4 /* f18d308: 24060001 */ addiu $a2,$zero,0x1 /* f18d30c: 02602025 */ or $a0,$s3,$zero -/* f18d310: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d310: 0fc354fe */ jal savefileGetInteger /* f18d314: 2405001c */ addiu $a1,$zero,0x1c /* f18d318: 12000037 */ beqz $s0,.L0f18d3f8 /* f18d31c: aea20068 */ sw $v0,0x68($s5) /* f18d320: 02602025 */ or $a0,$s3,$zero -/* f18d324: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d324: 0fc354fe */ jal savefileGetInteger /* f18d328: 24050007 */ addiu $a1,$zero,0x7 /* f18d32c: a2a2000f */ sb $v0,0xf($s5) /* f18d330: 02602025 */ or $a0,$s3,$zero -/* f18d334: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d334: 0fc354fe */ jal savefileGetInteger /* f18d338: 24050007 */ addiu $a1,$zero,0x7 /* f18d33c: a2a20010 */ sb $v0,0x10($s5) /* f18d340: 02602025 */ or $a0,$s3,$zero @@ -6319,10 +6319,10 @@ glabel func0f18d2b8 /* f18d3f4: a2a0000f */ sb $zero,0xf($s5) .L0f18d3f8: /* f18d3f8: 02602025 */ or $a0,$s3,$zero -/* f18d3fc: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d3fc: 0fc354fe */ jal savefileGetInteger /* f18d400: 24050007 */ addiu $a1,$zero,0x7 /* f18d404: 02602025 */ or $a0,$s3,$zero -/* f18d408: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d408: 0fc354fe */ jal savefileGetInteger /* f18d40c: 24050007 */ addiu $a1,$zero,0x7 /* f18d410: 02602025 */ or $a0,$s3,$zero /* f18d414: 0fc355e7 */ jal func0f0d579c @@ -6330,75 +6330,75 @@ glabel func0f18d2b8 .L0f18d41c: /* f18d41c: 02602025 */ or $a0,$s3,$zero .L0f18d420: -/* f18d420: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d420: 0fc354fe */ jal savefileGetInteger /* f18d424: 24050008 */ addiu $a1,$zero,0x8 /* f18d428: aea20014 */ sw $v0,0x14($s5) /* f18d42c: 02602025 */ or $a0,$s3,$zero -/* f18d430: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d430: 0fc354fe */ jal savefileGetInteger /* f18d434: 24050014 */ addiu $a1,$zero,0x14 /* f18d438: aea20054 */ sw $v0,0x54($s5) /* f18d43c: 02602025 */ or $a0,$s3,$zero -/* f18d440: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d440: 0fc354fe */ jal savefileGetInteger /* f18d444: 24050014 */ addiu $a1,$zero,0x14 /* f18d448: aea20058 */ sw $v0,0x58($s5) /* f18d44c: 02602025 */ or $a0,$s3,$zero -/* f18d450: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d450: 0fc354fe */ jal savefileGetInteger /* f18d454: 24050013 */ addiu $a1,$zero,0x13 /* f18d458: aea2005c */ sw $v0,0x5c($s5) /* f18d45c: 02602025 */ or $a0,$s3,$zero -/* f18d460: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d460: 0fc354fe */ jal savefileGetInteger /* f18d464: 24050013 */ addiu $a1,$zero,0x13 /* f18d468: aea20060 */ sw $v0,0x60($s5) /* f18d46c: 02602025 */ or $a0,$s3,$zero -/* f18d470: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d470: 0fc354fe */ jal savefileGetInteger /* f18d474: 24050013 */ addiu $a1,$zero,0x13 /* f18d478: aea20064 */ sw $v0,0x64($s5) /* f18d47c: 02602025 */ or $a0,$s3,$zero -/* f18d480: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d480: 0fc354fe */ jal savefileGetInteger /* f18d484: 24050019 */ addiu $a1,$zero,0x19 /* f18d488: aea2006c */ sw $v0,0x6c($s5) /* f18d48c: 02602025 */ or $a0,$s3,$zero -/* f18d490: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d490: 0fc354fe */ jal savefileGetInteger /* f18d494: 2405000a */ addiu $a1,$zero,0xa /* f18d498: aea20070 */ sw $v0,0x70($s5) /* f18d49c: 02602025 */ or $a0,$s3,$zero -/* f18d4a0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d4a0: 0fc354fe */ jal savefileGetInteger /* f18d4a4: 2405001a */ addiu $a1,$zero,0x1a /* f18d4a8: aea20074 */ sw $v0,0x74($s5) /* f18d4ac: 02602025 */ or $a0,$s3,$zero -/* f18d4b0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d4b0: 0fc354fe */ jal savefileGetInteger /* f18d4b4: 2405001a */ addiu $a1,$zero,0x1a /* f18d4b8: aea20078 */ sw $v0,0x78($s5) /* f18d4bc: 02602025 */ or $a0,$s3,$zero -/* f18d4c0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d4c0: 0fc354fe */ jal savefileGetInteger /* f18d4c4: 24050014 */ addiu $a1,$zero,0x14 /* f18d4c8: aea2007c */ sw $v0,0x7c($s5) /* f18d4cc: 02602025 */ or $a0,$s3,$zero -/* f18d4d0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d4d0: 0fc354fe */ jal savefileGetInteger /* f18d4d4: 2405001e */ addiu $a1,$zero,0x1e /* f18d4d8: aea20080 */ sw $v0,0x80($s5) /* f18d4dc: 02602025 */ or $a0,$s3,$zero -/* f18d4e0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d4e0: 0fc354fe */ jal savefileGetInteger /* f18d4e4: 24050012 */ addiu $a1,$zero,0x12 /* f18d4e8: aea20084 */ sw $v0,0x84($s5) /* f18d4ec: 02602025 */ or $a0,$s3,$zero -/* f18d4f0: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d4f0: 0fc354fe */ jal savefileGetInteger /* f18d4f4: 24050012 */ addiu $a1,$zero,0x12 /* f18d4f8: aea20088 */ sw $v0,0x88($s5) /* f18d4fc: 02602025 */ or $a0,$s3,$zero -/* f18d500: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d500: 0fc354fe */ jal savefileGetInteger /* f18d504: 24050012 */ addiu $a1,$zero,0x12 /* f18d508: aea2008c */ sw $v0,0x8c($s5) /* f18d50c: 02602025 */ or $a0,$s3,$zero -/* f18d510: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d510: 0fc354fe */ jal savefileGetInteger /* f18d514: 24050010 */ addiu $a1,$zero,0x10 /* f18d518: aea20090 */ sw $v0,0x90($s5) /* f18d51c: 02602025 */ or $a0,$s3,$zero -/* f18d520: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d520: 0fc354fe */ jal savefileGetInteger /* f18d524: 24050002 */ addiu $a1,$zero,0x2 /* f18d528: a2a20044 */ sb $v0,0x44($s5) /* f18d52c: 02602025 */ or $a0,$s3,$zero -/* f18d530: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d530: 0fc354fe */ jal savefileGetInteger /* f18d534: 2405000c */ addiu $a1,$zero,0xc /* f18d538: a6a20048 */ sh $v0,0x48($s5) /* f18d53c: 00008825 */ or $s1,$zero,$zero @@ -6407,7 +6407,7 @@ glabel func0f18d2b8 .L0f18d548: /* f18d548: 02602025 */ or $a0,$s3,$zero .L0f18d54c: -/* f18d54c: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d54c: 0fc354fe */ jal savefileGetInteger /* f18d550: 24050001 */ addiu $a1,$zero,0x1 /* f18d554: 02802025 */ or $a0,$s4,$zero /* f18d558: 02202825 */ or $a1,$s1,$zero @@ -6468,15 +6468,15 @@ glabel func0f18d5c4 /* f18d624: 3705ffff */ ori $a1,$t8,0xffff /* f18d628: ae050068 */ sw $a1,0x68($s0) .L0f18d62c: -/* f18d62c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d62c: 0fc354be */ jal savefileGetSomething /* f18d630: 2406001c */ addiu $a2,$zero,0x1c /* f18d634: 02602025 */ or $a0,$s3,$zero /* f18d638: 9205000f */ lbu $a1,0xf($s0) -/* f18d63c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d63c: 0fc354be */ jal savefileGetSomething /* f18d640: 24060007 */ addiu $a2,$zero,0x7 /* f18d644: 02602025 */ or $a0,$s3,$zero /* f18d648: 92050010 */ lbu $a1,0x10($s0) -/* f18d64c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d64c: 0fc354be */ jal savefileGetSomething /* f18d650: 24060007 */ addiu $a2,$zero,0x7 /* f18d654: 0fc62ec7 */ jal func0f18bb1c /* f18d658: 00000000 */ nop @@ -6505,7 +6505,7 @@ glabel func0f18d5c4 /* f18d6b0: 02602025 */ or $a0,$s3,$zero .L0f18d6b4: /* f18d6b4: 8e050014 */ lw $a1,0x14($s0) -/* f18d6b8: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d6b8: 0fc354be */ jal savefileGetSomething /* f18d6bc: 24060008 */ addiu $a2,$zero,0x8 /* f18d6c0: 8e050054 */ lw $a1,0x54($s0) /* f18d6c4: 3c010010 */ lui $at,0x10 @@ -6516,7 +6516,7 @@ glabel func0f18d5c4 /* f18d6d8: 3525ffff */ ori $a1,$t1,0xffff /* f18d6dc: ae050054 */ sw $a1,0x54($s0) .L0f18d6e0: -/* f18d6e0: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d6e0: 0fc354be */ jal savefileGetSomething /* f18d6e4: 24060014 */ addiu $a2,$zero,0x14 /* f18d6e8: 8e050058 */ lw $a1,0x58($s0) /* f18d6ec: 3c010010 */ lui $at,0x10 @@ -6527,7 +6527,7 @@ glabel func0f18d5c4 /* f18d700: 3545ffff */ ori $a1,$t2,0xffff /* f18d704: ae050058 */ sw $a1,0x58($s0) .L0f18d708: -/* f18d708: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d708: 0fc354be */ jal savefileGetSomething /* f18d70c: 24060014 */ addiu $a2,$zero,0x14 /* f18d710: 8e05005c */ lw $a1,0x5c($s0) /* f18d714: 3c110008 */ lui $s1,0x8 @@ -6540,7 +6540,7 @@ glabel func0f18d5c4 /* f18d730: ae05005c */ sw $a1,0x5c($s0) .L0f18d734: /* f18d734: 3c120007 */ lui $s2,0x7 -/* f18d738: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d738: 0fc354be */ jal savefileGetSomething /* f18d73c: 3652ffff */ ori $s2,$s2,0xffff /* f18d740: 8e050060 */ lw $a1,0x60($s0) /* f18d744: 02602025 */ or $a0,$s3,$zero @@ -6550,7 +6550,7 @@ glabel func0f18d5c4 /* f18d754: ae120060 */ sw $s2,0x60($s0) /* f18d758: 02402825 */ or $a1,$s2,$zero .L0f18d75c: -/* f18d75c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d75c: 0fc354be */ jal savefileGetSomething /* f18d760: 24060013 */ addiu $a2,$zero,0x13 /* f18d764: 8e050064 */ lw $a1,0x64($s0) /* f18d768: 02602025 */ or $a0,$s3,$zero @@ -6560,7 +6560,7 @@ glabel func0f18d5c4 /* f18d778: ae120064 */ sw $s2,0x64($s0) /* f18d77c: 02402825 */ or $a1,$s2,$zero .L0f18d780: -/* f18d780: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d780: 0fc354be */ jal savefileGetSomething /* f18d784: 24060013 */ addiu $a2,$zero,0x13 /* f18d788: 8e05006c */ lw $a1,0x6c($s0) /* f18d78c: 3c010200 */ lui $at,0x200 @@ -6571,7 +6571,7 @@ glabel func0f18d5c4 /* f18d7a0: 3565ffff */ ori $a1,$t3,0xffff /* f18d7a4: ae05006c */ sw $a1,0x6c($s0) .L0f18d7a8: -/* f18d7a8: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d7a8: 0fc354be */ jal savefileGetSomething /* f18d7ac: 24060019 */ addiu $a2,$zero,0x19 /* f18d7b0: 8e050070 */ lw $a1,0x70($s0) /* f18d7b4: 02602025 */ or $a0,$s3,$zero @@ -6581,7 +6581,7 @@ glabel func0f18d5c4 /* f18d7c4: 240503ff */ addiu $a1,$zero,0x3ff /* f18d7c8: ae050070 */ sw $a1,0x70($s0) .L0f18d7cc: -/* f18d7cc: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d7cc: 0fc354be */ jal savefileGetSomething /* f18d7d0: 2406000a */ addiu $a2,$zero,0xa /* f18d7d4: 8e050074 */ lw $a1,0x74($s0) /* f18d7d8: 3c110400 */ lui $s1,0x400 @@ -6592,7 +6592,7 @@ glabel func0f18d5c4 /* f18d7ec: 35a5ffff */ ori $a1,$t5,0xffff /* f18d7f0: ae050074 */ sw $a1,0x74($s0) .L0f18d7f4: -/* f18d7f4: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d7f4: 0fc354be */ jal savefileGetSomething /* f18d7f8: 2406001a */ addiu $a2,$zero,0x1a /* f18d7fc: 8e050078 */ lw $a1,0x78($s0) /* f18d800: 02602025 */ or $a0,$s3,$zero @@ -6602,7 +6602,7 @@ glabel func0f18d5c4 /* f18d810: 35c5ffff */ ori $a1,$t6,0xffff /* f18d814: ae050078 */ sw $a1,0x78($s0) .L0f18d818: -/* f18d818: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d818: 0fc354be */ jal savefileGetSomething /* f18d81c: 2406001a */ addiu $a2,$zero,0x1a /* f18d820: 8e05007c */ lw $a1,0x7c($s0) /* f18d824: 3c010010 */ lui $at,0x10 @@ -6613,7 +6613,7 @@ glabel func0f18d5c4 /* f18d838: 35e5ffff */ ori $a1,$t7,0xffff /* f18d83c: ae05007c */ sw $a1,0x7c($s0) .L0f18d840: -/* f18d840: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d840: 0fc354be */ jal savefileGetSomething /* f18d844: 24060014 */ addiu $a2,$zero,0x14 /* f18d848: 8e050080 */ lw $a1,0x80($s0) /* f18d84c: 3c014000 */ lui $at,0x4000 @@ -6624,7 +6624,7 @@ glabel func0f18d5c4 /* f18d860: 3705ffff */ ori $a1,$t8,0xffff /* f18d864: ae050080 */ sw $a1,0x80($s0) .L0f18d868: -/* f18d868: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d868: 0fc354be */ jal savefileGetSomething /* f18d86c: 2406001e */ addiu $a2,$zero,0x1e /* f18d870: 8e050084 */ lw $a1,0x84($s0) /* f18d874: 3c110004 */ lui $s1,0x4 @@ -6637,7 +6637,7 @@ glabel func0f18d5c4 /* f18d890: ae050084 */ sw $a1,0x84($s0) .L0f18d894: /* f18d894: 3c120003 */ lui $s2,0x3 -/* f18d898: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d898: 0fc354be */ jal savefileGetSomething /* f18d89c: 3652ffff */ ori $s2,$s2,0xffff /* f18d8a0: 8e050088 */ lw $a1,0x88($s0) /* f18d8a4: 02602025 */ or $a0,$s3,$zero @@ -6647,7 +6647,7 @@ glabel func0f18d5c4 /* f18d8b4: ae120088 */ sw $s2,0x88($s0) /* f18d8b8: 02402825 */ or $a1,$s2,$zero .L0f18d8bc: -/* f18d8bc: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d8bc: 0fc354be */ jal savefileGetSomething /* f18d8c0: 24060012 */ addiu $a2,$zero,0x12 /* f18d8c4: 8e05008c */ lw $a1,0x8c($s0) /* f18d8c8: 02602025 */ or $a0,$s3,$zero @@ -6657,7 +6657,7 @@ glabel func0f18d5c4 /* f18d8d8: ae12008c */ sw $s2,0x8c($s0) /* f18d8dc: 02402825 */ or $a1,$s2,$zero .L0f18d8e0: -/* f18d8e0: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d8e0: 0fc354be */ jal savefileGetSomething /* f18d8e4: 24060012 */ addiu $a2,$zero,0x12 /* f18d8e8: 8e050090 */ lw $a1,0x90($s0) /* f18d8ec: 3c010001 */ lui $at,0x1 @@ -6668,15 +6668,15 @@ glabel func0f18d5c4 /* f18d900: 3405ffff */ dli $a1,0xffff /* f18d904: ae050090 */ sw $a1,0x90($s0) .L0f18d908: -/* f18d908: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d908: 0fc354be */ jal savefileGetSomething /* f18d90c: 24060010 */ addiu $a2,$zero,0x10 /* f18d910: 02602025 */ or $a0,$s3,$zero /* f18d914: 92050044 */ lbu $a1,0x44($s0) -/* f18d918: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d918: 0fc354be */ jal savefileGetSomething /* f18d91c: 24060002 */ addiu $a2,$zero,0x2 /* f18d920: 02602025 */ or $a0,$s3,$zero /* f18d924: 96050048 */ lhu $a1,0x48($s0) -/* f18d928: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d928: 0fc354be */ jal savefileGetSomething /* f18d92c: 2406000c */ addiu $a2,$zero,0xc /* f18d930: 00008825 */ or $s1,$zero,$zero /* f18d934: 24120005 */ addiu $s2,$zero,0x5 @@ -6689,7 +6689,7 @@ glabel func0f18d5c4 /* f18d948: 02003025 */ or $a2,$s0,$zero /* f18d94c: 02602025 */ or $a0,$s3,$zero /* f18d950: 00402825 */ or $a1,$v0,$zero -/* f18d954: 0fc354be */ jal scenarioDefaultCallback44 +/* f18d954: 0fc354be */ jal savefileGetSomething /* f18d958: 24060001 */ addiu $a2,$zero,0x1 /* f18d95c: 26100001 */ addiu $s0,$s0,0x1 /* f18d960: 5612fff7 */ bnel $s0,$s2,.L0f18d940 @@ -6727,7 +6727,7 @@ glabel func0f18d9a4 /* f18d9d0: 0fc35539 */ jal func0f0d54e4 /* f18d9d4: 00003025 */ or $a2,$zero,$zero /* f18d9d8: 27a40018 */ addiu $a0,$sp,0x18 -/* f18d9dc: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18d9dc: 0fc354fe */ jal savefileGetInteger /* f18d9e0: 2405001c */ addiu $a1,$zero,0x1c /* f18d9e4: 8fae0100 */ lw $t6,0x100($sp) /* f18d9e8: adc20000 */ sw $v0,0x0($t6) @@ -7102,21 +7102,21 @@ glabel func0f18df5c /* f18df90: 0fc35539 */ jal func0f0d54e4 /* f18df94: 00003025 */ or $a2,$zero,$zero /* f18df98: 02602025 */ or $a0,$s3,$zero -/* f18df9c: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18df9c: 0fc354fe */ jal savefileGetInteger /* f18dfa0: 24050004 */ addiu $a1,$zero,0x4 /* f18dfa4: 02602025 */ or $a0,$s3,$zero -/* f18dfa8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18dfa8: 0fc354fe */ jal savefileGetInteger /* f18dfac: 24050007 */ addiu $a1,$zero,0x7 /* f18dfb0: a2a20011 */ sb $v0,0x11($s5) /* f18dfb4: 02602025 */ or $a0,$s3,$zero -/* f18dfb8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18dfb8: 0fc354fe */ jal savefileGetInteger /* f18dfbc: 24050003 */ addiu $a1,$zero,0x3 /* f18dfc0: 0fc61521 */ jal scenarioInit /* f18dfc4: a2a20010 */ sb $v0,0x10($s5) /* f18dfc8: 0fc614f4 */ jal scenarioCallback40 /* f18dfcc: 02602025 */ or $a0,$s3,$zero /* f18dfd0: 02602025 */ or $a0,$s3,$zero -/* f18dfd4: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18dfd4: 0fc354fe */ jal savefileGetInteger /* f18dfd8: 24050015 */ addiu $a1,$zero,0x15 /* f18dfdc: 96ae0016 */ lhu $t6,0x16($s5) /* f18dfe0: 3c11800b */ lui $s1,%hi(g_MpSimulants) @@ -7132,11 +7132,11 @@ glabel func0f18df5c .L0f18e008: /* f18e008: a2200000 */ sb $zero,0x0($s1) /* f18e00c: 02602025 */ or $a0,$s3,$zero -/* f18e010: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e010: 0fc354fe */ jal savefileGetInteger /* f18e014: 24050005 */ addiu $a1,$zero,0x5 /* f18e018: a2220047 */ sb $v0,0x47($s1) /* f18e01c: 02602025 */ or $a0,$s3,$zero -/* f18e020: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e020: 0fc354fe */ jal savefileGetInteger /* f18e024: 24050003 */ addiu $a1,$zero,0x3 /* f18e028: a2220048 */ sb $v0,0x48($s1) /* f18e02c: 00001825 */ or $v1,$zero,$zero @@ -7156,15 +7156,15 @@ glabel func0f18df5c /* f18e060: 03095025 */ or $t2,$t8,$t1 /* f18e064: a6aa0016 */ sh $t2,0x16($s5) .L0f18e068: -/* f18e068: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e068: 0fc354fe */ jal savefileGetInteger /* f18e06c: 24050007 */ addiu $a1,$zero,0x7 /* f18e070: a222000f */ sb $v0,0xf($s1) /* f18e074: 02602025 */ or $a0,$s3,$zero -/* f18e078: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e078: 0fc354fe */ jal savefileGetInteger /* f18e07c: 24050007 */ addiu $a1,$zero,0x7 /* f18e080: a2220010 */ sb $v0,0x10($s1) /* f18e084: 02602025 */ or $a0,$s3,$zero -/* f18e088: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e088: 0fc354fe */ jal savefileGetInteger /* f18e08c: 24050003 */ addiu $a1,$zero,0x3 /* f18e090: 26520001 */ addiu $s2,$s2,0x1 /* f18e094: 2a410008 */ slti $at,$s2,0x8 @@ -7180,7 +7180,7 @@ glabel func0f18df5c /* f18e0bc: 2610cb88 */ addiu $s0,$s0,%lo(g_MpSetup) .L0f18e0c0: /* f18e0c0: 02602025 */ or $a0,$s3,$zero -/* f18e0c4: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e0c4: 0fc354fe */ jal savefileGetInteger /* f18e0c8: 24050007 */ addiu $a1,$zero,0x7 /* f18e0cc: 26100001 */ addiu $s0,$s0,0x1 /* f18e0d0: 0211082b */ sltu $at,$s0,$s1 @@ -7189,15 +7189,15 @@ glabel func0f18df5c /* f18e0dc: 0fc6244f */ jal func0f18913c /* f18e0e0: 00000000 */ nop /* f18e0e4: 02602025 */ or $a0,$s3,$zero -/* f18e0e8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e0e8: 0fc354fe */ jal savefileGetInteger /* f18e0ec: 24050006 */ addiu $a1,$zero,0x6 /* f18e0f0: a2a20012 */ sb $v0,0x12($s5) /* f18e0f4: 02602025 */ or $a0,$s3,$zero -/* f18e0f8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e0f8: 0fc354fe */ jal savefileGetInteger /* f18e0fc: 24050007 */ addiu $a1,$zero,0x7 /* f18e100: a2a20013 */ sb $v0,0x13($s5) /* f18e104: 02602025 */ or $a0,$s3,$zero -/* f18e108: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e108: 0fc354fe */ jal savefileGetInteger /* f18e10c: 24050009 */ addiu $a1,$zero,0x9 /* f18e110: 3c10800b */ lui $s0,%hi(g_MpPlayers) /* f18e114: 3c11800b */ lui $s1,%hi(g_MpPlayers+0x280) @@ -7206,7 +7206,7 @@ glabel func0f18df5c /* f18e120: 2610c7b8 */ addiu $s0,$s0,%lo(g_MpPlayers) .L0f18e124: /* f18e124: 02602025 */ or $a0,$s3,$zero -/* f18e128: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e128: 0fc354fe */ jal savefileGetInteger /* f18e12c: 24050003 */ addiu $a1,$zero,0x3 /* f18e130: 261000a0 */ addiu $s0,$s0,0xa0 /* f18e134: 1611fffb */ bne $s0,$s1,.L0f18e124 @@ -7255,21 +7255,21 @@ glabel func0f18e16c /* f18e1c8: 262e0004 */ addiu $t6,$s1,0x4 /* f18e1cc: 02402025 */ or $a0,$s2,$zero /* f18e1d0: 02002825 */ or $a1,$s0,$zero -/* f18e1d4: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e1d4: 0fc354be */ jal savefileGetSomething /* f18e1d8: 24060004 */ addiu $a2,$zero,0x4 /* f18e1dc: 02402025 */ or $a0,$s2,$zero /* f18e1e0: 92650011 */ lbu $a1,0x11($s3) -/* f18e1e4: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e1e4: 0fc354be */ jal savefileGetSomething /* f18e1e8: 24060007 */ addiu $a2,$zero,0x7 /* f18e1ec: 02402025 */ or $a0,$s2,$zero /* f18e1f0: 92650010 */ lbu $a1,0x10($s3) -/* f18e1f4: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e1f4: 0fc354be */ jal savefileGetSomething /* f18e1f8: 24060003 */ addiu $a2,$zero,0x3 /* f18e1fc: 0fc6150a */ jal scenarioCallback44 /* f18e200: 02402025 */ or $a0,$s2,$zero /* f18e204: 02402025 */ or $a0,$s2,$zero /* f18e208: 8e65000c */ lw $a1,0xc($s3) -/* f18e20c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e20c: 0fc354be */ jal savefileGetSomething /* f18e210: 24060015 */ addiu $a2,$zero,0x15 /* f18e214: 3c10800b */ lui $s0,%hi(g_MpSimulants) /* f18e218: 2610c538 */ addiu $s0,$s0,%lo(g_MpSimulants) @@ -7277,7 +7277,7 @@ glabel func0f18e16c .L0f18e220: /* f18e220: 02402025 */ or $a0,$s2,$zero /* f18e224: 92050047 */ lbu $a1,0x47($s0) -/* f18e228: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e228: 0fc354be */ jal savefileGetSomething /* f18e22c: 24060005 */ addiu $a2,$zero,0x5 /* f18e230: 96680016 */ lhu $t0,0x16($s3) /* f18e234: 26290004 */ addiu $t1,$s1,0x4 @@ -7288,18 +7288,18 @@ glabel func0f18e16c /* f18e248: 02402025 */ or $a0,$s2,$zero /* f18e24c: 02402025 */ or $a0,$s2,$zero /* f18e250: 92050048 */ lbu $a1,0x48($s0) -/* f18e254: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e254: 0fc354be */ jal savefileGetSomething /* f18e258: 24060003 */ addiu $a2,$zero,0x3 /* f18e25c: 10000005 */ b .L0f18e274 /* f18e260: 02402025 */ or $a0,$s2,$zero .L0f18e264: /* f18e264: 24050006 */ addiu $a1,$zero,0x6 -/* f18e268: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e268: 0fc354be */ jal savefileGetSomething /* f18e26c: 24060003 */ addiu $a2,$zero,0x3 /* f18e270: 02402025 */ or $a0,$s2,$zero .L0f18e274: /* f18e274: 9205000f */ lbu $a1,0xf($s0) -/* f18e278: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e278: 0fc354be */ jal savefileGetSomething /* f18e27c: 24060007 */ addiu $a2,$zero,0x7 /* f18e280: 92020010 */ lbu $v0,0x10($s0) /* f18e284: 240100ff */ addiu $at,$zero,0xff @@ -7323,11 +7323,11 @@ glabel func0f18e16c /* f18e2c4: 84a57730 */ lh $a1,%lo(g_MpSimulantTypes+0x4)($a1) .L0f18e2c8: /* f18e2c8: 02402025 */ or $a0,$s2,$zero -/* f18e2cc: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e2cc: 0fc354be */ jal savefileGetSomething /* f18e2d0: 24060007 */ addiu $a2,$zero,0x7 /* f18e2d4: 02402025 */ or $a0,$s2,$zero /* f18e2d8: 92050011 */ lbu $a1,0x11($s0) -/* f18e2dc: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e2dc: 0fc354be */ jal savefileGetSomething /* f18e2e0: 24060003 */ addiu $a2,$zero,0x3 /* f18e2e4: 26310001 */ addiu $s1,$s1,0x1 /* f18e2e8: 2a210008 */ slti $at,$s1,0x8 @@ -7340,7 +7340,7 @@ glabel func0f18e16c /* f18e304: 02402025 */ or $a0,$s2,$zero .L0f18e308: /* f18e308: 92050018 */ lbu $a1,0x18($s0) -/* f18e30c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e30c: 0fc354be */ jal savefileGetSomething /* f18e310: 24060007 */ addiu $a2,$zero,0x7 /* f18e314: 26100001 */ addiu $s0,$s0,0x1 /* f18e318: 0211082b */ sltu $at,$s0,$s1 @@ -7348,15 +7348,15 @@ glabel func0f18e16c /* f18e320: 02402025 */ or $a0,$s2,$zero /* f18e324: 02402025 */ or $a0,$s2,$zero /* f18e328: 92650012 */ lbu $a1,0x12($s3) -/* f18e32c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e32c: 0fc354be */ jal savefileGetSomething /* f18e330: 24060006 */ addiu $a2,$zero,0x6 /* f18e334: 02402025 */ or $a0,$s2,$zero /* f18e338: 92650013 */ lbu $a1,0x13($s3) -/* f18e33c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e33c: 0fc354be */ jal savefileGetSomething /* f18e340: 24060007 */ addiu $a2,$zero,0x7 /* f18e344: 02402025 */ or $a0,$s2,$zero /* f18e348: 96650014 */ lhu $a1,0x14($s3) -/* f18e34c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e34c: 0fc354be */ jal savefileGetSomething /* f18e350: 24060009 */ addiu $a2,$zero,0x9 /* f18e354: 3c10800b */ lui $s0,%hi(g_MpPlayers) /* f18e358: 3c11800b */ lui $s1,%hi(g_MpPlayers+0x280) @@ -7365,7 +7365,7 @@ glabel func0f18e16c /* f18e364: 02402025 */ or $a0,$s2,$zero .L0f18e368: /* f18e368: 92050011 */ lbu $a1,0x11($s0) -/* f18e36c: 0fc354be */ jal scenarioDefaultCallback44 +/* f18e36c: 0fc354be */ jal savefileGetSomething /* f18e370: 24060003 */ addiu $a2,$zero,0x3 /* f18e374: 261000a0 */ addiu $s0,$s0,0xa0 /* f18e378: 5611fffb */ bnel $s0,$s1,.L0f18e368 @@ -7396,17 +7396,17 @@ glabel func0f18e39c /* f18e3cc: 0fc35539 */ jal func0f0d54e4 /* f18e3d0: 00003025 */ or $a2,$zero,$zero /* f18e3d4: 27a40018 */ addiu $a0,$sp,0x18 -/* f18e3d8: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e3d8: 0fc354fe */ jal savefileGetInteger /* f18e3dc: 24050004 */ addiu $a1,$zero,0x4 /* f18e3e0: 8fae0100 */ lw $t6,0x100($sp) /* f18e3e4: 27a40018 */ addiu $a0,$sp,0x18 /* f18e3e8: 24050007 */ addiu $a1,$zero,0x7 -/* f18e3ec: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e3ec: 0fc354fe */ jal savefileGetInteger /* f18e3f0: a5c20000 */ sh $v0,0x0($t6) /* f18e3f4: 8faf0104 */ lw $t7,0x104($sp) /* f18e3f8: 27a40018 */ addiu $a0,$sp,0x18 /* f18e3fc: 24050003 */ addiu $a1,$zero,0x3 -/* f18e400: 0fc354fe */ jal scenarioDefaultCallback40 +/* f18e400: 0fc354fe */ jal savefileGetInteger /* f18e404: a5e20000 */ sh $v0,0x0($t7) /* f18e408: 8fb80108 */ lw $t8,0x108($sp) /* f18e40c: a7020000 */ sh $v0,0x0($t8) diff --git a/src/include/game/game_0d4690.h b/src/include/game/game_0d4690.h index 3a56232ee..2fd7d2566 100644 --- a/src/include/game/game_0d4690.h +++ b/src/include/game/game_0d4690.h @@ -10,13 +10,13 @@ u32 func0f0d49c8(void); u32 func0f0d4a3c(void); u32 func0f0d4c80(void); u32 func0f0d4d0c(void); -void scenarioDefaultCallback44(s32 *arg0, s32 arg1, s32 arg2); +void savefileGetSomething(s32 *arg0, s32 arg1, s32 arg2); u32 func0f0d5360(void); -s32 scenarioDefaultCallback40(s32 *arg0, s32 arg1); +s32 savefileGetInteger(s32 *arg0, s32 arg1); u32 func0f0d545c(void); -u32 func0f0d5484(void); +void func0f0d5484(s32 *arg0, char *arg1, s32 arg2); u32 func0f0d54c4(void); -u32 func0f0d54e4(void); +void func0f0d54e4(s32 *arg0, char *arg1, s32 arg2); u32 func0f0d55a4(void); void func0f0d564c(char *arg0, char *buffer, s32 arg2); void func0f0d5690(void *arg0, char *buffer);