diff --git a/include/player.h b/include/player.h index aa3fc160..0805feab 100644 --- a/include/player.h +++ b/include/player.h @@ -449,6 +449,7 @@ typedef enum { INTERACTION_LIFT_SHOP_ITEM, INTERACTION_CHECK, INTERACTION_DROP_PEDESTAL, + INTERACTION_NULL = 0xFF, } InteractionType; // playerUtils.c diff --git a/include/structures.h b/include/structures.h index eded84c7..b18bb1ea 100644 --- a/include/structures.h +++ b/include/structures.h @@ -121,8 +121,7 @@ typedef struct { u8 unk_2d; u8 unk_2e; u8 unk_2f; - u8 unk_30[2]; - u8 unk_32; + u8 buttonText[3]; u8 unk_33; UIElement elements[MAX_UI_ELEMENTS]; } struct_0200AF00; @@ -157,6 +156,7 @@ typedef struct { /*0x06*/ u16 paletteIndex; /*0x08*/ const void* palettePointer; } GfxSlot; + typedef struct { /*0x00*/ u8 unk0; /*0x01*/ u8 unk_1; diff --git a/src/playerUtils.c b/src/playerUtils.c index b078f080..caad6878 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -659,7 +659,7 @@ bool32 (*const gPlayerChargeActions[])(ChargeState*) = { }; const InteractableObject gNoInteraction = { - 0, 0xFF, 0, 0, 0, 0, + 0, INTERACTION_NULL, 0, 0, NULL, NULL, }; // for shifting the hitbox in which entities can be interacted with in Link's facing direction diff --git a/src/subtask.c b/src/subtask.c index 3661f8a6..6af46d94 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -114,13 +114,13 @@ void sub_080A70AC(const KeyButtonLayout* layout) { gUnk_0200AF00.unk_14 = 0x7f; gUnk_0200AF00.buttonX[0] = layout->aButtonX; gUnk_0200AF00.buttonY[0] = (s8)layout->aButtonY; - gUnk_0200AF00.unk_30[0] = layout->aButtonText; + gUnk_0200AF00.buttonText[0] = layout->aButtonText; gUnk_0200AF00.buttonX[1] = layout->bButtonX; gUnk_0200AF00.buttonY[1] = (s8)layout->bButtonY; - gUnk_0200AF00.unk_30[1] = layout->bButtonText; + gUnk_0200AF00.buttonText[1] = layout->bButtonText; gUnk_0200AF00.buttonX[2] = layout->rButtonX; gUnk_0200AF00.buttonY[2] = (s8)layout->rButtonY; - gUnk_0200AF00.unk_32 = layout->rButtonText; + gUnk_0200AF00.buttonText[2] = layout->rButtonText; layout++; do { CreateUIElement(layout->aButtonX, layout->aButtonY); diff --git a/src/ui.c b/src/ui.c index 9d104798..f51fdfd6 100644 --- a/src/ui.c +++ b/src/ui.c @@ -756,9 +756,9 @@ void TextUIElement(UIElement* element) { break; } } - gUnk_0200AF00.unk_32 = tmp; + gUnk_0200AF00.buttonText[2] = tmp; } - tmp = gUnk_0200AF00.unk_30[element->buttonElementId]; + tmp = gUnk_0200AF00.buttonText[element->buttonElementId]; element->unk_0_1 = 0; if (tmp != 0) { tmp += gUnk_080C9044[((SaveHeader*)0x2000000)->language];