match 5D7C. gotta do something about these inlines.

BR- · Jan 27, 2024 · b83dada · b83dada
1 parent cc80c85
commit b83dada
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/src/melee/db/db_2253.c b/src/melee/db/db_2253.c
@@ -11,6 +11,7 @@
 #include "dolphin/vi/vi.h"
 #include "ef/efsync.h"
 #include "ft/ftlib.h"
+#include "gm/gm_1A36.h"
 #include "it/it_266F.h"
 #include "it/item.h"
 #include "lb/lbarchive.h"
@@ -457,6 +458,12 @@ void db_80225D7C(void)
     }
 }
 
+void db_80225D7C_suppress_inlines(void)
+{
+    int y[5000];
+    db_80225D7C();
+}
+
 void db_80225DD8(Item_GObj* item, Fighter_GObj* owner)
 {
     Item* it = GET_ITEM(item);
@@ -614,6 +621,29 @@ void db_802262E0(int player)
     }
 }
 
+void db_802264C4(int player)
+{
+    if (db_8049FAA0.x0 == 1 && db_8049FAA0.xC == player) {
+        if (db_8049FAA0.x4 == 0) {
+            db_8049FAA0.x0 = 2;
+            DevText_HideBackground(db_804D6B38);
+            DevText_HideText(db_804D6B38);
+        } else {
+            db_8049FAA0.x4 -= 1;
+        }
+    }
+    db_802261BC(player);
+    if (gm_801A45E8(1) == 0 && gm_801A45E8(0) == 0) {
+        db_802262E0(player);
+    }
+    if (db_8022558C_suppress_inline(player) & 0x20 &&
+        db_802255A4_suppress_inline(player) & 8)
+    {
+        db_80225D7C_suppress_inlines();
+    }
+    db_80225A54(player);
+}
+
 void db_8022659C(void)
 {
     int sp14;
@@ -637,6 +667,8 @@ void db_8022659C(void)
     }
 }
 
+///////////////////////////////
+
 u8 db_8022697C(Fighter_GObj* owner)
 {
     if (ftLib_80086960(owner) != 0) {

diff --git a/src/melee/db/db_2253_external.h b/src/melee/db/db_2253_external.h
@@ -48,6 +48,8 @@ void DevText_ShowText(DevText*);
 void DevText_Erase(DevText*);
 void DevText_Printf(DevText*, char*, ...);
 void DevText_SetCursorXY(DevText*, int, int);
+void DevText_HideBackground(DevText*);
+void DevText_HideText(DevText*);
 int it_8026C704(void);
 
 #endif
diff --git a/src/melee/db/db_2253_internal.h b/src/melee/db/db_2253_internal.h
@@ -198,7 +198,7 @@ struct {
 char db_8049FA50[0x50];
 struct {
     unsigned int x0;
-    int x4;
+    unsigned int x4;
     int x8;
     int xC;
     ItemKind x10;