match d_s_room (some fakematches)

include/d/actor/d_a_npc_md.h

@@ -276,7 +276,6 @@ public:
     void isLightHit() {}
     void isMirror() {}
     void isNoCarryAction() {}
-    void isSeaTalk() {}
     void isShipRide() {}
     void noCarryAction() {}
     void offBitCamTagIn() {}
@@ -286,7 +285,6 @@ public:
     void offMirror() {}
     void offNoCarryAction() {}
     void offPlayerRoom() {}
-    void offSeaTalk() {}
     void offShipRide() {}
     void onBitCamTagIn() {}
     void onFlying() {}
@@ -294,7 +292,6 @@ public:
     void onLightHit() {}
     void onMirror() {}
     void onPlayerRoom() {}
-    void onSeaTalk() {}
     void onShipRide() {}
     void setBitEffectStatus(u8) {}
     void setBitHairMode(u8) {}
@@ -469,6 +466,9 @@ public:
     static bool m_playerRoom;
     
     static bool isFlying() { return m_flying; }
+    static bool isSeaTalk() { return m_seaTalk; }
+    static void onSeaTalk() { m_seaTalk = true; }
+    static void offSeaTalk() { m_seaTalk = false; }
     static s16 getMaxFlyingTimer();
     static bool isPlayerRoom() { return m_playerRoom; }
     

include/d/actor/d_a_salvage.h

@@ -64,6 +64,8 @@ public:
     void isEffectKind(int);
     void debugDraw();
 
+    static void init_room(signed char);
+
 public:
     /* Place member variables here */
 };

include/d/d_com_inf_game.h

@@ -1846,6 +1846,14 @@ inline void dComIfGp_map_mapBufferSendAGB(int param_0) {
     dMap_c::mapBufferSendAGB(param_0);
 }
 
+inline void dComIfGp_map_setImage(int param_0, int param_1, f32 param_2) {
+    dMap_c::setImage(param_0, param_1, param_2);
+}
+
+inline void dComIfGp_map_deleteImage(int param_0) {
+    dMap_c::deleteImage(param_0);
+}
+
 inline dDemo_manager_c* dComIfGp_demo_get() {
     return g_dComIfG_gameInfo.play.getDemo();
 }

include/d/d_stage.h

@@ -827,7 +827,7 @@ public:
     void checkDrawArea() const;
     dStage_darkStatus_c* getDarkStatus();
     u32 getDarkMode();
-    static dBgW* getBgW(int i_roomNo);
+    static dBgW* getBgW(int i_roomNo);// { return mStatus[i_roomNo].mpBgW; }
 
     static JKRExpHeap* createMemoryBlock(int, u32);
     static void destroyMemoryBlock();
@@ -835,8 +835,8 @@ public:
     static JKRExpHeap* getMemoryBlock(int);
     static void setStayNo(int);
     static s32 GetTimePass();
-    static void setZoneNo(int i_roomNo, int i_zoneNo) { mStatus[i_roomNo].mZoneNo = i_zoneNo; }
-    static int getZoneNo(int i_roomNo);
+    static void setZoneNo(int i_roomNo, int i_zoneNo);// { mStatus[i_roomNo].mZoneNo = i_zoneNo; }
+    static int getZoneNo(int i_roomNo);// { return mStatus[i_roomNo].mZoneNo; }
     static void setZoneCount(int i_roomNo, int count) { mStatus[i_roomNo].mZoneCount = count; }
 
     static s8 getStayNo() { return mStayNo; }