falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Name members for button texts in struct_0200AF00

This commit is contained in:
Catobat 2023-04-30 13:14:10 +02:00
parent fcfbd73dd2
commit d1d78ed018
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/player.h
View File

@ -449,6 +449,7 @@ typedef enum {
INTERACTION_LIFT_SHOP_ITEM, INTERACTION_LIFT_SHOP_ITEM,
INTERACTION_CHECK, INTERACTION_CHECK,
INTERACTION_DROP_PEDESTAL, INTERACTION_DROP_PEDESTAL,
INTERACTION_NULL = 0xFF,
} InteractionType; } InteractionType;
// playerUtils.c // playerUtils.c

4
include/structures.h
View File

@ -121,8 +121,7 @@ typedef struct {
u8 unk_2d; u8 unk_2d;
u8 unk_2e; u8 unk_2e;
u8 unk_2f; u8 unk_2f;
u8 unk_30[2]; u8 buttonText[3];
u8 unk_32;
u8 unk_33; u8 unk_33;
UIElement elements[MAX_UI_ELEMENTS]; UIElement elements[MAX_UI_ELEMENTS];
} struct_0200AF00; } struct_0200AF00;
@ -157,6 +156,7 @@ typedef struct {
/*0x06*/ u16 paletteIndex; /*0x06*/ u16 paletteIndex;
/*0x08*/ const void* palettePointer; /*0x08*/ const void* palettePointer;
} GfxSlot; } GfxSlot;
typedef struct { typedef struct {
/*0x00*/ u8 unk0; /*0x00*/ u8 unk0;
/*0x01*/ u8 unk_1; /*0x01*/ u8 unk_1;

2
src/playerUtils.c
View File

@ -659,7 +659,7 @@ bool32 (*const gPlayerChargeActions[])(ChargeState*) = {
}; };
const InteractableObject gNoInteraction = { 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 // for shifting the hitbox in which entities can be interacted with in Link's facing direction

6
src/subtask.c
View File

@ -114,13 +114,13 @@ void sub_080A70AC(const KeyButtonLayout* layout) {
gUnk_0200AF00.unk_14 = 0x7f; gUnk_0200AF00.unk_14 = 0x7f;
gUnk_0200AF00.buttonX[0] = layout->aButtonX; gUnk_0200AF00.buttonX[0] = layout->aButtonX;
gUnk_0200AF00.buttonY[0] = (s8)layout->aButtonY; 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.buttonX[1] = layout->bButtonX;
gUnk_0200AF00.buttonY[1] = (s8)layout->bButtonY; 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.buttonX[2] = layout->rButtonX;
gUnk_0200AF00.buttonY[2] = (s8)layout->rButtonY; gUnk_0200AF00.buttonY[2] = (s8)layout->rButtonY;
gUnk_0200AF00.unk_32 = layout->rButtonText; gUnk_0200AF00.buttonText[2] = layout->rButtonText;
layout++; layout++;
do { do {
CreateUIElement(layout->aButtonX, layout->aButtonY); CreateUIElement(layout->aButtonX, layout->aButtonY);

4
src/ui.c
View File

@ -756,9 +756,9 @@ void TextUIElement(UIElement* element) {
break; 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; element->unk_0_1 = 0;
if (tmp != 0) { if (tmp != 0) {
tmp += gUnk_080C9044[((SaveHeader*)0x2000000)->language]; tmp += gUnk_080C9044[((SaveHeader*)0x2000000)->language];