Finish Mossdeep Gym doc, beging documenting rotating tile puzzle

5 files changed, 24 insertions, 22 deletions

diff --git a/include/constants/flags.h b/include/constants/flags.h
index f47b0dff6..21d9fcfb0 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -109,10 +109,10 @@
 #define FLAG_MET_TEAM_AQUA_HARBOR            0x61
 #define FLAG_TV_EXPLAINED                    0x62
 #define FLAG_MAUVILLE_GYM_BARRIERS_STATE     0x63
-#define FLAG_MOSSDEEP_GYM_SWITCH_1           0x64
-#define FLAG_MOSSDEEP_GYM_SWITCH_2           0x65
-#define FLAG_MOSSDEEP_GYM_SWITCH_3           0x66
-#define FLAG_MOSSDEEP_GYM_SWITCH_4           0x67
+#define FLAG_MOSSDEEP_GYM_SWITCH_1           0x64 // Leftover from the RS version of Mossdeep Gym, functionally always zero
+#define FLAG_MOSSDEEP_GYM_SWITCH_2           0x65 //
+#define FLAG_MOSSDEEP_GYM_SWITCH_3           0x66 //
+#define FLAG_MOSSDEEP_GYM_SWITCH_4           0x67 //
 
 #define FLAG_UNUSED_0x068                    0x68  // Unused Flag
 
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index ea54d04a8..db205819d 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -68,15 +68,16 @@
 #define METATILE_PetalburgGym_SlidingDoor_Frame3 0x21B
 #define METATILE_PetalburgGym_SlidingDoor_Frame4 0x21C
 
-// gTileset_MossdeepGym
-#define METATILE_MossdeepGym_Obelisk_Top           0x204
-#define METATILE_MossdeepGym_Obelisk_Base          0x20C
-#define METATILE_MossdeepGym_Wall_LeftCorner       0x20D
-#define METATILE_MossdeepGym_OuterWall_RightCorner 0x205
-#define METATILE_MossdeepGym_Empty0                0x238
-#define METATILE_MossdeepGym_Empty1                0x239
-#define METATILE_MossdeepGym_YellowRightArrow      0x250
+// gTileset_MossdeepGym from R/S
+#define METATILE_RS_MossdeepGym_RedArrow_Right        0x204
+#define METATILE_RS_MossdeepGym_RedArrow_Left         0x20C
+#define METATILE_RS_MossdeepGym_RedArrow_Up           0x20D
+#define METATILE_RS_MossdeepGym_RedArrow_Down         0x205
+#define METATILE_RS_MossdeepGym_Switch_Up             0x238
+#define METATILE_RS_MossdeepGym_Switch_Down           0x239
 
+// gTileset_MossdeepGym from Emerald
+#define METATILE_MossdeepGym_YellowRightArrow         0x250
 
 // gTileset_BrendansMaysHouse
 #define METATILE_BrendansMaysHouse_BrendanPC_Off    0x25A
@@ -378,6 +379,7 @@
 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down      0x263
 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt  0x27B
 #define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C
+#define METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right  0x298
 
 // gTileset_BikeShop
 #define METATILE_BikeShop_Barrier_Hidden_Top      0x269
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index a62a76b2a..e26188d47 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -28,7 +28,7 @@ void sub_80AF80C(u8 metatileBehavior);
 void sub_80AF828(void);
 void sub_80AF838(void);
 void sub_80AF848(void);
-void sub_80AF87C(void);
+void DoMossdeepGymWarp(void);
 void sub_80AF8B8(void);
 void sub_80AF948(void);
 void sub_80AF9F8(void);
diff --git a/include/mossdeep_gym.h b/include/mossdeep_gym.h
deleted file mode 100644
index c16730094..000000000
--- a/include/mossdeep_gym.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_MOSSDEEP_GYM_H
-#define GUARD_MOSSDEEP_GYM_H
-
-void InitMossdeepGymTiles(bool8 arg0);
-void FinishMossdeepGymTiles(void);
-u16 MossdeepGym_MoveEvents(u8 arg0);
-void MossdeepGym_TurnEvents(void);
-
-#endif // GUARD_MOSSDEEP_GYM_H
diff --git a/include/rotating_tile_puzzle.h b/include/rotating_tile_puzzle.h
new file mode 100644
index 000000000..48b27c5f3
--- /dev/null
+++ b/include/rotating_tile_puzzle.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_ROTATING_TILE_PUZZLE_H
+#define GUARD_ROTATING_TILE_PUZZLE_H
+
+void InitRotatingTilePuzzle(bool8 isTrickHouse);
+void FinishMossdeepGymTiles(void);
+u16 MossdeepGym_MoveEvents(u8 puzzleNumber);
+void MossdeepGym_TurnEvents(void);
+
+#endif // GUARD_ROTATING_TILE_PUZZLE_H