From 2a8b55c9e18a975a860470c0c6acde05ccaf011e Mon Sep 17 00:00:00 2001
From: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
Date: Thu, 2 Sep 2021 00:37:46 +0200
Subject: [PATCH] Battle Popup Decomp (#411)

* 17D6A0.c decomp

* cleanup

* fix func_8024F84C return type

* BattlePopups renamed to battlePopups

* Rename BattlePopup to PopupMessage and move it to common_structs.h

* Remove unnecessary extern

* Move local declarations inside for loops
---
 include/common_structs.h                      |  15 ++
 src/17D6A0.c                                  | 221 ++++++++++++++++--
 .../17D6A0/ForceCloseMessageBox.s             |  11 -
 .../17D6A0/SetMessageBoxDuration.s            |  15 --
 .../asm/nonmatchings/17D6A0/ShowMessageBox.s  |  26 ---
 .../17D6A0/ShowVariableMessageBox.s           |  34 ---
 .../nonmatchings/17D6A0/btl_create_popup.s    |  21 --
 .../17D6A0/btl_draw_popup_messages.s          |  30 ---
 .../17D6A0/btl_is_popup_displayed.s           |   8 -
 .../17D6A0/btl_show_battle_message.s          |  46 ----
 .../17D6A0/btl_show_variable_battle_message.s |  49 ----
 .../close_action_command_instruction_popup.s  |  17 --
 .../asm/nonmatchings/17D6A0/func_8024EDC0.s   |  16 --
 .../asm/nonmatchings/17D6A0/func_8024EDEC.s   |  29 ---
 .../asm/nonmatchings/17D6A0/func_8024EE48.s   |  30 ---
 .../asm/nonmatchings/17D6A0/func_8024EEA8.s   |  30 ---
 .../asm/nonmatchings/17D6A0/func_8024EFA4.s   |  20 --
 .../asm/nonmatchings/17D6A0/func_8024F394.s   |   2 +-
 .../asm/nonmatchings/17D6A0/func_8024F7C8.s   |   4 +-
 .../asm/nonmatchings/17D6A0/func_8024F84C.s   |  65 ------
 .../asm/nonmatchings/17D6A0/func_8024F940.s   |  12 -
 .../asm/nonmatchings/17D6A0/func_8024FAFC.s   |   8 -
 .../asm/nonmatchings/17D6A0/func_8024FB3C.s   |   2 +-
 .../asm/nonmatchings/17D6A0/func_80251434.s   |  12 -
 .../asm/nonmatchings/17D6A0/func_80251454.s   |  12 -
 ver/us/symbol_addrs.txt                       |   4 +-
 ver/us/undefined_syms.txt                     |   2 +-
 27 files changed, 222 insertions(+), 519 deletions(-)
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/ForceCloseMessageBox.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/SetMessageBoxDuration.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/ShowMessageBox.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/ShowVariableMessageBox.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/btl_create_popup.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/btl_draw_popup_messages.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/btl_is_popup_displayed.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/btl_show_battle_message.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/btl_show_variable_battle_message.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/close_action_command_instruction_popup.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024EDC0.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024EDEC.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024EE48.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024EEA8.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024EFA4.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024F84C.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024F940.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_8024FAFC.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_80251434.s
 delete mode 100644 ver/us/asm/nonmatchings/17D6A0/func_80251454.s

diff --git a/include/common_structs.h b/include/common_structs.h
index ce935b7c30..9f55c22118 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -2283,4 +2283,19 @@ typedef struct ActionCommandStatus {
     /* 0x74 */ s16 mashMeterCutoffs[6]; // upper bounds for each interval
     /* 0x80 */ s8 mashMeterIntervals;
 } ActionCommandStatus;
+
+struct PopupMessage;
+typedef void (*PopupMessageCallback)(struct PopupMessage* popup);
+typedef struct PopupMessage {
+    /* 0x00 */ s32 unk_00;
+    /* 0x04 */ PopupMessageCallback unk_04;
+    /* 0x08 */ PopupMessageCallback unk_08;
+    /* 0x0C */ PopupMessageCallback drawFunc;
+    /* 0x10 */ s16 active;
+    /* 0x12 */ s16 messageIndex;
+    /* 0x14 */ s16 duration;
+    /* 0x16 */ s8 unk_16;
+    /* 0x17 */ s8 unk_17;
+    /* 0x18 */ s32* message;
+} PopupMessage; // size = 0x1C
 #endif
diff --git a/src/17D6A0.c b/src/17D6A0.c
index 32fec065fc..7188d6896b 100644
--- a/src/17D6A0.c
+++ b/src/17D6A0.c
@@ -1,21 +1,95 @@
 #include "common.h"
+#include "effects.h"
 
+extern PopupMessage popupMessages[32];
+extern PopupMessage* D_802838F8;
 extern s16 D_8029F64C;
+extern s16 D_8029F640;
+extern s16 D_8029F64A;
+extern s16 D_8029F64E;
+extern s16 D_8029F650;
+void func_8024FB3C(PopupMessage* popup);
+void btl_show_message_popup(PopupMessage* popup);
 
-INCLUDE_ASM(s32, "17D6A0", func_8024EDC0);
+void func_8024EDC0(void) {
+    s32 i;
 
-INCLUDE_ASM(s32, "17D6A0", func_8024EDEC);
+    for (i = 0; i < ARRAY_COUNT(popupMessages); i++) {
+        PopupMessage* popup = &popupMessages[i];
+        popup->active = FALSE;
+        popup->message = NULL;
+    }
+}
 
-INCLUDE_ASM(s32, "17D6A0", func_8024EE48);
+void func_8024EDEC(void) {
+    s32 i;
 
-INCLUDE_ASM(s32, "17D6A0", func_8024EEA8);
+    for (i = 0; i < ARRAY_COUNT(popupMessages); i++) {
+        PopupMessage* popup = &popupMessages[i];
+        if (popup->message != NULL) {
+            heap_free(popup->message);
+            popup->message = NULL;
+        }
+        popup->active = FALSE;
+    }
+}
 
-INCLUDE_ASM(s32, "17D6A0", btl_draw_popup_messages);
+void func_8024EE48(void) {
+    s32 i;
 
-INCLUDE_ASM(s32, "17D6A0", btl_create_popup);
+    for (i = 0; i < ARRAY_COUNT(popupMessages); i++) {
+        PopupMessage* popup = &popupMessages[i];
+        if (popup->active && popup->unk_04 != NULL) {
+            popup->unk_04(popup);
+        }
+    }
+}
 
-INCLUDE_ASM(s32, "17D6A0", func_8024EFA4);
+void func_8024EEA8(void) {
+    s32 i;
 
+    for (i = 0; i < ARRAY_COUNT(popupMessages); i++) {
+        PopupMessage* popup = &popupMessages[i];
+        if (popup->active && popup->unk_08 != NULL) {
+            popup->unk_08(popup);
+        }
+    }
+}
+
+void btl_draw_popup_messages(void) {
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(popupMessages); i++) {
+        PopupMessage* popup = &popupMessages[i];
+        if (popup->active && popup->drawFunc != NULL) {
+            popup->drawFunc(popup);
+        }
+    }
+}
+
+PopupMessage* btl_create_popup(void) {
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(popupMessages); i++) {
+        PopupMessage* popup = &popupMessages[i];
+        if (!popup->active) {
+            popup->active = TRUE;
+            return popup;
+        }
+    }
+
+    return NULL;
+}
+
+void free_popup(PopupMessage* popup) {
+    if (popup->message != NULL) {
+        heap_free(popup->message);
+        popup->message = NULL;
+    }
+    popup->active = FALSE;
+}
+
+void func_8024EFE0(f32 x, f32 y, f32 z, s32, s32, s32);
 INCLUDE_ASM(s32, "17D6A0", func_8024EFE0);
 
 INCLUDE_ASM(s32, "17D6A0", func_8024F394);
