diff options
| -rw-r--r-- | arm9/modules/59/include/mod59_021D74E0.h | 26 | ||||
| -rw-r--r-- | arm9/modules/59/src/mod59_021D74E0_src.c | 35 |
2 files changed, 31 insertions, 30 deletions
diff --git a/arm9/modules/59/include/mod59_021D74E0.h b/arm9/modules/59/include/mod59_021D74E0.h index d193202e..059f80c8 100644 --- a/arm9/modules/59/include/mod59_021D74E0.h +++ b/arm9/modules/59/include/mod59_021D74E0.h @@ -20,30 +20,30 @@ typedef struct MOD59_OverlayData u32 heap_id; struct SaveBlock2 *sav2; struct Options *options; - u32 Unk0C; - u32 Unk10; - struct UnkStruct_02006234 *Unk14; + u32 unk0C; + u32 unk10; + struct UnkStruct_02006234 *unk14; struct BgConfig *bgConfig; u8 padding[0x10]; - u32 Unk2C; + u32 unk2C; u8 padding2[0x1C]; struct MsgData *msgData; - u32 Unk50; - u32 Unk54; + u32 unk50; + u32 unk54; u8 padding3[0x8]; - u32 Unk60; // unknown if this is the right type, possibly a pointer instead? + u32 unk60; // unknown if this is the right type, possibly a pointer instead? struct ScrStrBufs *strBufs; u8 padding4[0x8]; struct MOD59_UnkPlayerStruct *playerStruct; struct MOD59_UnkPlayerStruct *rivalStruct; - u32 Unk78; + u32 unk78; u8 padding5[0xC]; - u8 Unk88; - u8 Unk89; - u8 Unk8A; - u8 Unk8B; + u8 unk88; + u8 unk89; + u8 unk8A; + u8 unk8B; u8 padding6[4]; - u32 Unk90; + u32 unk90; u8 padding7[32]; } MOD59_OverlayData; diff --git a/arm9/modules/59/src/mod59_021D74E0_src.c b/arm9/modules/59/src/mod59_021D74E0_src.c index 5a5d0126..1a301bc1 100644 --- a/arm9/modules/59/src/mod59_021D74E0_src.c +++ b/arm9/modules/59/src/mod59_021D74E0_src.c @@ -9,6 +9,7 @@ #include "bg_window.h" #include "render_window.h" #include "msgdata.h" +#include "msgdata/msg.naix" #include "text.h" #include "script_buffers.h" #include "module_52.h" @@ -48,15 +49,15 @@ THUMB_FUNC BOOL MOD59_Init(struct UnkStruct_02006234 *param0) s32 *field18 = OverlayManager_GetField18(param0); data->sav2 = (struct SaveBlock2 *)field18[2]; //? data->options = Sav2_PlayerData_GetOptionsAddr(data->sav2); - data->Unk10 = data->Unk0C = 0; - data->Unk14 = NULL; + data->unk10 = data->unk0C = 0; + data->unk14 = NULL; data->playerStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 0, 0, 7, data->options); data->rivalStruct = (struct MOD59_UnkPlayerStruct *)FUN_02077A84(0x52, 3, 0, 7, data->options); - data->Unk88 = 0; - data->Unk89 = 0; - data->Unk8A = 0; - data->Unk8B = 0; - data->Unk90 = 0; + data->unk88 = 0; + data->unk89 = 0; + data->unk8A = 0; + data->unk8B = 0; + data->unk90 = 0; return TRUE; } @@ -101,7 +102,7 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1) *param1 = 2; } - if (data->Unk14 == NULL) + if (data->unk14 == NULL) { break; } @@ -143,13 +144,13 @@ THUMB_FUNC BOOL MOD59_021D7564(struct UnkStruct_02006234 *param0, u32 *param1) break; case 4: - if (OverlayManager_Run(data->Unk14) != TRUE) + if (OverlayManager_Run(data->unk14) != TRUE) { break; } - OverlayManager_delete(data->Unk14); - data->Unk14 = NULL; + OverlayManager_delete(data->unk14); + data->unk14 = NULL; *param1 = 5; @@ -278,7 +279,7 @@ THUMB_FUNC void MOD59_SetupBg(MOD59_OverlayData *data) ToggleBgLayer(GF_BG_LYR_SUB_3, GX_LAYER_TOGGLE_OFF); MOD59_021D8058(data); - data->Unk78 = 0; + data->unk78 = 0; } THUMB_FUNC void MOD59_DestroyBg(MOD59_OverlayData *data) @@ -308,16 +309,16 @@ THUMB_FUNC void MOD59_DestroyBg(MOD59_OverlayData *data) THUMB_FUNC void MOD59_SetupMsg(MOD59_OverlayData *data) { - data->msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 0x155, data->heap_id); + data->msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, NARC_msg_narc_0341_bin, data->heap_id); FUN_0201BD5C(); - data->Unk60 = FUN_020142EC(0, 0, 6, data->heap_id); + data->unk60 = FUN_020142EC(0, 0, 6, data->heap_id); data->strBufs = ScrStrBufs_new(data->heap_id); - data->Unk50 = 0; - data->Unk54 = 0; - data->Unk2C = 0; + data->unk50 = 0; + data->unk54 = 0; + data->unk2C = 0; } |