mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-28 00:16:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name members for button texts in struct_0200AF00

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/playerUtils.c
+1 -1
View File
@@ -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
src/subtask.c
+3 -3
View File
@@ -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);
src/ui.c
+2 -2
View File
@@ -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];