diff --git a/src/game/data/data_02e820.c b/src/game/data/data_02e820.c index 95a84eb84..0e72a21fb 100644 --- a/src/game/data/data_02e820.c +++ b/src/game/data/data_02e820.c @@ -19,7 +19,7 @@ #include "types.h" u32 var800897c0 = 0x1c1d0000; -u32 var800897c4 = 0xb7000500; +s8 var800897c4[] = {-73, 0, 5, 0}; u32 var800897c8 = 0x0400ff00; // 2f7ec @@ -59,7 +59,7 @@ struct menudialog menudialog_holograph = { MENUDIALOGTYPE_DEFAULT, L_MISC(471), // "Holograph" menuitems_holograph, - menudialog001a737c, + ciHangarHolographMenuDialog, 0x00000202, NULL, }; diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 1221d9851..d7e87ef72 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3934,7 +3934,7 @@ glabel menuhandler001a6ea4 ); GLOBAL_ASM( -glabel menudialog001a737c +glabel ciHangarHolographMenuDialog .late_rodata glabel var7f1b99d4 .word 0x3a83126f @@ -4067,6 +4067,48 @@ glabel var7f1b99d8 /* f1a7550: 00000000 */ nop ); +// Can't match the 4bc part +//s32 ciHangarHolographMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data) +//{ +// s32 index = ciGetHangarBioIndexBySlot(g_HangarBioSlot); +// +// if (index >= 14) { +// struct hoverprop props[9] = hoverprops; +// static s8 tmp[] = {0xb7, 0, 5, 0}; +// +// switch (operation) { +// case MENUOP_OPEN: +// g_Menus[g_MpPlayerNum].unkd88 = 0; +// g_Menus[g_MpPlayerNum].unkd60 = 0; +// g_Menus[g_MpPlayerNum].unkd8c = 0; +// g_Menus[g_MpPlayerNum].unkd64 = 0; +// g_Menus[g_MpPlayerNum].unkd78 = 0; +// g_Menus[g_MpPlayerNum].unkd50 = 0; +// g_Menus[g_MpPlayerNum].unkd7c = 0; +// g_Menus[g_MpPlayerNum].unkd54 = 0; +// g_Menus[g_MpPlayerNum].unkd5c = 0; +// break; +// case MENUOP_CLOSE: +// break; +// case MENUOP_TICK: +// if (g_Menus[g_MpPlayerNum].curframe && g_Menus[g_MpPlayerNum].curframe->dialog == dialog) { +// // 4bc +// index -= 14; +// g_Menus[g_MpPlayerNum].unkd54 = props[index].y_offset; +// g_Menus[g_MpPlayerNum].unkd84 = props[index].size * 0.001f; +// g_Menus[g_MpPlayerNum].unkd7c = props[index].y_offset; +// g_Menus[g_MpPlayerNum].unk84c = props[index].fileid; +// g_Menus[g_MpPlayerNum].unkd8c = g_Menus[g_MpPlayerNum].unkd64 + 0.01f * g_Vars.diffframe60f; +// g_Menus[g_MpPlayerNum].unkd64 += 0.01f * g_Vars.diffframe60f; +// g_Menus[g_MpPlayerNum].unkdf4 = tmp; +// } +// break; +// } +// } +// +// return 0; +//} + struct menudialog *ciGetFrWeaponListMenuDialog(void) { return &g_FrWeaponListMenuDialog; diff --git a/src/include/game/data/data_02e820.h b/src/include/game/data/data_02e820.h index 98d71cac1..ddc702478 100644 --- a/src/include/game/data/data_02e820.h +++ b/src/include/game/data/data_02e820.h @@ -39,7 +39,7 @@ extern struct menudialog g_HoloTrainingStatsFailedMenuDialog; extern struct menudialog g_HoloTrainingStatsCompletedMenuDialog; extern u32 var800897a4; extern u32 var800897b4; -extern u32 var800897c4; +extern s8 var800897c4[]; extern struct hoverprop hoverprops[]; extern struct menudialog menudialog_2f938; extern struct menudialog menudialog_2f950; diff --git a/src/include/game/game_1a3340.h b/src/include/game/game_1a3340.h index 75ace8edc..6e5410b33 100644 --- a/src/include/game/game_1a3340.h +++ b/src/include/game/game_1a3340.h @@ -44,7 +44,7 @@ s32 menudialog001a6548(u32 operation, struct menudialog *dialog, union handlerda s32 menudialogDeviceTrainingResults(u32 operation, struct menudialog *dialog, union handlerdata *data); s32 menudialog001a6aa4(u32 operation, struct menudialog *dialog, union handlerdata *data); s32 menudialogFiringRangeResults(u32 operation, struct menudialog *dialog, union handlerdata *data); -s32 menudialog001a737c(u32 operation, struct menudialog *dialog, union handlerdata *data); +s32 ciHangarHolographMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data); s32 frDetailsOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); s32 frAbortMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data); s32 menuhandler001a348c(u32 operation, struct menuitem *item, union handlerdata *data); diff --git a/src/include/types.h b/src/include/types.h index 1f19b5f8f..db88992c5 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4179,7 +4179,7 @@ struct menu { /*0xd78*/ f32 unkd78; /*0xd7c*/ f32 unkd7c; /*0xd80*/ f32 unkd80; - /*0xd84*/ u32 unkd84; + /*0xd84*/ f32 unkd84; /*0xd88*/ f32 unkd88; /*0xd8c*/ f32 unkd8c; /*0xd90*/ f32 unkd90;