`z_parameter`: Minigames (#1131)

* minigame docs

* cleanup

* vertices and cleanup

* fix bss

* change to perfectLetters

* fix parameter static

* more PR, namefixer

* PR Suggestions

assets/xml/interface/parameter_static.xml

@@ -119,13 +119,13 @@
         <Texture Name="gMinigameCountdown3Tex" OutName="minigame_countdown_3" Format="ia8" Width="24" Height="32" Offset="0x7828"/>
 
         <!-- The letters of "PERFECT!" -->
-        <Texture Name="gMinigameLetterPTex" OutName="minigame_letter_p" Format="i4" Width="32" Height="33" Offset="0x7B28"/>
+        <Texture Name="gPerfectLetterPTex" OutName="letter_perfect_p" Format="i4" Width="32" Height="33" Offset="0x7B28"/>
-        <Texture Name="gMinigameLetterETex" OutName="minigame_letter_e" Format="i4" Width="32" Height="33" Offset="0x7D38"/>
+        <Texture Name="gPerfectLetterETex" OutName="letter_perfect_e" Format="i4" Width="32" Height="33" Offset="0x7D38"/>
-        <Texture Name="gMinigameLetterRTex" OutName="minigame_letter_r" Format="i4" Width="32" Height="33" Offset="0x7F48"/>
+        <Texture Name="gPerfectLetterRTex" OutName="letter_perfect_r" Format="i4" Width="32" Height="33" Offset="0x7F48"/>
-        <Texture Name="gMinigameLetterFTex" OutName="minigame_letter_f" Format="i4" Width="32" Height="33" Offset="0x8158"/>
+        <Texture Name="gPerfectLetterFTex" OutName="letter_perfect_f" Format="i4" Width="32" Height="33" Offset="0x8158"/>
-        <Texture Name="gMinigameLetterCTex" OutName="minigame_letter_c" Format="i4" Width="32" Height="33" Offset="0x8368"/>
+        <Texture Name="gPerfectLetterCTex" OutName="letter_perfect_c" Format="i4" Width="32" Height="33" Offset="0x8368"/>
-        <Texture Name="gMinigameLetterTTex" OutName="minigame_letter_t" Format="i4" Width="32" Height="33" Offset="0x8578"/>
+        <Texture Name="gPerfectLetterTTex" OutName="letter_perfect_t" Format="i4" Width="32" Height="33" Offset="0x8578"/>
-        <Texture Name="gMinigameExclamationTex" OutName="minigame_exclamation" Format="i4" Width="32" Height="33" Offset="0x8788"/>
+        <Texture Name="gPerfectLetterExclamationTex" OutName="letter_perfect_exclamation" Format="i4" Width="32" Height="33" Offset="0x8788"/>
 
         <!-- Similar to stray fairy icons in icon_item_dungeon_static, except with a turned head -->
         <Texture Name="gStrayFairyWoodfallIconTex" OutName="stray_fairy_woodfall_icon" Format="rgba32" Width="32" Height="24" Offset="0x8998"/>

include/functions.h

@@ -1705,7 +1705,6 @@ Gfx* Gfx_DrawTexRectI8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textu
 Gfx* Gfx_DrawTexQuadIA8(Gfx* gfx, TexturePtr texture, s16 textureWidth, s16 textureHeight, u16 point);
 Gfx* Gfx_DrawTexQuad4b(Gfx* gfx, TexturePtr texture, s32 fmt, s16 textureWidth, s16 textureHeight, u16 point);
 
-// void func_8010E028(void);
 void Interface_StartTimer(s16 timerId, s16 seconds);
 void Interface_StartPostmanTimer(s16 seconds, s16 bunnyHoodState);
 void func_8010EE74(PlayState* play, s32 day);
@@ -1713,7 +1712,7 @@ void Interface_SetHudVisibility(u16 hudVisibility);
 void func_80110038(PlayState* play);
 // void func_80111CB4(void);
 // void func_801129E4(void);
-void func_80112AFC(PlayState* play);
+void Interface_InitMinigame(PlayState* play);
 void Interface_LoadItemIconImpl(PlayState* play, u8 btn);
 void Interface_LoadItemIcon(PlayState* play, u8 btn);
 void func_80112C0C(PlayState* play, u16 flag);
@@ -1741,30 +1740,13 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange);
 void Magic_Add(PlayState* play, s16 magicToAdd);
 void Magic_Reset(PlayState* play);
 s32 Magic_Consume(PlayState* play, s16 magicToConsume, s16 type);
-// void func_80116FD8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
+void Interface_SetPerfectLetters(PlayState* play, s16 perfectLettersType);
-// void func_801170B8(void);
-// void func_80117100(void);
-// void func_80117A20(void);
-// void func_80117BD0(void);
-// void func_80118084(void);
-// void func_80118890(void);
-// void func_80118BA4(void);
-// void func_80119030(void);
-// void func_80119610(void);
-void func_8011B4E0(PlayState* play, s32 arg1);
-// void func_8011B5C0(void);
-// void func_8011B9E0(void);
-// void func_8011BF70(void);
-// void func_8011C4C4(void);
 void Interface_StartMoonCrash(PlayState* play);
-// void func_8011E730(void);
+void Interface_Draw(PlayState* play);
-// void func_8011F0E0(UNK_TYPE4 ctxt);
+void Interface_Update(PlayState* play);
-// void func_80120F90(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);
-// void func_80121064(void);
-// void func_801210E0(void);
 void Interface_Destroy(PlayState* play);
-void func_80121FC4(PlayState* play);
+void Interface_Init(PlayState* play);
+
 Path* Path_GetByIndex(PlayState* play, s16 index, s16 max);
 f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw);
 void Path_CopyLastPoint(Path* path, Vec3f* dest);

include/variables.h

@@ -690,13 +690,6 @@ extern UNK_PTR D_801BF5C0;
 // extern UNK_TYPE2 D_801BF9F8;
 // extern UNK_TYPE2 D_801BF9FC;
 // extern UNK_TYPE2 D_801BFA00;
-// extern UNK_TYPE2 D_801BFA04;
-// extern UNK_TYPE2 D_801BFA1C;
-// extern UNK_TYPE2 D_801BFA34;
-// extern UNK_TYPE2 D_801BFA4C;
-// extern UNK_TYPE2 D_801BFA64;
-// extern UNK_TYPE2 D_801BFA74;
-// extern UNK_TYPE4 sPostmanTimerInputBtnAPressed;
 // extern UNK_TYPE1 D_801BFAB0;
 // extern UNK_TYPE1 D_801BFAB8;
 // extern UNK_TYPE1 D_801BFAC4;
@@ -737,17 +730,6 @@ extern UNK_PTR D_801BF5C0;
 // extern UNK_TYPE1 D_801BFC10;
 // extern UNK_TYPE1 D_801BFC14;
 // extern UNK_TYPE1 D_801BFC40;
