message definitions

This commit is contained in:
theo3
2023-12-28 21:58:54 -08:00
parent 56688ac226
commit d07c416641
81 changed files with 200 additions and 206 deletions
+3 -3
View File
@@ -626,7 +626,7 @@ void ButtonUIElement_Action1(UIElement* element) {
MAX_MOVEMENT = (!element->type2) ? 4 : 8;
if (element->type2 == 0 && (((gUnk_0200AF00.unk_1 >> element->type) & 1) || (gMessage.doTextBox & 0x7f) != 0)) {
if (element->type2 == 0 && (((gUnk_0200AF00.unk_1 >> element->type) & 1) || (gMessage.state & MESSAGE_ACTIVE) != 0)) {
y = (s16)gUnk_0200AF00.buttonY[element->type] - 0x28;
} else {
y = (s16)gUnk_0200AF00.buttonY[element->type];
@@ -792,7 +792,7 @@ void HeartUIElement(UIElement* element) {
u32 health;
u32 frameIndex;
element->unk_0_1 = 0;
if (((gUnk_0200AF00.unk_1 & 0x10) == 0) && ((gMessage.doTextBox & 0x7f) == 0)) {
if (((gUnk_0200AF00.unk_1 & 0x10) == 0) && ((gMessage.state & MESSAGE_ACTIVE) == 0)) {
health = gUnk_0200AF00.health;
if (health != 0) {
element->unk_0_1 = 1;
@@ -845,7 +845,7 @@ void EzloNagUIElement_Action1(UIElement* element) {
}
void EzloNagUIElement_Action2(UIElement* element) {
if (gUnk_0200AF00.ezloNagFuncIndex >= 5 || (gMessage.doTextBox & 0x7f)) {
if (gUnk_0200AF00.ezloNagFuncIndex >= 5 || (gMessage.state & MESSAGE_ACTIVE)) {
element->action = 0;
element->unk_0_1 = 0;
return;