From 2b4fcbeceecc73668f4b4f25d140ca912ecae1c4 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sat, 27 Jul 2024 07:51:12 -0700
Subject: [PATCH] build fix

---
 include/d/d_com_inf_game.h | 2 +-
 include/d/d_map.h          | 2 +-
 src/d/d_map.cpp            | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 47290582a..42e8fd514 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -986,7 +986,7 @@ inline void dComIfGs_onSaveArriveGridForAgb(int i_no) {
 }
 
 inline BOOL dComIfGs_isSaveArriveGridForAgb(int i_no) {
-    g_dComIfG_gameInfo.save.getPlayer().getMap().isSaveArriveGridForAgb(i_no);
+    return g_dComIfG_gameInfo.save.getPlayer().getMap().isSaveArriveGridForAgb(i_no);
 }
 
 inline u8 dComIfGs_getArrowNum() {
diff --git a/include/d/d_map.h b/include/d/d_map.h
index 4645be878..bce52ec50 100644
--- a/include/d/d_map.h
+++ b/include/d/d_map.h
@@ -121,7 +121,7 @@ class dMap_RoomInfo_c {
     /* 0x28 */ f32 field_0x28;
     /* 0x2C */ f32 field_0x2c;
     /* 0x30 */ dMap_2DMtMapSpcl_c field_0x30;
-    /* 0x44 */ dMap_2DMtMapSpcl_tex_c field_0x44;
+    /* 0x44 */ dMap_2DMtMapSpcl_tex_c field_0x44[1];
     /* 0x8C */ dMap_2DAGBScrDsp_c field_0x8c;
     /* 0xC4 */ u32 field_0xc4[0x08];
     /* 0xE4 */ dMap_RoomInfo_c* m_next;
diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp
index 4f2fa0c99..885418d9b 100644
--- a/src/d/d_map.cpp
+++ b/src/d/d_map.cpp
@@ -199,8 +199,8 @@ void dMap_RoomInfo_c::init(dMap_RoomInfo_c* prev, int p2) {
     field_0x20 = 0.0f;
     field_0x24 = 0.0f;
     field_0x8c.init(NULL, NULL, 0.0f, 0.0f, 0, 0, 0, 0, 1.0f, 1.0f, 0);
-    field_0x44.field_0x0[0] = 0;
-    field_0x30.init(1, &field_0x44);
+    field_0x44[0].field_0x0[0] = 0;
+    field_0x30.init(1, &field_0x44[0]);
     m_next = NULL;
     mStageMapInfoP = NULL;
     if (prev != NULL)
@@ -244,8 +244,8 @@ BOOL dMap_RoomInfo_c::deleteRoom() {
     field_0x28 = 0.0f;
     field_0x2c = 0.0f;
     field_0x8c.init(NULL, NULL, 0.0f, 0.0f, 0, 0, 0, 0, 1.0f, 1.0f, 0);
-    field_0x44.field_0x0[0] = 0;
-    field_0x30.init(1, &field_0x44);
+    field_0x44[0].field_0x0[0] = 0;
+    field_0x30.init(1, &field_0x44[0]);
     return TRUE;
 }