From b46fd405ab3c8be7b7b929f010e179a6d4789e48 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 11 Sep 2020 23:44:28 +1000 Subject: [PATCH] Decompile menudialogAbortMission --- src/game/game_102240.c | 19 ++++++++++--------- src/include/game/game_102240.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 9095c3d50..f1ff84f60 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -3938,13 +3938,14 @@ s32 menuhandlerAbortMission(u32 operation, struct menuitem *item, union handlerd return 0; } -GLOBAL_ASM( -glabel menudialog001063d4 -/* f1063d4: afa50004 */ sw $a1,0x4($sp) -/* f1063d8: afa60008 */ sw $a2,0x8($sp) -/* f1063dc: 03e00008 */ jr $ra -/* f1063e0: 00001025 */ or $v0,$zero,$zero -); +s32 menudialogAbortMission(u32 operation, struct menudialog *dialog, union handlerdata *data) +{ + if (operation == MENUOP_TICK) { + // empty + } + + return 0; +} struct menuitem g_SoloAbortMenuItems[] = { { MENUITEMTYPE_LABEL, 0, 0x00000012, L_OPTIONS(175), 0x00000000, NULL }, // "Do you want to abort the mission?" @@ -3957,7 +3958,7 @@ struct menudialog g_SoloAbortMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(174), // "Warning" g_SoloAbortMenuItems, - menudialog001063d4, + menudialogAbortMission, 0x00000000, NULL, }; @@ -3973,7 +3974,7 @@ struct menudialog g_SoloAbortShortMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS(174), // "Warning" g_SoloAbortShortMenuItems, - menudialog001063d4, + menudialogAbortMission, 0x00000000, NULL, }; diff --git a/src/include/game/game_102240.h b/src/include/game/game_102240.h index 157a2a12e..21f865e36 100644 --- a/src/include/game/game_102240.h +++ b/src/include/game/game_102240.h @@ -27,7 +27,7 @@ s32 menudialog00103608(u32 operation, struct menudialog *dialog, union handlerda s32 menudialogCoopAntiOptions(u32 operation, struct menudialog *dialog, union handlerdata *data); s32 menudialog0010559c(u32 operation, struct menudialog *dialog, union handlerdata *data); s32 menudialog00105c54(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialog001063d4(u32 operation, struct menudialog *dialog, union handlerdata *data); +s32 menudialogAbortMission(u32 operation, struct menudialog *dialog, union handlerdata *data); s32 soloMenuDialogPauseStatus(u32 operation, struct menudialog *dialog, union handlerdata *data); s32 menuhandler001024dc(u32 operation, struct menuitem *item, union handlerdata *data); s32 menuhandler001024fc(u32 operation, struct menuitem *item, union handlerdata *data);