From 54afc3fcb6de17a6d191e81d0768ad2182920eb8 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 8 Jan 2020 19:13:36 +1000 Subject: [PATCH] Decompile scenarioPacReset --- src/game/game_00c490.c | 2 +- src/game/game_176d70.c | 29 +++++++++++------------------ src/include/game/game_176d70.h | 12 ++++++------ src/include/types.h | 2 +- src/setup/setup_020df0.c | 10 +++++----- 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 7d5e4ead5..1411bede0 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -4623,7 +4623,7 @@ glabel func0f00f174 /* f010404: 8defa2d8 */ lw $t7,-0x5d28($t7) /* f010408: 11e00003 */ beqz $t7,.L0f010418 /* f01040c: 00000000 */ sll $zero,$zero,0x0 -/* f010410: 0fc61548 */ jal scenarioCallback0c +/* f010410: 0fc61548 */ jal scenarioReset /* f010414: 00000000 */ sll $zero,$zero,0x0 .L0f010418: /* f010418: 3c12800a */ lui $s2,0x800a diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index d01fff12d..fcb839a52 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -10364,7 +10364,7 @@ glabel func0f1800a8 /* f1802b8: 00000000 */ sll $zero,$zero,0x0 ); -void scenarioHtbCallback0c(void) +void scenarioHtbReset(void) { var800869ec = 0; func0f1800a8(); @@ -11125,7 +11125,7 @@ void scenarioCtcCallback14() } GLOBAL_ASM( -glabel scenarioCtcCallback0c +glabel scenarioCtcReset /* f180e34: 27bdff28 */ addiu $sp,$sp,-216 /* f180e38: 3c0f8008 */ lui $t7,%hi(var80086b60) /* f180e3c: 25ef6b60 */ addiu $t7,$t7,%lo(var80086b60) @@ -12079,7 +12079,7 @@ void scenarioKohInit(void) } } -void scenarioKohCallback0c(void) +void scenarioKohReset(void) { s16 pad_id = 0; struct pad pad; @@ -13381,7 +13381,7 @@ glabel func0f182c98 ); GLOBAL_ASM( -glabel scenarioHtmCallback0c +glabel scenarioHtmReset /* f182e98: 27bdffb8 */ addiu $sp,$sp,-72 /* f182e9c: afb1002c */ sw $s1,0x2c($sp) /* f182ea0: 3c11800a */ lui $s1,0x800a @@ -14974,17 +14974,10 @@ void scenarioPacInit(void) func0f1843d4(); } -GLOBAL_ASM( -glabel scenarioPacCallback0c -/* f18450c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f184510: afbf0014 */ sw $ra,0x14($sp) -/* f184514: 0fc610f5 */ jal func0f1843d4 -/* f184518: 00000000 */ sll $zero,$zero,0x0 -/* f18451c: 8fbf0014 */ lw $ra,0x14($sp) -/* f184520: 27bd0018 */ addiu $sp,$sp,0x18 -/* f184524: 03e00008 */ jr $ra -/* f184528: 00000000 */ sll $zero,$zero,0x0 -); +void scenarioPacReset(void) +{ + func0f1843d4(); +} GLOBAL_ASM( glabel scenarioPacCallback28 @@ -16074,10 +16067,10 @@ s32 scenarioCallback08(void) return result; } -void scenarioCallback0c(void) +void scenarioReset(void) { - if (g_MpScenarios[g_MpSetup.scenario].unk0c) { - g_MpScenarios[g_MpSetup.scenario].unk0c(); + if (g_MpScenarios[g_MpSetup.scenario].resetfunc) { + g_MpScenarios[g_MpSetup.scenario].resetfunc(); } } diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index 1f422c858..193984f3d 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -85,7 +85,7 @@ s32 scenarioHtbCallback08(void); u32 func0f17ffe4(void); u32 func0f180078(void); void func0f1800a8(void); -void scenarioHtbCallback0c(void); +void scenarioHtbReset(void); void scenarioHtbCallback10(void); void scenarioHtbCallback14(struct chrdata *chr); u32 scenarioHtbCallback18(void); @@ -97,7 +97,7 @@ void scenarioCtcInit(void); s32 scenarioCtcCallback08(void); void scenarioCtcCallback10(void); void scenarioCtcCallback14(); -void scenarioCtcCallback0c(void); +void scenarioCtcReset(void); u32 scenarioCtcCallback1c(void); s32 scenarioCtcCallback20(s32 value); bool scenarioCtcCallback24(void *arg0, struct prop *prop); @@ -110,7 +110,7 @@ void scenarioCtcCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3); void scenarioKohCallback40(s32 *arg0); void scenarioKohCallback44(s32 *arg0); void scenarioKohInit(void); -void scenarioKohCallback0c(void); +void scenarioKohReset(void); void scenarioKohCallback10(void); u32 scenarioKohCallback18(void); u32 scenarioKohCallback1c(void); @@ -123,7 +123,7 @@ s32 scenarioHtmCallback08(void); u32 func0f182ba4(void); u32 func0f182bf4(void); u32 func0f182c98(void); -void scenarioHtmCallback0c(void); +void scenarioHtmReset(void); void scenarioHtmCallback10(void); void scenarioHtmCallback14(struct chrdata *chr); u32 scenarioHtmCallback18(void); @@ -133,7 +133,7 @@ bool scenarioHtmCallback24(void *arg0, struct prop *prop); u32 scenarioHtmCallback28(void); void func0f1843d4(void); void scenarioPacInit(void); -void scenarioPacCallback0c(void); +void scenarioPacReset(void); u32 scenarioPacCallback28(void); u32 func0f1845bc(void); u32 func0f1847b8(void); @@ -148,7 +148,7 @@ void scenarioCallback40(s32 *arg0); void scenarioCallback44(s32 *arg0); void scenarioInit(void); s32 scenarioCallback08(void); -void scenarioCallback0c(void); +void scenarioReset(void); void func0f185568(void); void scenarioCallback10(void); void scenarioCallback14(struct chrdata *chr); diff --git a/src/include/types.h b/src/include/types.h index ea1bbfe4a..258be4cd5 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4127,7 +4127,7 @@ struct mpscenario { struct menu_dialog *optionsdialog; void (*initfunc)(void); s32 (*unk08)(void); - void (*unk0c)(void); + void (*resetfunc)(void); void (*unk10)(void); void (*unk14)(struct chrdata *chr); void *unk18; diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 386bc9152..ea685ab71 100644 --- a/src/setup/setup_020df0.c +++ b/src/setup/setup_020df0.c @@ -11548,11 +11548,11 @@ struct menu_dialog menudialog_mppopacapoptions = { // 2cfb8 struct mpscenario g_MpScenarios[] = { { &menudialog_mpcombatoptions, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mpbriefcaseoptions, scenarioHtbInit, scenarioHtbCallback08, scenarioHtbCallback0c, scenarioHtbCallback10, scenarioHtbCallback14, scenarioHtbCallback18, scenarioHtbCallback1c, scenarioHtbCallback20, scenarioHtbCallback24, scenarioHtbCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mphackeroptions, scenarioHtmInit, scenarioHtmCallback08, scenarioHtmCallback0c, scenarioHtmCallback10, scenarioHtmCallback14, scenarioHtmCallback18, scenarioHtmCallback1c, scenarioHtmCallback20, scenarioHtmCallback24, scenarioHtmCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mppopacapoptions, scenarioPacInit, NULL, scenarioPacCallback0c, scenarioPacCallback10, NULL, scenarioPacCallback18, scenarioPacCallback1c, scenarioPacCallback20, scenarioPacCallback24, scenarioPacCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mphilloptions, scenarioKohInit, NULL, scenarioKohCallback0c, scenarioKohCallback10, NULL, scenarioKohCallback18, scenarioKohCallback1c, scenarioKohCallback20, NULL, NULL, NULL, NULL, scenarioKohCallback34, scenarioKohCallback38, NULL, scenarioKohCallback40, scenarioKohCallback44 }, - { &menudialog_mpcaptureoptions, scenarioCtcInit, scenarioCtcCallback08, scenarioCtcCallback0c, scenarioCtcCallback10, scenarioCtcCallback14, NULL, scenarioCtcCallback1c, scenarioCtcCallback20, scenarioCtcCallback24, scenarioCtcCallback28, scenarioCtcCallback2c, scenarioCtcCallback30, scenarioCtcCallback34, scenarioCtcCallback38, NULL, NULL, NULL }, + { &menudialog_mpbriefcaseoptions, scenarioHtbInit, scenarioHtbCallback08, scenarioHtbReset, scenarioHtbCallback10, scenarioHtbCallback14, scenarioHtbCallback18, scenarioHtbCallback1c, scenarioHtbCallback20, scenarioHtbCallback24, scenarioHtbCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &menudialog_mphackeroptions, scenarioHtmInit, scenarioHtmCallback08, scenarioHtmReset, scenarioHtmCallback10, scenarioHtmCallback14, scenarioHtmCallback18, scenarioHtmCallback1c, scenarioHtmCallback20, scenarioHtmCallback24, scenarioHtmCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &menudialog_mppopacapoptions, scenarioPacInit, NULL, scenarioPacReset, scenarioPacCallback10, NULL, scenarioPacCallback18, scenarioPacCallback1c, scenarioPacCallback20, scenarioPacCallback24, scenarioPacCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &menudialog_mphilloptions, scenarioKohInit, NULL, scenarioKohReset, scenarioKohCallback10, NULL, scenarioKohCallback18, scenarioKohCallback1c, scenarioKohCallback20, NULL, NULL, NULL, NULL, scenarioKohCallback34, scenarioKohCallback38, NULL, scenarioKohCallback40, scenarioKohCallback44 }, + { &menudialog_mpcaptureoptions, scenarioCtcInit, scenarioCtcCallback08, scenarioCtcReset, scenarioCtcCallback10, scenarioCtcCallback14, NULL, scenarioCtcCallback1c, scenarioCtcCallback20, scenarioCtcCallback24, scenarioCtcCallback28, scenarioCtcCallback2c, scenarioCtcCallback30, scenarioCtcCallback34, scenarioCtcCallback38, NULL, NULL, NULL }, }; // 2d168