-// extern UNK_TYPE2 D_801BFC50;
-// extern UNK_TYPE2 D_801BFC60;
-// extern UNK_TYPE2 D_801BFC62;
-// extern UNK_TYPE2 D_801BFC64;
-// extern UNK_TYPE2 D_801BFC6C;
-// extern UNK_TYPE2 D_801BFC7C;
-// extern UNK_TYPE1 D_801BFC8C;
-// extern UNK_TYPE2 D_801BFC98;
-// extern UNK_TYPE2 D_801BFCA8;
-// extern UNK_TYPE1 D_801BFCB8;
-// extern UNK_TYPE4 D_801BFCC4;
 // extern UNK_TYPE2 sTimerStateTimer;
 // extern UNK_TYPE2 sTimerDigits;
 // extern UNK_TYPE2 D_801BFCEA;

include/z64.h

@@ -35,6 +35,7 @@
 #include "z64cutscene.h"
 #include "z64dma.h"
 #include "z64effect.h"
+#include "z64interface.h"
 #include "z64item.h"
 #include "z64light.h"
 #include "z64map.h"
@@ -506,10 +507,10 @@ typedef struct {
     /* 0x256 */ s16 unk_256;
     /* 0x258 */ s16 magicConsumptionTimer; // For certain magic states, 1 unit of magic is consumed every time the timer reaches 0
     /* 0x25A */ u8 numHorseBoosts;
-    /* 0x25C */ u16 unk_25C;
+    /* 0x25C */ u16 minigamePoints; // Points to add to the minigame score. Reset to 0 every frame.
-    /* 0x25E */ u16 unk_25E;
+    /* 0x25E */ u16 minigameHiddenPoints; // Points to add to the secondary set of minigame points not displayed. Reset to 0 every frame.
-    /* 0x260 */ u16 hbaAmmo;
+    /* 0x260 */ u16 minigameAmmo;
-    /* 0x262 */ u16 unk_262;
+    /* 0x262 */ u16 minigameUnusedPoints; // Associated with other minigame points, unused
     /* 0x264 */ s16 unk_264;
     /* 0x266 */ s16 aAlpha;
     /* 0x268 */ s16 bAlpha;
@@ -525,22 +526,22 @@ typedef struct {
     /* 0x27C */ s16 mapRoomNum;
     /* 0x27E */ u8 unk_27E;
     /* 0x27F */ u8 unk_27F;
-    /* 0x280 */ u8 unk_280;
+    /* 0x280 */ u8 minigameState;
-    /* 0x282 */ s16 unk_282;
+    /* 0x282 */ s16 minigameCountdownAlpha;
-    /* 0x284 */ s16 unk_284;
+    /* 0x284 */ s16 minigameCountdownScale;
-    /* 0x286 */ s16 unk_286;
+    /* 0x286 */ s16 perfectLettersOn;
-    /* 0x288 */ s16 unk_288;
+    /* 0x288 */ s16 perfectLettersType;
-    /* 0x28A */ s16 unk_28A[8];
+    /* 0x28A */ s16 perfectLettersState[PERFECT_LETTERS_NUM_LETTERS];
-    /* 0x29A */ u16 unk_29A[8];
+    /* 0x29A */ u16 perfectLettersAngles[PERFECT_LETTERS_NUM_LETTERS]; // Angle that follows the projectory of an ellipse
-    /* 0x2AA */ s16 unk_2AA[8];
+    /* 0x2AA */ s16 perfectLettersOffsetX[PERFECT_LETTERS_NUM_LETTERS];
-    /* 0x2BC */ f32 unk_2BC[8];
+    /* 0x2BC */ f32 perfectLettersSemiAxisX[PERFECT_LETTERS_NUM_LETTERS];
-    /* 0x2DC */ f32 unk_2DC[8];
+    /* 0x2DC */ f32 perfectLettersSemiAxisY[PERFECT_LETTERS_NUM_LETTERS];
-    /* 0x2FC */ s16 unk_2FC[4];
+    /* 0x2FC */ s16 perfectLettersPrimColor[4];
-    /* 0x304 */ s16 unk_304;
+    /* 0x304 */ s16 perfectLettersCount;
-    /* 0x306 */ s16 unk_306;
+    /* 0x306 */ s16 perfectLettersUnused;
-    /* 0x308 */ s16 unk_308;
+    /* 0x308 */ s16 perfectLettersColorIndex;
-    /* 0x30A */ s16 unk_30A;
+    /* 0x30A */ s16 perfectLettersColorTimer;
-    /* 0x30C */ s16 unk_30C;
+    /* 0x30C */ s16 perfectLettersTimer;
     struct {
         /* 0x30E */ u8 unk_30E; // "h_gauge"
         /* 0x30F */ u8 bButton;

include/z64interface.h

@@ -0,0 +1,41 @@
+#ifndef Z64INTERFACE_H
+#define Z64INTERFACE_H
+
+#include "ultra64.h"
+
+typedef enum {
+    /*  0 */ MINIGAME_STATE_NONE,
+    /*  1 */ MINIGAME_STATE_COUNTDOWN_SETUP_3,
+    /*  2 */ MINIGAME_STATE_COUNTDOWN_3,
+    /*  3 */ MINIGAME_STATE_COUNTDOWN_SETUP_2,
+    /*  4 */ MINIGAME_STATE_COUNTDOWN_2,
+    /*  5 */ MINIGAME_STATE_COUNTDOWN_SETUP_1,
+    /*  6 */ MINIGAME_STATE_COUNTDOWN_1,
+    /*  7 */ MINIGAME_STATE_COUNTDOWN_SETUP_GO,
+    /*  8 */ MINIGAME_STATE_COUNTDOWN_GO,
+    /* 20 */ MINIGAME_STATE_NO_COUNTDOWN_SETUP = 20,
+    /* 21 */ MINIGAME_STATE_NO_COUNTDOWN,
+    /* 30 */ MINIGAME_STATE_PLAYING = 30
+} MinigameState;
+
+typedef enum {
+    /* 0 */ PERFECT_LETTERS_TYPE_OFF,
+    /* 1 */ PERFECT_LETTERS_TYPE_1,
+    /* 2 */ PERFECT_LETTERS_TYPE_2,
+    /* 3 */ PERFECT_LETTERS_TYPE_3
+} PerfectLettersType;
+
+typedef enum {
+    /* 0 */ PERFECT_LETTERS_STATE_OFF,
+    /* 1 */ PERFECT_LETTERS_STATE_INIT,
+    /* 2 */ PERFECT_LETTERS_STATE_ENTER,
+    /* 3 */ PERFECT_LETTERS_STATE_STATIONARY, // Display for type 1
+    /* 4 */ PERFECT_LETTERS_STATE_SPREAD, // Exit for type 1
+    /* 5 */ PERFECT_LETTERS_STATE_DISPLAY,
+    /* 6 */ PERFECT_LETTERS_STATE_EXIT
+} PerfectLettersState;
+
+#define PERFECT_LETTERS_NUM_LETTERS 8
+#define PERFECT_LETTERS_ANGLE_PER_LETTER (0x10000 / PERFECT_LETTERS_NUM_LETTERS)
+
+#endif

include/z64save.h

@@ -105,6 +105,12 @@ typedef enum {
     /* 1 */ BOTTLE_TIMER_STATE_COUNTING
 } BottleTimerState;
 
+typedef enum {
+    /* 0 */ MINIGAME_STATUS_INACTIVE,
+    /* 1 */ MINIGAME_STATUS_ACTIVE,
+    /* 3 */ MINIGAME_STATUS_END = 3
+} MinigameStatus;
+
 typedef enum {
     /*  0 */ HUD_VISIBILITY_IDLE,
     /*  1 */ HUD_VISIBILITY_NONE,
@@ -343,9 +349,9 @@ typedef struct SaveContext {
     /* 0x3F32 */ s16 magicToConsume; // accumulated magic that is requested to be consumed "magic_used"
     /* 0x3F34 */ s16 magicToAdd; // accumulated magic that is requested to be added "magic_recovery"
     /* 0x3F36 */ u16 mapIndex;                          // "scene_ID"
-    /* 0x3F38 */ u16 minigameState;                     // "yabusame_mode"
+    /* 0x3F38 */ u16 minigameStatus;                    // "yabusame_mode"
     /* 0x3F3A */ u16 minigameScore;                     // "yabusame_total"
-    /* 0x3F3C */ u16 unk_3F3C;                          // "yabusame_out_ct"
+    /* 0x3F3C */ u16 minigameHiddenScore;               // "yabusame_out_ct"
     /* 0x3F3E */ u8 unk_3F3E;                           // "no_save"
     /* 0x3F3F */ u8 unk_3F3F;                           // "flash_flag"
     /* 0x3F40 */ SaveOptions options;

src/code/z_camera.c

@@ -1,4 +1,3 @@
-//#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "z64quake.h"
 #include "z64shrink_window.h"

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -342,7 +342,7 @@ void BgIngate_Init(Actor* thisx, PlayState* play2) {
             if (play->curSpawn == 6) {
                 func_80953F14(this, play);
                 if (CHECK_EVENTINF(EVENTINF_35)) {
-                    func_80112AFC(play);
+                    Interface_InitMinigame(play);
                 } else {
                     SET_EVENTINF(EVENTINF_41);
                 }

src/overlays/actors/ovl_En_Az/z_en_az.c

@@ -1482,9 +1482,9 @@ void func_80A97D5C(EnAz* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     player->stateFlags1 |= PLAYER_STATE1_20;
-    func_80112AFC(play);
+    Interface_InitMinigame(play);
     gSaveContext.minigameScore = (this->unk_374 & 2) ? 25 : 20;
-    play->interfaceCtx.unk_280 = 1;
+    play->interfaceCtx.minigameState = MINIGAME_STATE_COUNTDOWN_SETUP_3;
     if ((this->unk_2FA == 1) || (this->unk_2FA == 3)) {
         Interface_StartTimer(TIMER_ID_MINIGAME_2, 120);
     } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_01)) {
@@ -1498,7 +1498,7 @@ void func_80A97D5C(EnAz* this, PlayState* play) {
 void func_80A97E48(EnAz* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (play->interfaceCtx.unk_280 >= 8) {
+    if (play->interfaceCtx.minigameState >= MINIGAME_STATE_COUNTDOWN_GO) {
         player->stateFlags1 &= ~PLAYER_STATE1_20;
         func_80A97EAC(this, play);
     }

src/overlays/actors/ovl_En_Fu/z_en_fu.c

@@ -800,7 +800,7 @@ void func_80962F4C(EnFu* this, PlayState* play) {
             gSaveContext.timerCurTimes[TIMER_ID_MINIGAME_2] = SECONDS_TO_TIMER(0);
             gSaveContext.timerStates[TIMER_ID_MINIGAME_2] = TIMER_STATE_STOP;
             Audio_PlayFanfare(NA_BGM_GET_ITEM | 0x900);
-            func_8011B4E0(play, 1);
+            Interface_SetPerfectLetters(play, PERFECT_LETTERS_TYPE_1);
             this->unk_54A = 3;
             func_809632D0(this);
         }
@@ -848,7 +848,7 @@ void func_80963350(EnFu* this, PlayState* play) {
         D_80964C24 = 1;
     }
 
-    if ((this->unk_54A == 3) && (play->interfaceCtx.unk_286 == 0)) {
+    if ((this->unk_54A == 3) && !play->interfaceCtx.perfectLettersOn) {
         this->unk_54A = 2;
         D_80964C24 = 1;
     }

src/overlays/actors/ovl_En_Horse/z_en_horse.c

@@ -875,7 +875,7 @@ void EnHorse_Init(Actor* thisx, PlayState* play2) {
         EnHorse_InitCutscene(this, play);
     } else if (thisx->params == ENHORSE_10) {
         EnHorse_InitHorsebackArchery(this);
-        func_80112AFC(play);
+        Interface_InitMinigame(play);
     } else if (thisx->params == ENHORSE_14) {
         func_808846F0(this, play);
         if ((play->sceneId == SCENE_LOST_WOODS) && !Cutscene_IsPlaying(play)) {
@@ -2917,22 +2917,23 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, PlayState* play) {
         EnHorse_PlayWalkingSound(this);
     }
 
-    if (play->interfaceCtx.hbaAmmo == 0) {
+    if (play->interfaceCtx.minigameAmmo == 0) {
         this->hbaTimer++;
     }
 
     sp28 = Audio_IsSequencePlaying(NA_BGM_HORSE_GOAL);
     EnHorse_UpdateHbaRaceInfo(this, play, &sHbaInfo);
 
-    if (((this->hbaFlags & 1) || (this->hbaTimer > 45)) && (sp28 != 1) && (gSaveContext.minigameState != 3)) {
+    if (((this->hbaFlags & 1) || (this->hbaTimer > 45)) && (sp28 != 1) &&
+        (gSaveContext.minigameStatus != MINIGAME_STATUS_END)) {
         gSaveContext.save.cutscene = 0;
         play->transitionTrigger = TRANS_TRIGGER_START;
         play->transitionType = TRANS_TYPE_64;
     }
 
-    if (play->interfaceCtx.hbaAmmo) {}
+    if (play->interfaceCtx.minigameAmmo) {}
 
-    if (((play->interfaceCtx.hbaAmmo == 0) || (this->hbaFlags & 2)) && (this->hbaFlags & 4)) {
+    if (((play->interfaceCtx.minigameAmmo == 0) || (this->hbaFlags & 2)) && (this->hbaFlags & 4)) {
         this->hbaFlags &= ~4;
         Audio_QueueSeqCmd(0x8041);
     }

src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c

@@ -122,7 +122,7 @@ s32 func_808F8CCC(EnHorseGameCheck* this, PlayState* play2) {
     }
 
     Interface_StartTimer(TIMER_ID_MINIGAME_2, 0);
-    play->interfaceCtx.unk_280 = 1;
+    play->interfaceCtx.minigameState = MINIGAME_STATE_COUNTDOWN_SETUP_3;
 
     this->horse1 = (EnHorse*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -1149.0f, -106.0f, 470.0f, 0, 0x7FFF, 0,
                                          ENHORSE_PARAMS(ENHORSE_PARAM_BANDIT, ENHORSE_4));
@@ -212,10 +212,10 @@ s32 func_808F8FAC(EnHorseGameCheck* this, PlayState* play) {
 
     if ((this->unk_168 > 50) && !(this->unk_164 & 2)) {
         this->unk_164 |= 2;
-    } else if ((play->interfaceCtx.unk_280 >= 8) && !(this->unk_164 & 1)) {
+    } else if ((play->interfaceCtx.minigameState >= MINIGAME_STATE_COUNTDOWN_GO) && !(this->unk_164 & 1)) {
         this->unk_164 |= 1;
         horse->inRace = true;
-    } else if ((play->interfaceCtx.unk_280 >= 8) && !(this->unk_164 & 8)) {
+    } else if ((play->interfaceCtx.minigameState >= MINIGAME_STATE_COUNTDOWN_GO) && !(this->unk_164 & 8)) {
         EnHorse* horse = this->horse1;
 
         horse->inRace = true;

src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c

@@ -94,7 +94,7 @@ s32 EnJcMato_CheckForHit(EnJcMato* this, PlayState* play) {
     if ((this->collider.base.acFlags & AC_HIT) && !this->hitFlag && (this->actor.colChkInfo.damageEffect == 0xF)) {
         this->collider.base.acFlags &= ~AC_HIT;
         Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
-        play->interfaceCtx.unk_25C = 1;
+        play->interfaceCtx.minigamePoints = 1;
         this->hitFlag = true;
         return 1;
     } else {

src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c

@@ -284,8 +284,8 @@ void func_80C1410C(EnJgameTsn* this, PlayState* play) {
 
     player->stateFlags1 |= PLAYER_STATE1_20;
     func_801A2BB8(0x25);
-    play->interfaceCtx.unk_280 = 1;
+    play->interfaceCtx.minigameState = MINIGAME_STATE_COUNTDOWN_SETUP_3;
-    func_80112AFC(play);
+    Interface_InitMinigame(play);
     SET_WEEKEVENTREG(WEEKEVENTREG_90_20);
     Interface_StartTimer(TIMER_ID_MINIGAME_2, 120);
     this->actionFunc = func_80C1418C;
@@ -294,7 +294,7 @@ void func_80C1410C(EnJgameTsn* this, PlayState* play) {
 void func_80C1418C(EnJgameTsn* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (play->interfaceCtx.unk_280 == 8) {
+    if (play->interfaceCtx.minigameState == MINIGAME_STATE_COUNTDOWN_GO) {
         func_80C141DC(this);
         player->stateFlags1 &= ~PLAYER_STATE1_20;
     }
@@ -478,7 +478,7 @@ void func_80C147B4(EnJgameTsn* this, PlayState* play) {
             case 0x10A0:
             case 0x10A1:
                 func_801477B4(play);
-                gSaveContext.minigameState = 3;
+                gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                 gSaveContext.timerStates[TIMER_ID_MINIGAME_2] = TIMER_STATE_STOP;
                 CLEAR_WEEKEVENTREG(WEEKEVENTREG_90_20);
                 func_80C144E4(this);
@@ -563,14 +563,14 @@ s32 func_80C14BCC(EnJgameTsn* this, PlayState* play) {
         if (phi_s3 == this->unk_218) {
             Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
             *this->unk_208[phi_s3] |= OBJLUPYGAMELIFT_DISPLAY_CORRECT;
-            play->interfaceCtx.unk_25C = 1;
+            play->interfaceCtx.minigamePoints = 1;
             return true;
         }
 
         if (*this->unk_208[phi_s3] & OBJLUPYGAMELIFT_IGNITE_FIRE) {
             Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
             *this->unk_208[phi_s3] |= OBJLUPYGAMELIFT_DISPLAY_CORRECT;
-            play->interfaceCtx.unk_25C = 1;
+            play->interfaceCtx.minigamePoints = 1;
         } else {
             *this->unk_208[phi_s3] |= OBJLUPYGAMELIFT_DISPLAY_INCORRECT;
             Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_ERROR);

src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c

@@ -297,14 +297,14 @@ void func_80B269A4(EnKendoJs* this, PlayState* play) {
 
         case 0x273B:
             func_801477B4(play);
-            func_80112AFC(play);
+            Interface_InitMinigame(play);
             player->stateFlags1 |= PLAYER_STATE1_20;
             func_80B273D0(this);
             break;
 
         case 0x272D:
             func_801477B4(play);
-            gSaveContext.minigameState = 3;
+            gSaveContext.minigameStatus = MINIGAME_STATUS_END;
             func_80B276C4(this);
             func_80B276D8(this, play);
             break;
@@ -334,7 +334,7 @@ void func_80B26AFC(EnKendoJs* this, PlayState* play) {
                 }
 
                 if ((this->unk_288 == 0x272E) || (this->unk_288 == 0x272F) || (this->unk_288 == 0x2730)) {
-                    gSaveContext.minigameState = 3;
+                    gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                 }
 
                 player->stateFlags1 &= ~PLAYER_STATE1_20;
@@ -625,14 +625,14 @@ void func_80B274BC(EnKendoJs* this, PlayState* play) {
     if (this->unk_28E == 1) {
         if ((player->meleeWeaponAnimation == PLAYER_MWA_JUMPSLASH_START) ||
             (player->meleeWeaponAnimation == PLAYER_MWA_JUMPSLASH_FINISH)) {
-            play->interfaceCtx.unk_25C = 3;
+            play->interfaceCtx.minigamePoints = 3;
             if (gSaveContext.minigameScore >= 27) {
                 player->stateFlags1 |= PLAYER_STATE1_20;
             }
         } else if (player->meleeWeaponAnimation == PLAYER_MWA_STAB_1H) {
-            play->interfaceCtx.unk_25C = 2;
+            play->interfaceCtx.minigamePoints = 2;
         } else {
-            play->interfaceCtx.unk_25C = 1;
+            play->interfaceCtx.minigamePoints = 1;
         }
         Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
         this->unk_28E = 0;

src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

@@ -688,10 +688,10 @@ void EnMa4_HorsebackGameTalking(EnMa4* this, PlayState* play) {
 void EnMa4_InitHorsebackGame(EnMa4* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    play->interfaceCtx.unk_280 = 1;
+    play->interfaceCtx.minigameState = MINIGAME_STATE_COUNTDOWN_SETUP_3;
     Interface_StartTimer(TIMER_ID_MINIGAME_2, 0);
     SET_WEEKEVENTREG(WEEKEVENTREG_08_01);
-    func_80112AFC(play);
+    Interface_InitMinigame(play);
     player->stateFlags1 |= PLAYER_STATE1_20;
     this->actionFunc = EnMa4_SetupHorsebackGameWait;
 }
@@ -699,7 +699,7 @@ void EnMa4_InitHorsebackGame(EnMa4* this, PlayState* play) {
 void EnMa4_SetupHorsebackGameWait(EnMa4* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (play->interfaceCtx.unk_280 == 8) {
+    if (play->interfaceCtx.minigameState == MINIGAME_STATE_COUNTDOWN_GO) {
         this->actionFunc = EnMa4_HorsebackGameWait;
         player->stateFlags1 &= ~PLAYER_STATE1_20;
     }
@@ -714,7 +714,7 @@ void EnMa4_HorsebackGameWait(EnMa4* this, PlayState* play) {
 
     if (this->poppedBalloonCounter != D_80AC0258) {
         D_80AC0258 = this->poppedBalloonCounter;
-        play->interfaceCtx.unk_25C = 1;
+        play->interfaceCtx.minigamePoints = 1;
     }
 
     if ((gSaveContext.timerCurTimes[TIMER_ID_MINIGAME_2] >= SECONDS_TO_TIMER(120)) ||

src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c

@@ -315,11 +315,11 @@ void EnMttag_RaceStart(EnMttag* this, PlayState* play) {
         } else {
             if (DECR(this->timer) == 60) {
                 Interface_StartTimer(TIMER_ID_MINIGAME_2, 0);
-                play->interfaceCtx.unk_280 = 1;
+                play->interfaceCtx.minigameState = MINIGAME_STATE_COUNTDOWN_SETUP_3;
                 Audio_QueueSeqCmd(NA_BGM_GORON_RACE | 0x8000);
                 play->envCtx.unk_E4 = 0xFE;
                 player->stateFlags1 &= ~PLAYER_STATE1_20;
-            } else if ((this->timer < 60) && (play->interfaceCtx.unk_280 == 8)) {
+            } else if ((this->timer < 60) && (play->interfaceCtx.minigameState == MINIGAME_STATE_COUNTDOWN_GO)) {
                 this->timer = 0;
                 SET_EVENTINF(EVENTINF_10);
                 this->actionFunc = EnMttag_Race;

src/overlays/actors/ovl_En_Ot/z_en_ot.c

@@ -59,9 +59,9 @@ EnOtUnkStruct* func_80B5DF58(EnOtUnkStruct* arg0, u8 arg1, Vec3f* arg2, Vec3s* a
 void func_80B5E078(PlayState* play, EnOtUnkStruct* arg1, s32 arg2);
 void func_80B5E1D8(PlayState* play, EnOtUnkStruct* arg1, s32 arg2);
 
-static EnOt* D_80B5E880;
+EnOt* D_80B5E880;
-static EnOt* D_80B5E884;
+EnOt* D_80B5E884;
-static EnOt* D_80B5E888;
+EnOt* D_80B5E888;
 
 ActorInit En_Ot_InitVars = {
     ACTOR_EN_OT,

src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c

@@ -334,7 +334,7 @@ void EnSyatekiMan_Swamp_HandleChoice(EnSyatekiMan* this, PlayState* play) {
                 Message_StartTextbox(play, 0xA31, &this->actor);
                 this->prevTextId = 0xA31;
                 if (this->shootingGameState == SG_GAME_STATE_ONE_MORE_GAME) {
-                    gSaveContext.minigameState = 3;
+                    gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                 }
 
                 this->shootingGameState = SG_GAME_STATE_NOT_PLAYING;
@@ -373,7 +373,7 @@ void EnSyatekiMan_Swamp_HandleChoice(EnSyatekiMan* this, PlayState* play) {
             }
 
             if (this->shootingGameState == SG_GAME_STATE_ONE_MORE_GAME) {
-                gSaveContext.minigameState = 3;
+                gSaveContext.minigameStatus = MINIGAME_STATUS_END;
             }
 
             this->shootingGameState = SG_GAME_STATE_NOT_PLAYING;
@@ -399,8 +399,8 @@ void EnSyatekiMan_Swamp_HandleNormalMessage(EnSyatekiMan* this, PlayState* play)
                 play->msgCtx.msgMode = 0x43;
                 play->msgCtx.stateTimer = 4;
                 player->actor.freezeTimer = 0;
-                func_80112AFC(play);
+                Interface_InitMinigame(play);
-                play->interfaceCtx.hbaAmmo = 80;
+                play->interfaceCtx.minigameAmmo = 80;
                 func_80123F2C(play, 80);
                 this->shootingGameState = SG_GAME_STATE_RUNNING;
                 this->actionFunc = EnSyatekiMan_Swamp_StartGame;
@@ -414,7 +414,7 @@ void EnSyatekiMan_Swamp_HandleNormalMessage(EnSyatekiMan* this, PlayState* play)
                     CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01);
                     CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02);
                     this->actionFunc = EnSyatekiMan_Swamp_Idle;
-                    gSaveContext.minigameState = 3;
+                    gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                     this->shootingGameState = SG_GAME_STATE_NONE;
                 } else {
                     // Wanna play again?
@@ -434,7 +434,7 @@ void EnSyatekiMan_Swamp_HandleNormalMessage(EnSyatekiMan* this, PlayState* play)
                 play->msgCtx.msgMode = 0x43;
                 play->msgCtx.stateTimer = 4;
                 player->actor.freezeTimer = 0;
-                gSaveContext.minigameState = 3;
+                gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                 player->stateFlags1 |= PLAYER_STATE1_20;
                 this->actionFunc = EnSyatekiMan_Swamp_SetupGiveReward;
                 EnSyatekiMan_Swamp_SetupGiveReward(this, play);
@@ -641,7 +641,7 @@ void EnSyatekiMan_Town_HandleChoice(EnSyatekiMan* this, PlayState* play) {
 
                 if (this->shootingGameState == SG_GAME_STATE_ONE_MORE_GAME) {
                     player->stateFlags3 &= ~PLAYER_STATE3_400;
-                    gSaveContext.minigameState = 3;
+                    gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                 }
 
                 this->shootingGameState = SG_GAME_STATE_NOT_PLAYING;
@@ -677,7 +677,7 @@ void EnSyatekiMan_Town_HandleChoice(EnSyatekiMan* this, PlayState* play) {
 
             if (this->shootingGameState == SG_GAME_STATE_ONE_MORE_GAME) {
                 player->stateFlags3 &= ~PLAYER_STATE3_400;
-                gSaveContext.minigameState = 3;
+                gSaveContext.minigameStatus = MINIGAME_STATUS_END;
             }
 
             this->shootingGameState = SG_GAME_STATE_NOT_PLAYING;
@@ -759,7 +759,7 @@ void EnSyatekiMan_Town_HandleNormalMessage(EnSyatekiMan* this, PlayState* play)
                 play->msgCtx.stateTimer = 4;
                 player->actor.freezeTimer = 0;
                 this->flagsIndex = 0;
-                func_80112AFC(play);
+                Interface_InitMinigame(play);
                 func_80123F2C(play, 0x63);
                 this->shootingGameState = SG_GAME_STATE_RUNNING;
                 func_801A2BB8(NA_BGM_TIMED_MINI_GAME);
@@ -808,7 +808,7 @@ void EnSyatekiMan_Town_HandleNormalMessage(EnSyatekiMan* this, PlayState* play)
                 play->msgCtx.msgMode = 0x43;
                 play->msgCtx.stateTimer = 4;
                 player->actor.freezeTimer = 0;
-                gSaveContext.minigameState = 3;
+                gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                 this->actionFunc = EnSyatekiMan_Town_SetupGiveReward;
                 EnSyatekiMan_Town_SetupGiveReward(this, play);
                 break;
@@ -1090,7 +1090,7 @@ void EnSyatekiMan_Swamp_RunGame(EnSyatekiMan* this, PlayState* play) {
         func_801A2C20();
         this->shootingGameState = SG_GAME_STATE_GIVING_BONUS;
         if (this->score == 2120) {
-            func_8011B4E0(play, 2);
+            Interface_SetPerfectLetters(play, PERFECT_LETTERS_TYPE_2);
             gSaveContext.timerStates[TIMER_ID_MINIGAME_1] = TIMER_STATE_6;
             this->actionFunc = EnSyatekiMan_Swamp_AddBonusPoints;
         } else {
@@ -1122,7 +1122,7 @@ void EnSyatekiMan_Swamp_EndGame(EnSyatekiMan* this, PlayState* play) {
                     CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01);
                     CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02);
                     this->shootingGameState = SG_GAME_STATE_NONE;
-                    gSaveContext.minigameState = 3;
+                    gSaveContext.minigameStatus = MINIGAME_STATUS_END;
                     this->actionFunc = EnSyatekiMan_Swamp_Idle;
                     return;
                 }
@@ -1156,7 +1156,7 @@ void EnSyatekiMan_Swamp_AddBonusPoints(EnSyatekiMan* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
     player->stateFlags1 |= PLAYER_STATE1_20;
-    if (play->interfaceCtx.unk_286 == 0) {
+    if (!play->interfaceCtx.perfectLettersOn) {
         if (gSaveContext.timerCurTimes[TIMER_ID_MINIGAME_1] == SECONDS_TO_TIMER(0)) {
             gSaveContext.timerCurTimes[TIMER_ID_MINIGAME_1] = SECONDS_TO_TIMER(0);
             gSaveContext.timerStates[TIMER_ID_MINIGAME_1] = TIMER_STATE_STOP;
@@ -1166,7 +1166,7 @@ void EnSyatekiMan_Swamp_AddBonusPoints(EnSyatekiMan* this, PlayState* play) {
             sBonusTimer = 0;
         } else if (sBonusTimer > 10) {
             gSaveContext.timerStopTimes[TIMER_ID_MINIGAME_1] += SECONDS_TO_TIMER(1);
-            play->interfaceCtx.unk_25C += 10;
+            play->interfaceCtx.minigamePoints += 10;
             this->score += 10;
             Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
             sBonusTimer = 0;
@@ -1359,7 +1359,7 @@ void EnSyatekiMan_Town_RunGame(EnSyatekiMan* this, PlayState* play) {
             this->actionFunc = EnSyatekiMan_Town_EndGame;
             if (this->score == 50) {
                 Audio_PlayFanfare(NA_BGM_GET_ITEM | 0x900);
-                func_8011B4E0(play, 1);
+                Interface_SetPerfectLetters(play, PERFECT_LETTERS_TYPE_1);
             }
         }
     }
@@ -1368,7 +1368,7 @@ void EnSyatekiMan_Town_RunGame(EnSyatekiMan* this, PlayState* play) {
 void EnSyatekiMan_Town_EndGame(EnSyatekiMan* this, PlayState* play) {
     if (this->shootingGameState == SG_GAME_STATE_RUNNING) {
         this->octorokFlags = 0;
-        if ((this->talkWaitTimer <= 0) && (play->interfaceCtx.unk_286 == 0)) {
+        if ((this->talkWaitTimer <= 0) && !play->interfaceCtx.perfectLettersOn) {
             Flags_SetAllTreasure(play, this->score);
             this->talkWaitTimer = 15;
             if ((GET_TOWN_SHOOTING_GALLERY_HIGH_SCORE() < this->score) || (this->score == 50)) {

src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c

@@ -370,7 +370,7 @@ void EnSyatekiOkuta_Update(Actor* thisx, PlayState* play) {
         syatekiMan = (EnSyatekiMan*)this->actor.parent;
         if (this->unk_2A6 == 1) {
             Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
-            play->interfaceCtx.unk_25C++;
+            play->interfaceCtx.minigamePoints++;
             syatekiMan->score++;
             syatekiMan->perGameVar2.octorokHitType = SG_OCTO_HIT_TYPE_RED;
         } else {

src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c

@@ -185,7 +185,7 @@ s32 func_80B761FC(EnTruMt* this, PlayState* play) {
                 this->unk_3A4 = 0;
                 Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_DAMAGE2);
             }
-            play->interfaceCtx.unk_25E = 1;
+            play->interfaceCtx.minigameHiddenPoints = 1;
             Actor_SetColorFilter(&this->actor, 0x4000, 255, 0, 25);
             return true;
         }
@@ -342,7 +342,7 @@ void func_80B76924(EnTruMt* this) {
 void func_80B76980(EnTruMt* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
 
-    if (gSaveContext.unk_3F3C >= 10) {
+    if (gSaveContext.minigameHiddenScore >= 10) {
         Message_StartTextbox(play, 0x87F, &this->actor);
         SET_EVENTINF(EVENTINF_36);
         SET_EVENTINF(EVENTINF_40);

src/overlays/actors/ovl_En_Twig/z_en_twig.c

@@ -198,7 +198,7 @@ void func_80AC0D2C(EnTwig* this, PlayState* play) {
                                             (s32)(Rand_ZeroOne() * 10.0f) + 20);
         }
         play_sound(NA_SE_SY_GET_ITEM);
-        play->interfaceCtx.unk_25C--;
+        play->interfaceCtx.minigamePoints--;
         sRingNotCollected[RACERING_GET_PARAM_FE0(&this->dyna.actor)] = true;
         if (sCurrentRing == RACERING_GET_PARAM_FE0(&this->dyna.actor)) {
             s32 i;

src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

@@ -92,6 +92,6 @@ void EffectSsExtra_Update(PlayState* play, u32 index, EffectSs* this) {
     }
 
     if (this->rTimer == 1) {
-        play->interfaceCtx.unk_25C = sScores[this->rScoreIndex];
+        play->interfaceCtx.minigamePoints = sScores[this->rScoreIndex];
     }
 }

src/overlays/gamestates/ovl_select/z_select.c

@@ -517,7 +517,7 @@ void MapSelect_UpdateMenu(MapSelectState* this) {
                 gSaveContext.timerStopTimes[i] = SECONDS_TO_TIMER(0);
                 gSaveContext.timerPausedOsTimes[i] = 0;
             }
-            gSaveContext.minigameState = 0;
+            gSaveContext.minigameStatus = MINIGAME_STATUS_INACTIVE;
 
             if (this->scenes[this->currentScene].loadFunc != NULL) {
                 this->scenes[this->currentScene].loadFunc(this, this->scenes[this->currentScene].entrance, this->opt);

tools/disasm/functions.txt

@@ -2092,7 +2092,7 @@
     0x8010D9F4:("Gfx_DrawTexRect4b",),
     0x8010DC58:("Gfx_DrawTexQuadIA8",),
     0x8010DE38:("Gfx_DrawTexQuad4b",),
-    0x8010E028:("func_8010E028",),
+    0x8010E028:("Interface_SetVertices",),
     0x8010E968:("Interface_PostmanTimerCallback",),
     0x8010E9F0:("Interface_StartTimer",),
     0x8010EA9C:("Interface_StartPostmanTimer",),
@@ -2108,7 +2108,7 @@
     0x80111CB4:("func_80111CB4",),
     0x801129E4:("func_801129E4",),
     0x80112AF4:("func_80112AF4",),
-    0x80112AFC:("func_80112AFC",),
+    0x80112AFC:("Interface_InitMinigame",),
     0x80112B40:("Interface_LoadItemIconImpl",),
     0x80112BE4:("Interface_LoadItemIcon",),
     0x80112C0C:("func_80112C0C",),
@@ -2151,22 +2151,22 @@
     0x80118BA4:("func_80118BA4",),
     0x80119030:("func_80119030",),
     0x80119610:("func_80119610",),
-    0x8011B4E0:("func_8011B4E0",),
+    0x8011B4E0:("Interface_SetPerfectLetters",),
-    0x8011B5C0:("func_8011B5C0",),
+    0x8011B5C0:("Interface_UpdatePerfectLettersType1",),
-    0x8011B9E0:("func_8011B9E0",),
+    0x8011B9E0:("Interface_UpdatePerfectLettersType2",),
-    0x8011BF70:("func_8011BF70",),
+    0x8011BF70:("Interface_UpdatePerfectLettersType3",),
-    0x8011C4C4:("func_8011C4C4",),
+    0x8011C4C4:("Interface_DrawPerfectLetters",),
     0x8011C808:("Interface_StartMoonCrash",),
     0x8011C898:("Interface_GetTimerDigits",),
     0x8011CA64:("Interface_DrawTimers",),
     0x8011E3B4:("Interface_UpdateBottleTimers",),
-    0x8011E730:("func_8011E730",),
+    0x8011E730:("Interface_DrawMinigameIcons",),
-    0x8011F0E0:("func_8011F0E0",),
+    0x8011F0E0:("Interface_Draw",),
     0x80120F90:("func_80120F90",),
     0x80121064:("func_80121064",),
-    0x801210E0:("func_801210E0",),
+    0x801210E0:("Interface_Update",),
     0x80121F94:("Interface_Destroy",),
-    0x80121FC4:("func_80121FC4",),
+    0x80121FC4:("Interface_Init",),
     0x801224E0:("Path_GetByIndex",),
     0x80122524:("Path_OrientAndGetDistSq",),
     0x801225CC:("Path_CopyLastPoint",),

tools/disasm/variables.txt

@@ -1119,12 +1119,12 @@
     0x801BF9F8:("sFinalHoursClockFrameEnvBlue","UNK_TYPE2","",0x2),
     0x801BF9FC:("sFinalHoursClockColorTimer","UNK_TYPE2","",0x2),
     0x801BFA00:("sFinalHoursClockColorTargetIndex","UNK_TYPE2","",0x2),
-    0x801BFA04:("D_801BFA04","UNK_TYPE2","",0x2),
+    0x801BFA04:("sActionVtxPosX","UNK_TYPE2","",0x2),
-    0x801BFA1C:("D_801BFA1C","UNK_TYPE2","",0x2),
+    0x801BFA1C:("sActionVtxWidths","UNK_TYPE2","",0x2),
-    0x801BFA34:("D_801BFA34","UNK_TYPE2","",0x2),
+    0x801BFA34:("sActionVtxPosY","UNK_TYPE2","",0x2),
-    0x801BFA4C:("D_801BFA4C","UNK_TYPE2","",0x2),
+    0x801BFA4C:("sActionVtxHeights","UNK_TYPE2","",0x2),
-    0x801BFA64:("D_801BFA64","UNK_TYPE2","",0x2),
+    0x801BFA64:("sPerfectLettersCenterX","UNK_TYPE2","",0x2),
-    0x801BFA74:("D_801BFA74","UNK_TYPE2","",0x2),
+    0x801BFA74:("sPerfectLettersCenterY","UNK_TYPE2","",0x2),
     0x801BFA84:("sPostmanTimerInputBtnAPressed","UNK_TYPE4","",0x4),
     0x801BFAB0:("sDoActionTextures","UNK_TYPE1","",0x1),
     0x801BFAB8:("magicBorderColors","UNK_TYPE1","",0x1),
@@ -1164,15 +1164,15 @@
     0x801BFC10:("D_801BFC10","UNK_TYPE1","",0x1),
     0x801BFC14:("D_801BFC14","UNK_TYPE1","",0x1),
     0x801BFC40:("D_801BFC40","UNK_TYPE1","",0x1),
-    0x801BFC50:("D_801BFC50","UNK_TYPE2","",0x2),
+    0x801BFC50:("sPerfectLettersType1OffScreenAngles","UNK_TYPE2","",0x2),
-    0x801BFC60:("D_801BFC60","s16","[6]",0xC),
+    0x801BFC60:("sPerfectLettersType1PrimColorTargets","s16","[6]",0xC),
-    0x801BFC6C:("D_801BFC6C","UNK_TYPE4","",0x4),
+    0x801BFC6C:("sPerfectLettersType2SpellingOffsetsX","UNK_TYPE4","",0x4),
-    0x801BFC7C:("D_801BFC7C","UNK_TYPE2","",0x2),
+    0x801BFC7C:("sPerfectLettersType2OffScreenOffsetsX","UNK_TYPE2","",0x2),
-    0x801BFC8C:("D_801BFC8C","UNK_TYPE1","",0x1),
+    0x801BFC8C:("sPerfectLettersType2PrimColorTargets","UNK_TYPE1","",0x1),
-    0x801BFC98:("D_801BFC98","UNK_TYPE2","",0x2),
+    0x801BFC98:("sPerfectLettersType3SpellingOffsetsX","UNK_TYPE2","",0x2),
-    0x801BFCA8:("D_801BFCA8","UNK_TYPE2","",0x2),
+    0x801BFCA8:("sPerfectLettersType3OffScreenAngles","UNK_TYPE2","",0x2),
-    0x801BFCB8:("D_801BFCB8","UNK_TYPE1","",0x1),
+    0x801BFCB8:("sPerfectLettersType3PrimColorTargets","UNK_TYPE1","",0x1),
-    0x801BFCC4:("D_801BFCC4","UNK_TYPE4","",0x4),
+    0x801BFCC4:("sPerfectLettersTextures","UNK_TYPE4","",0x4),
     0x801BFCE4:("sTimerStateTimer","UNK_TYPE4","",0x4),
     0x801BFCE8:("sTimerDigits","u16","[8]",0x10),
     0x801BFCF8:("sTimerBeepSfxSeconds","UNK_TYPE4","",0x4),

tools/namefixer.py

@@ -499,6 +499,8 @@ wordReplace = {
     "func_80169E6C": "Play_SetupRespawnPoint",
     "func_8016A0AC": "Play_IsUnderwater",
     "func_801690CC": "Play_InCsMode",
+    "func_8011B4E0": "Interface_SetPerfectLetters",
+    "func_80112AFC": "Interface_InitMinigame",
     "func_8010E9F0": "Interface_StartTimer",
     "func_8010EA9C": "Interface_StartPostmanTimer",
     "func_80121F94": "Interface_Destroy",
@@ -714,6 +716,8 @@ wordReplace = {
     "gSaveContext.sceneSetupIndex": "gSaveContext.sceneLayer",
     "gSaveContext.seqIndex": "gSaveContext.seqId",
     "gSaveContext.nightSeqIndex": "gSaveContext.ambienceId",
+    "gSaveContext.minigameState": "gSaveContext.minigameStatus",
+    "gSaveContext.unk_3F3C": "gSaveContext.minigameHiddenScore",
 
     "player->unk_A87": "player->exchangeItemId",
     "player->leftHandActor": "player->heldActor",
@@ -754,6 +758,11 @@ wordReplace = {
     "globalCtx->interfaceCtx.unk_21E": "play->interfaceCtx.bButtonDoAction",
     "play->interfaceCtx.unk_31A": "play->interfaceCtx.storyState",
     "play->interfaceCtx.unk_31B": "play->interfaceCtx.storyType",
+    "play->interfaceCtx.unk_25C": "play->interfaceCtx.minigamePoints",
+    "play->interfaceCtx.unk_25E": "play->interfaceCtx.minigameHiddenPoints",
+    "play->interfaceCtx.unk_280": "play->interfaceCtx.minigameState",
+    "play->interfaceCtx.unk_286": "play->interfaceCtx.perfectLettersOn",
+    "play->interfaceCtx.hbaAmmo": "play->interfaceCtx.minigameAmmo",
 
     # "play->actorCtx.flags": "play->actorCtx.sceneFlags",
     # "play->actorCtx.unk5": "play->actorCtx.flags",

tools/sizes/code_functions.csv

@@ -1606,7 +1606,7 @@ asm/non_matchings/code/z_parameter/Gfx_DrawTexRectI8.s,Gfx_DrawTexRectI8,0x8010D
 asm/non_matchings/code/z_parameter/Gfx_DrawTexRect4b.s,Gfx_DrawTexRect4b,0x8010D9F4,0x99
 asm/non_matchings/code/z_parameter/Gfx_DrawTexQuadIA8.s,Gfx_DrawTexQuadIA8,0x8010DC58,0x78
 asm/non_matchings/code/z_parameter/Gfx_DrawTexQuad4b.s,Gfx_DrawTexQuad4b,0x8010DE38,0x7C
-asm/non_matchings/code/z_parameter/func_8010E028.s,func_8010E028,0x8010E028,0x250
+asm/non_matchings/code/z_parameter/Interface_SetVertices.s,Interface_SetVertices,0x8010E028,0x250
 asm/non_matchings/code/z_parameter/Interface_PostmanTimerCallback.s,Interface_PostmanTimerCallback,0x8010E968,0x22
 asm/non_matchings/code/z_parameter/Interface_StartTimer.s,Interface_StartTimer,0x8010E9F0,0x2B
 asm/non_matchings/code/z_parameter/Interface_StartPostmanTimer.s,Interface_StartPostmanTimer,0x8010EA9C,0x2D
@@ -1622,7 +1622,7 @@ asm/non_matchings/code/z_parameter/func_80110038.s,func_80110038,0x80110038,0x71
 asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34C
 asm/non_matchings/code/z_parameter/func_801129E4.s,func_801129E4,0x801129E4,0x44
 asm/non_matchings/code/z_parameter/func_80112AF4.s,func_80112AF4,0x80112AF4,0x2
-asm/non_matchings/code/z_parameter/func_80112AFC.s,func_80112AFC,0x80112AFC,0x11
+asm/non_matchings/code/z_parameter/Interface_InitMinigame.s,Interface_InitMinigame,0x80112AFC,0x11
 asm/non_matchings/code/z_parameter/Interface_LoadItemIconImpl.s,Interface_LoadItemIconImpl,0x80112B40,0x29
 asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s,Interface_LoadItemIcon,0x80112BE4,0xA
 asm/non_matchings/code/z_parameter/func_80112C0C.s,func_80112C0C,0x80112C0C,0x9D
@@ -1665,22 +1665,22 @@ asm/non_matchings/code/z_parameter/func_80118890.s,func_80118890,0x80118890,0xC5
 asm/non_matchings/code/z_parameter/func_80118BA4.s,func_80118BA4,0x80118BA4,0x123
 asm/non_matchings/code/z_parameter/func_80119030.s,func_80119030,0x80119030,0x178
 asm/non_matchings/code/z_parameter/func_80119610.s,func_80119610,0x80119610,0x7B4
-asm/non_matchings/code/z_parameter/func_8011B4E0.s,func_8011B4E0,0x8011B4E0,0x38
+asm/non_matchings/code/z_parameter/Interface_SetPerfectLetters.s,Interface_SetPerfectLetters,0x8011B4E0,0x38
-asm/non_matchings/code/z_parameter/func_8011B5C0.s,func_8011B5C0,0x8011B5C0,0x108
+asm/non_matchings/code/z_parameter/Interface_UpdatePerfectLettersType1.s,Interface_UpdatePerfectLettersType1,0x8011B5C0,0x108
-asm/non_matchings/code/z_parameter/func_8011B9E0.s,func_8011B9E0,0x8011B9E0,0x164
+asm/non_matchings/code/z_parameter/Interface_UpdatePerfectLettersType2.s,Interface_UpdatePerfectLettersType2,0x8011B9E0,0x164
-asm/non_matchings/code/z_parameter/func_8011BF70.s,func_8011BF70,0x8011BF70,0x155
+asm/non_matchings/code/z_parameter/Interface_UpdatePerfectLettersType3.s,Interface_UpdatePerfectLettersType3,0x8011BF70,0x155
-asm/non_matchings/code/z_parameter/func_8011C4C4.s,func_8011C4C4,0x8011C4C4,0xD1
+asm/non_matchings/code/z_parameter/Interface_DrawPerfectLetters.s,Interface_DrawPerfectLetters,0x8011C4C4,0xD1
 asm/non_matchings/code/z_parameter/Interface_StartMoonCrash.s,Interface_StartMoonCrash,0x8011C808,0x24
 asm/non_matchings/code/z_parameter/Interface_GetTimerDigits.s,Interface_GetTimerDigits,0x8011C898,0x73
 asm/non_matchings/code/z_parameter/Interface_DrawTimers.s,Interface_DrawTimers,0x8011CA64,0x654
 asm/non_matchings/code/z_parameter/Interface_UpdateBottleTimers.s,Interface_UpdateBottleTimers,0x8011E3B4,0xDF
-asm/non_matchings/code/z_parameter/func_8011E730.s,func_8011E730,0x8011E730,0x26C
+asm/non_matchings/code/z_parameter/Interface_DrawMinigameIcons.s,Interface_DrawMinigameIcons,0x8011E730,0x26C
-asm/non_matchings/code/z_parameter/func_8011F0E0.s,func_8011F0E0,0x8011F0E0,0x7AC
+asm/non_matchings/code/z_parameter/Interface_Draw.s,Interface_Draw,0x8011F0E0,0x7AC
 asm/non_matchings/code/z_parameter/func_80120F90.s,func_80120F90,0x80120F90,0x35
 asm/non_matchings/code/z_parameter/func_80121064.s,func_80121064,0x80121064,0x1F
-asm/non_matchings/code/z_parameter/func_801210E0.s,func_801210E0,0x801210E0,0x3AD
+asm/non_matchings/code/z_parameter/Interface_Update.s,Interface_Update,0x801210E0,0x3AD
 asm/non_matchings/code/z_parameter/Interface_Destroy.s,Interface_Destroy,0x80121F94,0xC
-asm/non_matchings/code/z_parameter/func_80121FC4.s,func_80121FC4,0x80121FC4,0x147
+asm/non_matchings/code/z_parameter/Interface_Init.s,Interface_Init,0x80121FC4,0x147
 asm/non_matchings/code/z_path/func_801224E0.s,func_801224E0,0x801224E0,0x11
 asm/non_matchings/code/z_path/func_80122524.s,func_80122524,0x80122524,0x2A
 asm/non_matchings/code/z_path/func_801225CC.s,func_801225CC,0x801225CC,0x25