@@ -24,27 +98,103 @@ INCLUDE_ASM(s32, "17D6A0", func_8024F5AC);
 
 INCLUDE_ASM(s32, "17D6A0", func_8024F768);
 
+void func_8024F7C8(void);
 INCLUDE_ASM(s32, "17D6A0", func_8024F7C8);
 
-INCLUDE_ASM(s32, "17D6A0", func_8024F84C);
+ApiStatus func_8024F84C(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 x = evt_get_variable(script, *args++);
+    s32 y = evt_get_variable(script, *args++);
+    s32 z = evt_get_variable(script, *args++);
+    s32 arg4 = evt_get_variable(script, *args++);
+    s32 arg5 = evt_get_variable(script, *args++);
+    s32 arg6 = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "17D6A0", func_8024F940);
+    func_8024EFE0(x, y, z, arg4, arg5, arg6);
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "17D6A0", btl_show_battle_message);
+ApiStatus func_8024F940(Evt* script, s32 isInitialCall) {
+    func_8024F7C8();
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "17D6A0", btl_show_variable_battle_message);
+void btl_show_battle_message(s32 messageIndex, s32 duration) {
+    PopupMessage* popup = btl_create_popup();
 
-INCLUDE_ASM(s32, "17D6A0", btl_is_popup_displayed);
+    if (popup != NULL) {
+        popup->unk_04 = func_8024FB3C;
+        popup->drawFunc = btl_show_message_popup;
+        popup->unk_00 = 0;
+        popup->unk_08 = NULL;
+        popup->messageIndex = messageIndex;
+        popup->duration = duration;
+        popup->unk_16 = 0;
+        popup->unk_17 = 1;
+        popup->message = NULL;
+        D_8029F640 = 0;
+        D_802838F8 = popup;
+        D_8029F64A = 0;
+        D_8029F64C = 0;
+        D_8029F64E = 0;
+        D_8029F650 = 0;
+    }
+}
 
-INCLUDE_ASM(s32, "17D6A0", btl_set_popup_duration);
+void btl_show_variable_battle_message(s32 messageIndex, s32 duration, s32 varValue) {
+    PopupMessage* popup = btl_create_popup();
+
+    if (popup != NULL) {
+        popup->unk_04 = func_8024FB3C;
+        popup->drawFunc = btl_show_message_popup;
+        popup->unk_00 = 0;
+        popup->unk_08 = NULL;
+        popup->messageIndex = messageIndex;
+        popup->duration = duration;
+        popup->unk_16 = 0;
+        popup->unk_17 = 1;
+        popup->message = NULL;
+        D_8029F640 = varValue;
+        D_802838F8 = popup;
+        D_8029F64A = 0;
+        D_8029F64C = 0;
+        D_8029F64E = 0;
+        D_8029F650 = 0;
+    }
+}
+
+s32 btl_is_popup_displayed(void) {
+    return D_802838F8 != NULL;
+}
+
+#ifdef NON_MATCHING // requires data migration
+void btl_set_popup_duration(s32 duration) {
+    PopupMessage* popup = D_802838F8;
+
+    if (D_8029F64A != NULL && popup != NULL) {
+        popup->duration = duration;
+    }
+}
+#else
+void btl_set_popup_duration(s32 duration);
+INCLUDE_ASM(void, "17D6A0", btl_set_popup_duration);
+#endif
 
 void func_8024FAE8(void) {
     D_8029F64C = 1;
 }
 
-INCLUDE_ASM(s32, "17D6A0", func_8024FAFC);
+void func_8024FAFC(void) {
+    D_8029F64C = 0;
+}
 
-INCLUDE_ASM(s32, "17D6A0", close_action_command_instruction_popup);
+void close_action_command_instruction_popup(void) {
+    PopupMessage* popup = D_802838F8;
+
+    if (popup != NULL && popup->messageIndex < 67 && popup->messageIndex >= 46) {
+        popup->duration = 0;
+    }
+}
 
 INCLUDE_ASM(s32, "17D6A0", func_8024FB3C);
 
@@ -52,9 +202,24 @@ INCLUDE_ASM(s32, "17D6A0", func_80250818);
 
 INCLUDE_ASM(s32, "17D6A0", btl_show_message_popup);
 
