From 2872b3b59505acc8fbd326d3b9b56e8cc6407766 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 10 Jan 2020 21:56:29 +1000 Subject: [PATCH] Decompile scenarioHtbRadar --- src/game/game_176d70.c | 20 ++++++++++---------- src/game/game_187770.c | 2 +- src/include/game/game_176d70.h | 12 ++++++------ src/include/types.h | 2 +- src/setup/setup_020df0.c | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index dfb16e218..807a100a2 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -10627,7 +10627,7 @@ void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3) *arg3 = mpchr->unk3c; } -s32 scenarioHtbCallback20(s32 arg0) +s32 scenarioHtbRadar(s32 value) { if ((g_MpSetup.options & MPOPTION_SHOWONRADAR1) && g_ScenarioData.htb.token != NULL && @@ -10637,10 +10637,10 @@ s32 scenarioHtbCallback20(s32 arg0) dist.x = g_ScenarioData.htb.pos.x - g_Vars.currentplayer->prop->pos.x; dist.y = g_ScenarioData.htb.pos.y - g_Vars.currentplayer->prop->pos.y; dist.z = g_ScenarioData.htb.pos.z - g_Vars.currentplayer->prop->pos.z; - arg0 = func0f18e9ec(arg0, g_ScenarioData.htb.token, &dist, 0xff0000, 0, 1); + value = func0f18e9ec(value, g_ScenarioData.htb.token, &dist, 0xff0000, 0, 1); } - return arg0; + return value; } GLOBAL_ASM( @@ -11229,7 +11229,7 @@ void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3) } GLOBAL_ASM( -glabel scenarioCtcCallback20 +glabel scenarioCtcRadar /* f1814bc: 27bdff98 */ addiu $sp,$sp,-104 /* f1814c0: 3c0e800b */ lui $t6,0x800b /* f1814c4: 8dcecb94 */ lw $t6,-0x346c($t6) @@ -12635,7 +12635,7 @@ void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3) } GLOBAL_ASM( -glabel scenarioKohCallback20 +glabel scenarioKohRadar /* f1829e4: 3c0e800b */ lui $t6,0x800b /* f1829e8: 8dcecb94 */ lw $t6,-0x346c($t6) /* f1829ec: 27bdffc8 */ addiu $sp,$sp,-56 @@ -13796,7 +13796,7 @@ void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3) } GLOBAL_ASM( -glabel scenarioHtmCallback20 +glabel scenarioHtmRadar /* f183d10: 27bdff58 */ addiu $sp,$sp,-168 /* f183d14: afb70048 */ sw $s7,0x48($sp) /* f183d18: 3c17800b */ lui $s7,%hi(g_MpSetup) @@ -14969,7 +14969,7 @@ void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3) *arg3 = mpchr->unk3c; } -s32 scenarioPacCallback20(s32 value) +s32 scenarioPacRadar(s32 value) { return value; } @@ -15976,10 +15976,10 @@ glabel func0f185c14 /* f185d5c: 27bd0020 */ addiu $sp,$sp,0x20 ); -s32 scenarioCallback20(s32 value) +s32 scenarioRadar(s32 value) { - if (g_Vars.unk000318 && g_MpScenarios[g_MpSetup.scenario].unk20) { - return g_MpScenarios[g_MpSetup.scenario].unk20(value); + if (g_Vars.unk000318 && g_MpScenarios[g_MpSetup.scenario].radarfunc) { + return g_MpScenarios[g_MpSetup.scenario].radarfunc(value); } return value; diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 32be8c422..232f29d1f 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -10093,7 +10093,7 @@ glabel func0f18f874 /* f18ff58: 1420ffc1 */ bnez $at,.L0f18fe60 /* f18ff5c: 00000000 */ sll $zero,$zero,0x0 .L0f18ff60: -/* f18ff60: 0fc61758 */ jal scenarioCallback20 +/* f18ff60: 0fc61758 */ jal scenarioRadar /* f18ff64: 8fa40088 */ lw $a0,0x88($sp) /* f18ff68: 8e480284 */ lw $t0,0x284($s2) /* f18ff6c: afa20088 */ sw $v0,0x88($sp) diff --git a/src/include/game/game_176d70.h b/src/include/game/game_176d70.h index 22ce984b5..ba24eede6 100644 --- a/src/include/game/game_176d70.h +++ b/src/include/game/game_176d70.h @@ -90,7 +90,7 @@ void scenarioHtbCallback10(void); void scenarioHtbCallback14(struct chrdata *chr); u32 scenarioHtbCallback18(void); void scenarioHtbKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3); -s32 scenarioHtbCallback20(s32 arg0); +s32 scenarioHtbRadar(s32 value); bool scenarioHtbCallback24(void *arg0, struct prop *prop); u32 scenarioHtbCallback28(void); void scenarioCtcInit(void); @@ -99,7 +99,7 @@ void scenarioCtcCallback10(void); void scenarioCtcCallback14(); void scenarioCtcReset(void); void scenarioCtcKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3); -s32 scenarioCtcCallback20(s32 value); +s32 scenarioCtcRadar(s32 value); bool scenarioCtcCallback24(void *arg0, struct prop *prop); u32 scenarioCtcCallback28(void); u32 func0f181800(void); @@ -114,7 +114,7 @@ void scenarioKohReset(void); void scenarioKohCallback10(void); u32 scenarioKohCallback18(void); void scenarioKohKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3); -s32 scenarioKohCallback20(s32 value); +s32 scenarioKohRadar(s32 value); u32 func0f182aac(void); bool scenarioKohCallback34(s16 arg0); void scenarioKohCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3); @@ -128,7 +128,7 @@ void scenarioHtmCallback10(void); void scenarioHtmCallback14(struct chrdata *chr); u32 scenarioHtmCallback18(void); void scenarioHtmKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3); -s32 scenarioHtmCallback20(s32 value); +s32 scenarioHtmRadar(s32 value); bool scenarioHtmCallback24(void *arg0, struct prop *prop); u32 scenarioHtmCallback28(void); void scenarioPacChooseVictims(void); @@ -140,7 +140,7 @@ u32 func0f1847b8(void); void scenarioPacCallback10(void); u32 scenarioPacCallback18(void); void scenarioPacKill(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3); -s32 scenarioPacCallback20(s32 value); +s32 scenarioPacRadar(s32 value); bool scenarioPacCallback24(void *arg0, struct prop *prop); u32 func0f184fb0(void); u32 func0f18500c(void); @@ -154,7 +154,7 @@ void scenarioCallback10(void); void scenarioCallback14(struct chrdata *chr); u32 func0f185774(void); u32 func0f185c14(void); -s32 scenarioCallback20(s32 value); +s32 scenarioRadar(s32 value); bool scenarioCallback24(void *arg0, struct prop *prop); u32 func0f185e20(void); f32 scenarioCallback2c(f32 arg0, s32 arg1, s32 arg2, s32 arg3); diff --git a/src/include/types.h b/src/include/types.h index 74588a869..cc1f2bf07 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4115,7 +4115,7 @@ struct mpscenario { void (*unk14)(struct chrdata *chr); void *unk18; void (*killfunc)(struct mpchr *mpchr, s32 arg1, s32 *score, s32 *arg3); - s32 (*unk20)(s32 value); + s32 (*radarfunc)(s32 value); bool (*unk24)(void *arg0, struct prop *prop); void *unk28; bool (*unk2c)(f32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 *arg4); diff --git a/src/setup/setup_020df0.c b/src/setup/setup_020df0.c index 556f0e042..dc432e2cc 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, scenarioHtbReset, scenarioHtbCallback10, scenarioHtbCallback14, scenarioHtbCallback18, scenarioHtbKill, scenarioHtbCallback20, scenarioHtbCallback24, scenarioHtbCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mphackeroptions, scenarioHtmInit, scenarioHtmCallback08, scenarioHtmReset, scenarioHtmCallback10, scenarioHtmCallback14, scenarioHtmCallback18, scenarioHtmKill, scenarioHtmCallback20, scenarioHtmCallback24, scenarioHtmCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mppopacapoptions, scenarioPacInit, NULL, scenarioPacReset, scenarioPacCallback10, NULL, scenarioPacCallback18, scenarioPacKill, scenarioPacCallback20, scenarioPacCallback24, scenarioPacCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, - { &menudialog_mphilloptions, scenarioKohInit, NULL, scenarioKohReset, scenarioKohCallback10, NULL, scenarioKohCallback18, scenarioKohKill, scenarioKohCallback20, NULL, NULL, NULL, NULL, scenarioKohCallback34, scenarioKohCallback38, NULL, scenarioKohCallback40, scenarioKohCallback44 }, - { &menudialog_mpcaptureoptions, scenarioCtcInit, scenarioCtcCallback08, scenarioCtcReset, scenarioCtcCallback10, scenarioCtcCallback14, NULL, scenarioCtcKill, scenarioCtcCallback20, scenarioCtcCallback24, scenarioCtcCallback28, scenarioCtcCallback2c, scenarioCtcCallback30, scenarioCtcCallback34, scenarioCtcCallback38, NULL, NULL, NULL }, + { &menudialog_mpbriefcaseoptions, scenarioHtbInit, scenarioHtbCallback08, scenarioHtbReset, scenarioHtbCallback10, scenarioHtbCallback14, scenarioHtbCallback18, scenarioHtbKill, scenarioHtbRadar, scenarioHtbCallback24, scenarioHtbCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &menudialog_mphackeroptions, scenarioHtmInit, scenarioHtmCallback08, scenarioHtmReset, scenarioHtmCallback10, scenarioHtmCallback14, scenarioHtmCallback18, scenarioHtmKill, scenarioHtmRadar, scenarioHtmCallback24, scenarioHtmCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &menudialog_mppopacapoptions, scenarioPacInit, NULL, scenarioPacReset, scenarioPacCallback10, NULL, scenarioPacCallback18, scenarioPacKill, scenarioPacRadar, scenarioPacCallback24, scenarioPacCallback28, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, + { &menudialog_mphilloptions, scenarioKohInit, NULL, scenarioKohReset, scenarioKohCallback10, NULL, scenarioKohCallback18, scenarioKohKill, scenarioKohRadar, NULL, NULL, NULL, NULL, scenarioKohCallback34, scenarioKohCallback38, NULL, scenarioKohCallback40, scenarioKohCallback44 }, + { &menudialog_mpcaptureoptions, scenarioCtcInit, scenarioCtcCallback08, scenarioCtcReset, scenarioCtcCallback10, scenarioCtcCallback14, NULL, scenarioCtcKill, scenarioCtcRadar, scenarioCtcCallback24, scenarioCtcCallback28, scenarioCtcCallback2c, scenarioCtcCallback30, scenarioCtcCallback34, scenarioCtcCallback38, NULL, NULL, NULL }, }; // 2d168