diff --git a/include/functions.h b/include/functions.h index 7bb86dacb..4dac94871 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2103,8 +2103,8 @@ void func_8011B4E0(GlobalContext* globalCtx, s16 arg1); void func_8011C808(GlobalContext* globalCtx); // void func_8011C898(void); // void Interface_DrawTimers(void); -// void func_8011E3B4(void); -// void Interface_DrawMinigame(void); +// void Interface_UpdateTimers(void); +// void Interface_DrawMinigameIcons(void); // void Interface_Draw(UNK_TYPE4 ctxt); // void Interface_LoadStory(void); // void func_80121000(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE1 param_8, UNK_TYPE1 param_9, UNK_TYPE1 param_10, UNK_TYPE4 param_11, UNK_TYPE4 param_12, UNK_TYPE4 param_13, UNK_TYPE4 param_14); diff --git a/include/macros.h b/include/macros.h index 9333185d6..7b5b1305b 100644 --- a/include/macros.h +++ b/include/macros.h @@ -83,8 +83,6 @@ gSaveContext.save.equips.cButtonSlots[0][btn] = (slot); \ } - - #define ALL_EQUIP_VALUE(equip) ((gSaveContext.save.inventory.equipment & gEquipMasks[equip]) >> gEquipShifts[equip]) #define CUR_EQUIP_VALUE(equip) ((gSaveContext.save.equips.equipment & gEquipMasks[equip]) >> gEquipShifts[equip]) #define CUR_UPG_VALUE(upg) ((gSaveContext.save.inventory.upgrades & gUpgradeMasks[upg]) >> gUpgradeShifts[upg]) diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 926aa4323..4d9216453 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3201,11 +3201,11 @@ s16 D_801BFD0C[] = { void Interface_DrawTimers(GlobalContext* globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_DrawTimers.s") -void func_8011E3B4(GlobalContext* globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8011E3B4.s") +void Interface_UpdateTimers(GlobalContext* globalCtx); +#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_UpdateTimers.s") -void Interface_DrawMinigame(GlobalContext* globalCtx); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_DrawMinigame.s") +void Interface_DrawMinigameIcons(GlobalContext* globalCtx); +#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_DrawMinigameIcons.s") // rupeeDigitsFirst s16 D_801BFD1C[] = { 1, 0, 0, 0 }; @@ -3532,7 +3532,7 @@ void Interface_Draw(GlobalContext* globalCtx) { Interface_DrawMinigamePerfect(globalCtx); } - Interface_DrawMinigame(globalCtx); + Interface_DrawMinigameIcons(globalCtx); Interface_DrawTimers(globalCtx); } @@ -4088,7 +4088,7 @@ void Interface_Update(GlobalContext* globalCtx) { } } - func_8011E3B4(globalCtx); + Interface_UpdateTimers(globalCtx); // Update Grandma's Story if (interfaceCtx->unk_31A != 0) { diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index a70936687..862391454 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -2159,8 +2159,8 @@ 0x8011C808:("func_8011C808",), 0x8011C898:("func_8011C898",), 0x8011CA64:("Interface_DrawTimers",), - 0x8011E3B4:("func_8011E3B4",), - 0x8011E730:("Interface_DrawMinigame",), + 0x8011E3B4:("Interface_UpdateTimers",), + 0x8011E730:("Interface_DrawMinigameIcons",), 0x8011F0E0:("Interface_Draw",), 0x80120F90:("Interface_LoadStory",), 0x80121064:("Interface_AllocStory",), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index 2c8d24eae..186b55038 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -1673,8 +1673,8 @@ asm/non_matchings/code/z_parameter/Interface_DrawMinigamePerfect.s,Interface_Dra asm/non_matchings/code/z_parameter/func_8011C808.s,func_8011C808,0x8011C808,0x24 asm/non_matchings/code/z_parameter/func_8011C898.s,func_8011C898,0x8011C898,0x73 asm/non_matchings/code/z_parameter/Interface_DrawTimers.s,Interface_DrawTimers,0x8011CA64,0x654 -asm/non_matchings/code/z_parameter/func_8011E3B4.s,func_8011E3B4,0x8011E3B4,0xDF -asm/non_matchings/code/z_parameter/Interface_DrawMinigame.s,Interface_DrawMinigame,0x8011E730,0x26C +asm/non_matchings/code/z_parameter/Interface_UpdateTimers.s,Interface_UpdateTimers,0x8011E3B4,0xDF +asm/non_matchings/code/z_parameter/Interface_DrawMinigameIcons.s,Interface_DrawMinigameIcons,0x8011E730,0x26C asm/non_matchings/code/z_parameter/Interface_Draw.s,Interface_Draw,0x8011F0E0,0x7AC asm/non_matchings/code/z_parameter/Interface_LoadStory.s,Interface_LoadStory,0x80120F90,0x35 asm/non_matchings/code/z_parameter/Interface_AllocStory.s,Interface_AllocStory,0x80121064,0x1F