-INCLUDE_ASM(s32, "17D6A0", ShowMessageBox);
+ApiStatus ShowMessageBox(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 messageIndex = evt_get_variable(script, *args++);
+    s32 duration = evt_get_variable(script, *args++);
 
-INCLUDE_ASM(s32, "17D6A0", ShowVariableMessageBox);
+    btl_show_battle_message(messageIndex, duration);
+    return ApiStatus_DONE2;
+}
+
+ApiStatus ShowVariableMessageBox(Evt* script, s32 isInitialCall) {
+    Bytecode* args = script->ptrReadPos;
+    s32 messageIndex = evt_get_variable(script, *args++);
+    s32 duration = evt_get_variable(script, *args++);
+    s32 varValue = evt_get_variable(script, *args++);
+
+    btl_show_variable_battle_message(messageIndex, duration, varValue);
+    return ApiStatus_DONE2;
+}
 
 ApiStatus IsMessageBoxDisplayed(Evt* script, s32 isInitialCall) {
     Bytecode* args = script->ptrReadPos;
@@ -68,12 +233,26 @@ ApiStatus WaitForMessageBoxDone(Evt* script, s32 isInitialCall) {
     return !btl_is_popup_displayed() * ApiStatus_DONE2;
 }
 
-INCLUDE_ASM(s32, "17D6A0", ForceCloseMessageBox);
+ApiStatus ForceCloseMessageBox(Evt* script, s32 isInitialCall) {
+    if (D_802838F8 != NULL) {
+        D_802838F8->duration = 0;
+    }
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "17D6A0", SetMessageBoxDuration);
+ApiStatus SetMessageBoxDuration(Evt* script, s32 isInitialCall) {
+    btl_set_popup_duration(evt_get_variable(script, *script->ptrReadPos));
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "17D6A0", func_80251434);
+ApiStatus func_80251434(Evt* script, s32 isInitialCall) {
+    func_8024FAE8();
+    return ApiStatus_DONE2;
+}
 
-INCLUDE_ASM(s32, "17D6A0", func_80251454);
+ApiStatus func_80251454(Evt* script, s32 isInitialCall) {
+    func_8024FAFC();
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "17D6A0", func_80251474);
diff --git a/ver/us/asm/nonmatchings/17D6A0/ForceCloseMessageBox.s b/ver/us/asm/nonmatchings/17D6A0/ForceCloseMessageBox.s
deleted file mode 100644
index 5cf7994d37..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/ForceCloseMessageBox.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel ForceCloseMessageBox
-/* 17FCD0 802513F0 3C028028 */  lui       $v0, %hi(D_802838F8)
-/* 17FCD4 802513F4 8C4238F8 */  lw        $v0, %lo(D_802838F8)($v0)
-/* 17FCD8 802513F8 54400001 */  bnel      $v0, $zero, .L80251400
-/* 17FCDC 802513FC A4400014 */   sh       $zero, 0x14($v0)
-.L80251400:
-/* 17FCE0 80251400 03E00008 */  jr        $ra
-/* 17FCE4 80251404 24020002 */   addiu    $v0, $zero, 2
diff --git a/ver/us/asm/nonmatchings/17D6A0/SetMessageBoxDuration.s b/ver/us/asm/nonmatchings/17D6A0/SetMessageBoxDuration.s
deleted file mode 100644
index 35e9f56811..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/SetMessageBoxDuration.s
+++ /dev/null
@@ -1,15 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel SetMessageBoxDuration
-/* 17FCE8 80251408 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 17FCEC 8025140C AFBF0010 */  sw        $ra, 0x10($sp)
-/* 17FCF0 80251410 8C82000C */  lw        $v0, 0xc($a0)
-/* 17FCF4 80251414 0C0B1EAF */  jal       evt_get_variable
-/* 17FCF8 80251418 8C450000 */   lw       $a1, ($v0)
-/* 17FCFC 8025141C 0C093EB1 */  jal       btl_set_popup_duration
-/* 17FD00 80251420 0040202D */   daddu    $a0, $v0, $zero
-/* 17FD04 80251424 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 17FD08 80251428 24020002 */  addiu     $v0, $zero, 2
-/* 17FD0C 8025142C 03E00008 */  jr        $ra
-/* 17FD10 80251430 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/17D6A0/ShowMessageBox.s b/ver/us/asm/nonmatchings/17D6A0/ShowMessageBox.s
deleted file mode 100644
index a480923eae..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/ShowMessageBox.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel ShowMessageBox
-/* 17FB94 802512B4 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17FB98 802512B8 AFB10014 */  sw        $s1, 0x14($sp)
-/* 17FB9C 802512BC 0080882D */  daddu     $s1, $a0, $zero
-/* 17FBA0 802512C0 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 17FBA4 802512C4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17FBA8 802512C8 8E30000C */  lw        $s0, 0xc($s1)
-/* 17FBAC 802512CC 8E050000 */  lw        $a1, ($s0)
-/* 17FBB0 802512D0 0C0B1EAF */  jal       evt_get_variable
-/* 17FBB4 802512D4 26100004 */   addiu    $s0, $s0, 4
-/* 17FBB8 802512D8 0220202D */  daddu     $a0, $s1, $zero
-/* 17FBBC 802512DC 8E050000 */  lw        $a1, ($s0)
-/* 17FBC0 802512E0 0C0B1EAF */  jal       evt_get_variable
-/* 17FBC4 802512E4 0040802D */   daddu    $s0, $v0, $zero
-/* 17FBC8 802512E8 0200202D */  daddu     $a0, $s0, $zero
-/* 17FBCC 802512EC 0C093E58 */  jal       btl_show_battle_message
-/* 17FBD0 802512F0 0040282D */   daddu    $a1, $v0, $zero
-/* 17FBD4 802512F4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 17FBD8 802512F8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17FBDC 802512FC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17FBE0 80251300 24020002 */  addiu     $v0, $zero, 2
-/* 17FBE4 80251304 03E00008 */  jr        $ra
-/* 17FBE8 80251308 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/ShowVariableMessageBox.s b/ver/us/asm/nonmatchings/17D6A0/ShowVariableMessageBox.s
deleted file mode 100644
index e4acd33bcb..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/ShowVariableMessageBox.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel ShowVariableMessageBox
-/* 17FBEC 8025130C 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17FBF0 80251310 AFB10014 */  sw        $s1, 0x14($sp)
-/* 17FBF4 80251314 0080882D */  daddu     $s1, $a0, $zero
-/* 17FBF8 80251318 AFBF001C */  sw        $ra, 0x1c($sp)
-/* 17FBFC 8025131C AFB20018 */  sw        $s2, 0x18($sp)
-/* 17FC00 80251320 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17FC04 80251324 8E30000C */  lw        $s0, 0xc($s1)
-/* 17FC08 80251328 8E050000 */  lw        $a1, ($s0)
-/* 17FC0C 8025132C 0C0B1EAF */  jal       evt_get_variable
-/* 17FC10 80251330 26100004 */   addiu    $s0, $s0, 4
-/* 17FC14 80251334 8E050000 */  lw        $a1, ($s0)
-/* 17FC18 80251338 26100004 */  addiu     $s0, $s0, 4
-/* 17FC1C 8025133C 0220202D */  daddu     $a0, $s1, $zero
-/* 17FC20 80251340 0C0B1EAF */  jal       evt_get_variable
-/* 17FC24 80251344 0040902D */   daddu    $s2, $v0, $zero
-/* 17FC28 80251348 0220202D */  daddu     $a0, $s1, $zero
-/* 17FC2C 8025134C 8E050000 */  lw        $a1, ($s0)
-/* 17FC30 80251350 0C0B1EAF */  jal       evt_get_variable
-/* 17FC34 80251354 0040802D */   daddu    $s0, $v0, $zero
-/* 17FC38 80251358 0240202D */  daddu     $a0, $s2, $zero
-/* 17FC3C 8025135C 0200282D */  daddu     $a1, $s0, $zero
-/* 17FC40 80251360 0C093E81 */  jal       btl_show_variable_battle_message
-/* 17FC44 80251364 0040302D */   daddu    $a2, $v0, $zero
-/* 17FC48 80251368 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 17FC4C 8025136C 8FB20018 */  lw        $s2, 0x18($sp)
-/* 17FC50 80251370 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17FC54 80251374 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17FC58 80251378 24020002 */  addiu     $v0, $zero, 2
-/* 17FC5C 8025137C 03E00008 */  jr        $ra
-/* 17FC60 80251380 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/btl_create_popup.s b/ver/us/asm/nonmatchings/17D6A0/btl_create_popup.s
deleted file mode 100644
index a3532ecddb..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/btl_create_popup.s
+++ /dev/null
@@ -1,21 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_create_popup
-/* 17D848 8024EF68 0000202D */  daddu     $a0, $zero, $zero
-/* 17D84C 8024EF6C 24050001 */  addiu     $a1, $zero, 1
-/* 17D850 8024EF70 3C03802A */  lui       $v1, %hi(D_8029F2C0)
-/* 17D854 8024EF74 2463F2C0 */  addiu     $v1, $v1, %lo(D_8029F2C0)
-.L8024EF78:
-/* 17D858 8024EF78 84620010 */  lh        $v0, 0x10($v1)
-/* 17D85C 8024EF7C 14400004 */  bnez      $v0, .L8024EF90
-/* 17D860 8024EF80 24840001 */   addiu    $a0, $a0, 1
-/* 17D864 8024EF84 A4650010 */  sh        $a1, 0x10($v1)
-/* 17D868 8024EF88 03E00008 */  jr        $ra
-/* 17D86C 8024EF8C 0060102D */   daddu    $v0, $v1, $zero
-.L8024EF90:
-/* 17D870 8024EF90 28820020 */  slti      $v0, $a0, 0x20
-/* 17D874 8024EF94 1440FFF8 */  bnez      $v0, .L8024EF78
-/* 17D878 8024EF98 2463001C */   addiu    $v1, $v1, 0x1c
-/* 17D87C 8024EF9C 03E00008 */  jr        $ra
-/* 17D880 8024EFA0 0000102D */   daddu    $v0, $zero, $zero
diff --git a/ver/us/asm/nonmatchings/17D6A0/btl_draw_popup_messages.s b/ver/us/asm/nonmatchings/17D6A0/btl_draw_popup_messages.s
deleted file mode 100644
index 1408d4b2cc..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/btl_draw_popup_messages.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_draw_popup_messages
-/* 17D7E8 8024EF08 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17D7EC 8024EF0C AFB10014 */  sw        $s1, 0x14($sp)
-/* 17D7F0 8024EF10 0000882D */  daddu     $s1, $zero, $zero
-/* 17D7F4 8024EF14 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17D7F8 8024EF18 3C10802A */  lui       $s0, %hi(D_8029F2C0)
-/* 17D7FC 8024EF1C 2610F2C0 */  addiu     $s0, $s0, %lo(D_8029F2C0)
-/* 17D800 8024EF20 AFBF0018 */  sw        $ra, 0x18($sp)
-.L8024EF24:
-/* 17D804 8024EF24 86020010 */  lh        $v0, 0x10($s0)
-/* 17D808 8024EF28 50400007 */  beql      $v0, $zero, .L8024EF48
-/* 17D80C 8024EF2C 26310001 */   addiu    $s1, $s1, 1
-/* 17D810 8024EF30 8E02000C */  lw        $v0, 0xc($s0)
-/* 17D814 8024EF34 50400004 */  beql      $v0, $zero, .L8024EF48
-/* 17D818 8024EF38 26310001 */   addiu    $s1, $s1, 1
-/* 17D81C 8024EF3C 0040F809 */  jalr      $v0
-/* 17D820 8024EF40 0200202D */   daddu    $a0, $s0, $zero
-/* 17D824 8024EF44 26310001 */  addiu     $s1, $s1, 1
-.L8024EF48:
-/* 17D828 8024EF48 2A220020 */  slti      $v0, $s1, 0x20
-/* 17D82C 8024EF4C 1440FFF5 */  bnez      $v0, .L8024EF24
-/* 17D830 8024EF50 2610001C */   addiu    $s0, $s0, 0x1c
-/* 17D834 8024EF54 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 17D838 8024EF58 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17D83C 8024EF5C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17D840 8024EF60 03E00008 */  jr        $ra
-/* 17D844 8024EF64 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/btl_is_popup_displayed.s b/ver/us/asm/nonmatchings/17D6A0/btl_is_popup_displayed.s
deleted file mode 100644
index 21e87c05f4..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/btl_is_popup_displayed.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_is_popup_displayed
-/* 17E394 8024FAB4 3C028028 */  lui       $v0, %hi(D_802838F8)
-/* 17E398 8024FAB8 8C4238F8 */  lw        $v0, %lo(D_802838F8)($v0)
-/* 17E39C 8024FABC 03E00008 */  jr        $ra
-/* 17E3A0 8024FAC0 0002102B */   sltu     $v0, $zero, $v0
diff --git a/ver/us/asm/nonmatchings/17D6A0/btl_show_battle_message.s b/ver/us/asm/nonmatchings/17D6A0/btl_show_battle_message.s
deleted file mode 100644
index 5430b1b269..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/btl_show_battle_message.s
+++ /dev/null
@@ -1,46 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_show_battle_message
-/* 17E240 8024F960 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17E244 8024F964 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17E248 8024F968 0080802D */  daddu     $s0, $a0, $zero
-/* 17E24C 8024F96C AFB10014 */  sw        $s1, 0x14($sp)
-/* 17E250 8024F970 AFBF0018 */  sw        $ra, 0x18($sp)
-/* 17E254 8024F974 0C093BDA */  jal       btl_create_popup
-/* 17E258 8024F978 00A0882D */   daddu    $s1, $a1, $zero
-/* 17E25C 8024F97C 0040182D */  daddu     $v1, $v0, $zero
-/* 17E260 8024F980 1060001B */  beqz      $v1, .L8024F9F0
-/* 17E264 8024F984 00000000 */   nop
-/* 17E268 8024F988 3C028025 */  lui       $v0, %hi(func_8024FB3C)
-/* 17E26C 8024F98C 2442FB3C */  addiu     $v0, $v0, %lo(func_8024FB3C)
-/* 17E270 8024F990 AC620004 */  sw        $v0, 4($v1)
-/* 17E274 8024F994 3C028025 */  lui       $v0, %hi(btl_show_message_popup)
-/* 17E278 8024F998 24420EA4 */  addiu     $v0, $v0, %lo(btl_show_message_popup)
-/* 17E27C 8024F99C AC62000C */  sw        $v0, 0xc($v1)
-/* 17E280 8024F9A0 24020001 */  addiu     $v0, $zero, 1
-/* 17E284 8024F9A4 AC600000 */  sw        $zero, ($v1)
-/* 17E288 8024F9A8 AC600008 */  sw        $zero, 8($v1)
-/* 17E28C 8024F9AC A4700012 */  sh        $s0, 0x12($v1)
-/* 17E290 8024F9B0 A4710014 */  sh        $s1, 0x14($v1)
-/* 17E294 8024F9B4 A0600016 */  sb        $zero, 0x16($v1)
-/* 17E298 8024F9B8 A0620017 */  sb        $v0, 0x17($v1)
-/* 17E29C 8024F9BC AC600018 */  sw        $zero, 0x18($v1)
-/* 17E2A0 8024F9C0 3C01802A */  lui       $at, %hi(D_8029F640)
-/* 17E2A4 8024F9C4 A420F640 */  sh        $zero, %lo(D_8029F640)($at)
-/* 17E2A8 8024F9C8 3C018028 */  lui       $at, %hi(D_802838F8)
-/* 17E2AC 8024F9CC AC2338F8 */  sw        $v1, %lo(D_802838F8)($at)
-/* 17E2B0 8024F9D0 3C01802A */  lui       $at, %hi(D_8029F64A)
-/* 17E2B4 8024F9D4 A420F64A */  sh        $zero, %lo(D_8029F64A)($at)
-/* 17E2B8 8024F9D8 3C01802A */  lui       $at, %hi(D_8029F64C)
-/* 17E2BC 8024F9DC A420F64C */  sh        $zero, %lo(D_8029F64C)($at)
-/* 17E2C0 8024F9E0 3C01802A */  lui       $at, %hi(D_8029F64E)
-/* 17E2C4 8024F9E4 A420F64E */  sh        $zero, %lo(D_8029F64E)($at)
-/* 17E2C8 8024F9E8 3C01802A */  lui       $at, %hi(D_8029F650)
-/* 17E2CC 8024F9EC A420F650 */  sh        $zero, %lo(D_8029F650)($at)
-.L8024F9F0:
-/* 17E2D0 8024F9F0 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 17E2D4 8024F9F4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17E2D8 8024F9F8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17E2DC 8024F9FC 03E00008 */  jr        $ra
-/* 17E2E0 8024FA00 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/btl_show_variable_battle_message.s b/ver/us/asm/nonmatchings/17D6A0/btl_show_variable_battle_message.s
deleted file mode 100644
index 9d982a15d8..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/btl_show_variable_battle_message.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel btl_show_variable_battle_message
-/* 17E2E4 8024FA04 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17E2E8 8024FA08 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17E2EC 8024FA0C 0080802D */  daddu     $s0, $a0, $zero
-/* 17E2F0 8024FA10 AFB10014 */  sw        $s1, 0x14($sp)
-/* 17E2F4 8024FA14 00A0882D */  daddu     $s1, $a1, $zero
-/* 17E2F8 8024FA18 AFB20018 */  sw        $s2, 0x18($sp)
-/* 17E2FC 8024FA1C AFBF001C */  sw        $ra, 0x1c($sp)
-/* 17E300 8024FA20 0C093BDA */  jal       btl_create_popup
-/* 17E304 8024FA24 00C0902D */   daddu    $s2, $a2, $zero
-/* 17E308 8024FA28 0040182D */  daddu     $v1, $v0, $zero
-/* 17E30C 8024FA2C 1060001B */  beqz      $v1, .L8024FA9C
-/* 17E310 8024FA30 00000000 */   nop
-/* 17E314 8024FA34 3C028025 */  lui       $v0, %hi(func_8024FB3C)
-/* 17E318 8024FA38 2442FB3C */  addiu     $v0, $v0, %lo(func_8024FB3C)
-/* 17E31C 8024FA3C AC620004 */  sw        $v0, 4($v1)
-/* 17E320 8024FA40 3C028025 */  lui       $v0, %hi(btl_show_message_popup)
-/* 17E324 8024FA44 24420EA4 */  addiu     $v0, $v0, %lo(btl_show_message_popup)
-/* 17E328 8024FA48 AC62000C */  sw        $v0, 0xc($v1)
-/* 17E32C 8024FA4C 24020001 */  addiu     $v0, $zero, 1
-/* 17E330 8024FA50 AC600000 */  sw        $zero, ($v1)
-/* 17E334 8024FA54 AC600008 */  sw        $zero, 8($v1)
-/* 17E338 8024FA58 A4700012 */  sh        $s0, 0x12($v1)
-/* 17E33C 8024FA5C A4710014 */  sh        $s1, 0x14($v1)
-/* 17E340 8024FA60 A0600016 */  sb        $zero, 0x16($v1)
-/* 17E344 8024FA64 A0620017 */  sb        $v0, 0x17($v1)
-/* 17E348 8024FA68 AC600018 */  sw        $zero, 0x18($v1)
-/* 17E34C 8024FA6C 3C01802A */  lui       $at, %hi(D_8029F640)
-/* 17E350 8024FA70 A432F640 */  sh        $s2, %lo(D_8029F640)($at)
-/* 17E354 8024FA74 3C018028 */  lui       $at, %hi(D_802838F8)
-/* 17E358 8024FA78 AC2338F8 */  sw        $v1, %lo(D_802838F8)($at)
-/* 17E35C 8024FA7C 3C01802A */  lui       $at, %hi(D_8029F64A)
-/* 17E360 8024FA80 A420F64A */  sh        $zero, %lo(D_8029F64A)($at)
-/* 17E364 8024FA84 3C01802A */  lui       $at, %hi(D_8029F64C)
-/* 17E368 8024FA88 A420F64C */  sh        $zero, %lo(D_8029F64C)($at)
-/* 17E36C 8024FA8C 3C01802A */  lui       $at, %hi(D_8029F64E)
-/* 17E370 8024FA90 A420F64E */  sh        $zero, %lo(D_8029F64E)($at)
-/* 17E374 8024FA94 3C01802A */  lui       $at, %hi(D_8029F650)
-/* 17E378 8024FA98 A420F650 */  sh        $zero, %lo(D_8029F650)($at)
-.L8024FA9C:
-/* 17E37C 8024FA9C 8FBF001C */  lw        $ra, 0x1c($sp)
-/* 17E380 8024FAA0 8FB20018 */  lw        $s2, 0x18($sp)
-/* 17E384 8024FAA4 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17E388 8024FAA8 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17E38C 8024FAAC 03E00008 */  jr        $ra
-/* 17E390 8024FAB0 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/close_action_command_instruction_popup.s b/ver/us/asm/nonmatchings/17D6A0/close_action_command_instruction_popup.s
deleted file mode 100644
index 7fa0e9aace..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/close_action_command_instruction_popup.s
+++ /dev/null
@@ -1,17 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel close_action_command_instruction_popup
-/* 17E3EC 8024FB0C 3C038028 */  lui       $v1, %hi(D_802838F8)
-/* 17E3F0 8024FB10 8C6338F8 */  lw        $v1, %lo(D_802838F8)($v1)
-/* 17E3F4 8024FB14 10600007 */  beqz      $v1, .L8024FB34
-/* 17E3F8 8024FB18 00000000 */   nop
-/* 17E3FC 8024FB1C 84640012 */  lh        $a0, 0x12($v1)
-/* 17E400 8024FB20 28820043 */  slti      $v0, $a0, 0x43
-/* 17E404 8024FB24 10400003 */  beqz      $v0, .L8024FB34
-/* 17E408 8024FB28 2882002E */   slti     $v0, $a0, 0x2e
-/* 17E40C 8024FB2C 50400001 */  beql      $v0, $zero, .L8024FB34
-/* 17E410 8024FB30 A4600014 */   sh       $zero, 0x14($v1)
-.L8024FB34:
-/* 17E414 8024FB34 03E00008 */  jr        $ra
-/* 17E418 8024FB38 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024EDC0.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EDC0.s
deleted file mode 100644
index f4236ee4f5..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024EDC0.s
+++ /dev/null
@@ -1,16 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024EDC0
-/* 17D6A0 8024EDC0 0000202D */  daddu     $a0, $zero, $zero
-/* 17D6A4 8024EDC4 3C03802A */  lui       $v1, %hi(D_8029F2C0)
-/* 17D6A8 8024EDC8 2463F2C0 */  addiu     $v1, $v1, %lo(D_8029F2C0)
-.L8024EDCC:
-/* 17D6AC 8024EDCC A4600010 */  sh        $zero, 0x10($v1)
-/* 17D6B0 8024EDD0 AC600018 */  sw        $zero, 0x18($v1)
-/* 17D6B4 8024EDD4 24840001 */  addiu     $a0, $a0, 1
-/* 17D6B8 8024EDD8 28820020 */  slti      $v0, $a0, 0x20
-/* 17D6BC 8024EDDC 1440FFFB */  bnez      $v0, .L8024EDCC
-/* 17D6C0 8024EDE0 2463001C */   addiu    $v1, $v1, 0x1c
-/* 17D6C4 8024EDE4 03E00008 */  jr        $ra
-/* 17D6C8 8024EDE8 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024EDEC.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EDEC.s
deleted file mode 100644
index 9d7d2869f6..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024EDEC.s
+++ /dev/null
@@ -1,29 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024EDEC
-/* 17D6CC 8024EDEC 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17D6D0 8024EDF0 AFB10014 */  sw        $s1, 0x14($sp)
-/* 17D6D4 8024EDF4 0000882D */  daddu     $s1, $zero, $zero
-/* 17D6D8 8024EDF8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17D6DC 8024EDFC 3C10802A */  lui       $s0, %hi(D_8029F2C0)
-/* 17D6E0 8024EE00 2610F2C0 */  addiu     $s0, $s0, %lo(D_8029F2C0)
-/* 17D6E4 8024EE04 AFBF0018 */  sw        $ra, 0x18($sp)
-.L8024EE08:
-/* 17D6E8 8024EE08 8E040018 */  lw        $a0, 0x18($s0)
-/* 17D6EC 8024EE0C 50800005 */  beql      $a0, $zero, .L8024EE24
-/* 17D6F0 8024EE10 A6000010 */   sh       $zero, 0x10($s0)
-/* 17D6F4 8024EE14 0C00AB4B */  jal       heap_free
-/* 17D6F8 8024EE18 00000000 */   nop
-/* 17D6FC 8024EE1C AE000018 */  sw        $zero, 0x18($s0)
-/* 17D700 8024EE20 A6000010 */  sh        $zero, 0x10($s0)
-.L8024EE24:
-/* 17D704 8024EE24 26310001 */  addiu     $s1, $s1, 1
-/* 17D708 8024EE28 2A220020 */  slti      $v0, $s1, 0x20
-/* 17D70C 8024EE2C 1440FFF6 */  bnez      $v0, .L8024EE08
-/* 17D710 8024EE30 2610001C */   addiu    $s0, $s0, 0x1c
-/* 17D714 8024EE34 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 17D718 8024EE38 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17D71C 8024EE3C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17D720 8024EE40 03E00008 */  jr        $ra
-/* 17D724 8024EE44 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024EE48.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EE48.s
deleted file mode 100644
index 7aef282363..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024EE48.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024EE48
-/* 17D728 8024EE48 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17D72C 8024EE4C AFB10014 */  sw        $s1, 0x14($sp)
-/* 17D730 8024EE50 0000882D */  daddu     $s1, $zero, $zero
-/* 17D734 8024EE54 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17D738 8024EE58 3C10802A */  lui       $s0, %hi(D_8029F2C0)
-/* 17D73C 8024EE5C 2610F2C0 */  addiu     $s0, $s0, %lo(D_8029F2C0)
-/* 17D740 8024EE60 AFBF0018 */  sw        $ra, 0x18($sp)
-.L8024EE64:
-/* 17D744 8024EE64 86020010 */  lh        $v0, 0x10($s0)
-/* 17D748 8024EE68 50400007 */  beql      $v0, $zero, .L8024EE88
-/* 17D74C 8024EE6C 26310001 */   addiu    $s1, $s1, 1
-/* 17D750 8024EE70 8E020004 */  lw        $v0, 4($s0)
-/* 17D754 8024EE74 50400004 */  beql      $v0, $zero, .L8024EE88
-/* 17D758 8024EE78 26310001 */   addiu    $s1, $s1, 1
-/* 17D75C 8024EE7C 0040F809 */  jalr      $v0
-/* 17D760 8024EE80 0200202D */   daddu    $a0, $s0, $zero
-/* 17D764 8024EE84 26310001 */  addiu     $s1, $s1, 1
-.L8024EE88:
-/* 17D768 8024EE88 2A220020 */  slti      $v0, $s1, 0x20
-/* 17D76C 8024EE8C 1440FFF5 */  bnez      $v0, .L8024EE64
-/* 17D770 8024EE90 2610001C */   addiu    $s0, $s0, 0x1c
-/* 17D774 8024EE94 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 17D778 8024EE98 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17D77C 8024EE9C 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17D780 8024EEA0 03E00008 */  jr        $ra
-/* 17D784 8024EEA4 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024EEA8.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EEA8.s
deleted file mode 100644
index 11798a9bf2..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024EEA8.s
+++ /dev/null
@@ -1,30 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024EEA8
-/* 17D788 8024EEA8 27BDFFE0 */  addiu     $sp, $sp, -0x20
-/* 17D78C 8024EEAC AFB10014 */  sw        $s1, 0x14($sp)
-/* 17D790 8024EEB0 0000882D */  daddu     $s1, $zero, $zero
-/* 17D794 8024EEB4 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17D798 8024EEB8 3C10802A */  lui       $s0, %hi(D_8029F2C0)
-/* 17D79C 8024EEBC 2610F2C0 */  addiu     $s0, $s0, %lo(D_8029F2C0)
-/* 17D7A0 8024EEC0 AFBF0018 */  sw        $ra, 0x18($sp)
-.L8024EEC4:
-/* 17D7A4 8024EEC4 86020010 */  lh        $v0, 0x10($s0)
-/* 17D7A8 8024EEC8 50400007 */  beql      $v0, $zero, .L8024EEE8
-/* 17D7AC 8024EECC 26310001 */   addiu    $s1, $s1, 1
-/* 17D7B0 8024EED0 8E020008 */  lw        $v0, 8($s0)
-/* 17D7B4 8024EED4 50400004 */  beql      $v0, $zero, .L8024EEE8
-/* 17D7B8 8024EED8 26310001 */   addiu    $s1, $s1, 1
-/* 17D7BC 8024EEDC 0040F809 */  jalr      $v0
-/* 17D7C0 8024EEE0 0200202D */   daddu    $a0, $s0, $zero
-/* 17D7C4 8024EEE4 26310001 */  addiu     $s1, $s1, 1
-.L8024EEE8:
-/* 17D7C8 8024EEE8 2A220020 */  slti      $v0, $s1, 0x20
-/* 17D7CC 8024EEEC 1440FFF5 */  bnez      $v0, .L8024EEC4
-/* 17D7D0 8024EEF0 2610001C */   addiu    $s0, $s0, 0x1c
-/* 17D7D4 8024EEF4 8FBF0018 */  lw        $ra, 0x18($sp)
-/* 17D7D8 8024EEF8 8FB10014 */  lw        $s1, 0x14($sp)
-/* 17D7DC 8024EEFC 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17D7E0 8024EF00 03E00008 */  jr        $ra
-/* 17D7E4 8024EF04 27BD0020 */   addiu    $sp, $sp, 0x20
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024EFA4.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EFA4.s
deleted file mode 100644
index 86da09c928..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024EFA4.s
+++ /dev/null
@@ -1,20 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024EFA4
-/* 17D884 8024EFA4 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 17D888 8024EFA8 AFB00010 */  sw        $s0, 0x10($sp)
-/* 17D88C 8024EFAC 0080802D */  daddu     $s0, $a0, $zero
-/* 17D890 8024EFB0 AFBF0014 */  sw        $ra, 0x14($sp)
-/* 17D894 8024EFB4 8E040018 */  lw        $a0, 0x18($s0)
-/* 17D898 8024EFB8 50800005 */  beql      $a0, $zero, .L8024EFD0
-/* 17D89C 8024EFBC A6000010 */   sh       $zero, 0x10($s0)
-/* 17D8A0 8024EFC0 0C00AB4B */  jal       heap_free
-/* 17D8A4 8024EFC4 00000000 */   nop
-/* 17D8A8 8024EFC8 AE000018 */  sw        $zero, 0x18($s0)
-/* 17D8AC 8024EFCC A6000010 */  sh        $zero, 0x10($s0)
-.L8024EFD0:
-/* 17D8B0 8024EFD0 8FBF0014 */  lw        $ra, 0x14($sp)
-/* 17D8B4 8024EFD4 8FB00010 */  lw        $s0, 0x10($sp)
-/* 17D8B8 8024EFD8 03E00008 */  jr        $ra
-/* 17D8BC 8024EFDC 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024F394.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F394.s
index 626ef2b9aa..a16d0c889e 100644
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024F394.s
+++ b/ver/us/asm/nonmatchings/17D6A0/func_8024F394.s
@@ -139,7 +139,7 @@ glabel func_8024F394
 /* 17DE50 8024F570 0C00AB4B */  jal       heap_free
 /* 17DE54 8024F574 8E840018 */   lw       $a0, 0x18($s4)
 /* 17DE58 8024F578 0280202D */  daddu     $a0, $s4, $zero
-/* 17DE5C 8024F57C 0C093BE9 */  jal       func_8024EFA4
+/* 17DE5C 8024F57C 0C093BE9 */  jal       free_popup
 /* 17DE60 8024F580 AC800018 */   sw       $zero, 0x18($a0)
 .L8024F584:
 /* 17DE64 8024F584 8FBF0028 */  lw        $ra, 0x28($sp)
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024F7C8.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F7C8.s
index b3cf6a587b..f3d54e6254 100644
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024F7C8.s
+++ b/ver/us/asm/nonmatchings/17D6A0/func_8024F7C8.s
@@ -5,8 +5,8 @@ glabel func_8024F7C8
 /* 17E0A8 8024F7C8 0000382D */  daddu     $a3, $zero, $zero
 /* 17E0AC 8024F7CC 24090001 */  addiu     $t1, $zero, 1
 /* 17E0B0 8024F7D0 24080014 */  addiu     $t0, $zero, 0x14
-/* 17E0B4 8024F7D4 3C06802A */  lui       $a2, %hi(D_8029F2C0)
-/* 17E0B8 8024F7D8 24C6F2C0 */  addiu     $a2, $a2, %lo(D_8029F2C0)
+/* 17E0B4 8024F7D4 3C06802A */  lui       $a2, %hi(popupMessages)
+/* 17E0B8 8024F7D8 24C6F2C0 */  addiu     $a2, $a2, %lo(popupMessages)
 .L8024F7DC:
 /* 17E0BC 8024F7DC 84C20010 */  lh        $v0, 0x10($a2)
 /* 17E0C0 8024F7E0 94C30010 */  lhu       $v1, 0x10($a2)
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024F84C.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F84C.s
deleted file mode 100644
index 48b22bc1c0..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024F84C.s
+++ /dev/null
@@ -1,65 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024F84C
-/* 17E12C 8024F84C 27BDFFC8 */  addiu     $sp, $sp, -0x38
-/* 17E130 8024F850 AFB1001C */  sw        $s1, 0x1c($sp)
-/* 17E134 8024F854 0080882D */  daddu     $s1, $a0, $zero
-/* 17E138 8024F858 AFBF0030 */  sw        $ra, 0x30($sp)
-/* 17E13C 8024F85C AFB5002C */  sw        $s5, 0x2c($sp)
-/* 17E140 8024F860 AFB40028 */  sw        $s4, 0x28($sp)
-/* 17E144 8024F864 AFB30024 */  sw        $s3, 0x24($sp)
-/* 17E148 8024F868 AFB20020 */  sw        $s2, 0x20($sp)
-/* 17E14C 8024F86C AFB00018 */  sw        $s0, 0x18($sp)
-/* 17E150 8024F870 8E30000C */  lw        $s0, 0xc($s1)
-/* 17E154 8024F874 8E050000 */  lw        $a1, ($s0)
-/* 17E158 8024F878 0C0B1EAF */  jal       evt_get_variable
-/* 17E15C 8024F87C 26100004 */   addiu    $s0, $s0, 4
-/* 17E160 8024F880 8E050000 */  lw        $a1, ($s0)
-/* 17E164 8024F884 26100004 */  addiu     $s0, $s0, 4
-/* 17E168 8024F888 0220202D */  daddu     $a0, $s1, $zero
-/* 17E16C 8024F88C 0C0B1EAF */  jal       evt_get_variable
-/* 17E170 8024F890 0040A82D */   daddu    $s5, $v0, $zero
-/* 17E174 8024F894 8E050000 */  lw        $a1, ($s0)
-/* 17E178 8024F898 26100004 */  addiu     $s0, $s0, 4
-/* 17E17C 8024F89C 0220202D */  daddu     $a0, $s1, $zero
-/* 17E180 8024F8A0 0C0B1EAF */  jal       evt_get_variable
-/* 17E184 8024F8A4 0040A02D */   daddu    $s4, $v0, $zero
-/* 17E188 8024F8A8 8E050000 */  lw        $a1, ($s0)
-/* 17E18C 8024F8AC 26100004 */  addiu     $s0, $s0, 4
-/* 17E190 8024F8B0 0220202D */  daddu     $a0, $s1, $zero
-/* 17E194 8024F8B4 0C0B1EAF */  jal       evt_get_variable
-/* 17E198 8024F8B8 0040982D */   daddu    $s3, $v0, $zero
-/* 17E19C 8024F8BC 8E050000 */  lw        $a1, ($s0)
-/* 17E1A0 8024F8C0 26100004 */  addiu     $s0, $s0, 4
-/* 17E1A4 8024F8C4 0220202D */  daddu     $a0, $s1, $zero
-/* 17E1A8 8024F8C8 0C0B1EAF */  jal       evt_get_variable
-/* 17E1AC 8024F8CC 0040902D */   daddu    $s2, $v0, $zero
-/* 17E1B0 8024F8D0 0220202D */  daddu     $a0, $s1, $zero
-/* 17E1B4 8024F8D4 8E050000 */  lw        $a1, ($s0)
-/* 17E1B8 8024F8D8 0C0B1EAF */  jal       evt_get_variable
-/* 17E1BC 8024F8DC 0040802D */   daddu    $s0, $v0, $zero
-/* 17E1C0 8024F8E0 44956000 */  mtc1      $s5, $f12
-/* 17E1C4 8024F8E4 00000000 */  nop
-/* 17E1C8 8024F8E8 46806320 */  cvt.s.w   $f12, $f12
-/* 17E1CC 8024F8EC 44947000 */  mtc1      $s4, $f14
-/* 17E1D0 8024F8F0 00000000 */  nop
-/* 17E1D4 8024F8F4 468073A0 */  cvt.s.w   $f14, $f14
-/* 17E1D8 8024F8F8 44930000 */  mtc1      $s3, $f0
-/* 17E1DC 8024F8FC 00000000 */  nop
-/* 17E1E0 8024F900 46800020 */  cvt.s.w   $f0, $f0
-/* 17E1E4 8024F904 44060000 */  mfc1      $a2, $f0
-/* 17E1E8 8024F908 0240382D */  daddu     $a3, $s2, $zero
-/* 17E1EC 8024F90C AFB00010 */  sw        $s0, 0x10($sp)
-/* 17E1F0 8024F910 0C093BF8 */  jal       func_8024EFE0
-/* 17E1F4 8024F914 AFA20014 */   sw       $v0, 0x14($sp)
-/* 17E1F8 8024F918 8FBF0030 */  lw        $ra, 0x30($sp)
-/* 17E1FC 8024F91C 8FB5002C */  lw        $s5, 0x2c($sp)
-/* 17E200 8024F920 8FB40028 */  lw        $s4, 0x28($sp)
-/* 17E204 8024F924 8FB30024 */  lw        $s3, 0x24($sp)
-/* 17E208 8024F928 8FB20020 */  lw        $s2, 0x20($sp)
-/* 17E20C 8024F92C 8FB1001C */  lw        $s1, 0x1c($sp)
-/* 17E210 8024F930 8FB00018 */  lw        $s0, 0x18($sp)
-/* 17E214 8024F934 24020002 */  addiu     $v0, $zero, 2
-/* 17E218 8024F938 03E00008 */  jr        $ra
-/* 17E21C 8024F93C 27BD0038 */   addiu    $sp, $sp, 0x38
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024F940.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F940.s
deleted file mode 100644
index 93a36400b3..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024F940.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024F940
-/* 17E220 8024F940 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 17E224 8024F944 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 17E228 8024F948 0C093DF2 */  jal       func_8024F7C8
-/* 17E22C 8024F94C 00000000 */   nop
-/* 17E230 8024F950 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 17E234 8024F954 24020002 */  addiu     $v0, $zero, 2
-/* 17E238 8024F958 03E00008 */  jr        $ra
-/* 17E23C 8024F95C 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024FAFC.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FAFC.s
deleted file mode 100644
index b413bc3379..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024FAFC.s
+++ /dev/null
@@ -1,8 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_8024FAFC
-/* 17E3DC 8024FAFC 3C01802A */  lui       $at, %hi(D_8029F64C)
-/* 17E3E0 8024FB00 A420F64C */  sh        $zero, %lo(D_8029F64C)($at)
-/* 17E3E4 8024FB04 03E00008 */  jr        $ra
-/* 17E3E8 8024FB08 00000000 */   nop
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s
index 45387baec2..9df0b11217 100644
--- a/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s
+++ b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s
@@ -921,7 +921,7 @@ glabel L802507A8_17F088
 /* 17F0CC 802507EC 24050002 */   addiu    $a1, $zero, 2
 /* 17F0D0 802507F0 3C018028 */  lui       $at, %hi(D_802838F8)
 /* 17F0D4 802507F4 AC2038F8 */  sw        $zero, %lo(D_802838F8)($at)
-/* 17F0D8 802507F8 0C093BE9 */  jal       func_8024EFA4
+/* 17F0D8 802507F8 0C093BE9 */  jal       free_popup
 /* 17F0DC 802507FC 0220202D */   daddu    $a0, $s1, $zero
 .L80250800:
 /* 17F0E0 80250800 8FBF001C */  lw        $ra, 0x1c($sp)
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_80251434.s b/ver/us/asm/nonmatchings/17D6A0/func_80251434.s
deleted file mode 100644
index 871197f3fe..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_80251434.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80251434
-/* 17FD14 80251434 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 17FD18 80251438 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 17FD1C 8025143C 0C093EBA */  jal       func_8024FAE8
-/* 17FD20 80251440 00000000 */   nop
-/* 17FD24 80251444 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 17FD28 80251448 24020002 */  addiu     $v0, $zero, 2
-/* 17FD2C 8025144C 03E00008 */  jr        $ra
-/* 17FD30 80251450 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/asm/nonmatchings/17D6A0/func_80251454.s b/ver/us/asm/nonmatchings/17D6A0/func_80251454.s
deleted file mode 100644
index 23afa7ac18..0000000000
--- a/ver/us/asm/nonmatchings/17D6A0/func_80251454.s
+++ /dev/null
@@ -1,12 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_80251454
-/* 17FD34 80251454 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* 17FD38 80251458 AFBF0010 */  sw        $ra, 0x10($sp)
-/* 17FD3C 8025145C 0C093EBF */  jal       func_8024FAFC
-/* 17FD40 80251460 00000000 */   nop
-/* 17FD44 80251464 8FBF0010 */  lw        $ra, 0x10($sp)
-/* 17FD48 80251468 24020002 */  addiu     $v0, $zero, 2
-/* 17FD4C 8025146C 03E00008 */  jr        $ra
-/* 17FD50 80251470 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt
index 132e49c403..ef827c74a0 100644
--- a/ver/us/symbol_addrs.txt
+++ b/ver/us/symbol_addrs.txt
@@ -3917,7 +3917,7 @@ func_8024EE48 = 0x8024EE48; // type:func rom:0x17D728
 func_8024EEA8 = 0x8024EEA8; // type:func rom:0x17D788
 btl_draw_popup_messages = 0x8024EF08; // type:func rom:0x17D7E8
 btl_create_popup = 0x8024EF68; // type:func rom:0x17D848
-func_8024EFA4 = 0x8024EFA4; // type:func rom:0x17D884
+free_popup = 0x8024EFA4; // type:func rom:0x17D884
 func_8024EFE0 = 0x8024EFE0; // type:func rom:0x17D8C0
 func_8024F394 = 0x8024F394; // type:func rom:0x17DC74
 func_8024F5AC = 0x8024F5AC; // type:func rom:0x17DE8C
@@ -20032,7 +20032,7 @@ D_8029F2A8 = 0x8029F2A8; // type:data
 D_8029F2AC = 0x8029F2AC; // type:data
 D_8029F2B0 = 0x8029F2B0; // type:data
 D_8029F2B4 = 0x8029F2B4; // type:data
-D_8029F2C0 = 0x8029F2C0; // type:data
+popupMessages = 0x8029F2C0; // type:data
 D_8029F640 = 0x8029F640; // type:data
 D_8029F642 = 0x8029F642; // type:data
 D_8029F644 = 0x8029F644; // type:data
diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt
index a523287120..497718eb63 100644
--- a/ver/us/undefined_syms.txt
+++ b/ver/us/undefined_syms.txt
@@ -844,7 +844,7 @@ D_8029F2A8 = 0x8029F2A8;
 D_8029F2AC = 0x8029F2AC;
 D_8029F2B0 = 0x8029F2B0;
 D_8029F2B4 = 0x8029F2B4;
-D_8029F2C0 = 0x8029F2C0;
+popupMessages = 0x8029F2C0;
 D_8029F640 = 0x8029F640;
 D_8029F642 = 0x8029F642;
 D_8029F644 = 0x8029F644;