diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/metatile_labels.h | 2 | ||||
| -rw-r--r-- | include/rotating_tile_puzzle.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 21d9fcfb0..3d43e0fe6 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -109,7 +109,7 @@ #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 // Leftover from the RS version of Mossdeep Gym, functionally always zero +#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 // Leftover from the RS version of Mossdeep Gym, functionally unused #define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 // #define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 // #define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 // diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index db205819d..2f3ce5f71 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -77,7 +77,7 @@ #define METATILE_RS_MossdeepGym_Switch_Down 0x239 // gTileset_MossdeepGym from Emerald -#define METATILE_MossdeepGym_YellowRightArrow 0x250 +#define METATILE_MossdeepGym_YellowArrow_Right 0x250 // gTileset_BrendansMaysHouse #define METATILE_BrendansMaysHouse_BrendanPC_Off 0x25A diff --git a/include/rotating_tile_puzzle.h b/include/rotating_tile_puzzle.h index 48b27c5f3..8c6ab7944 100644 --- a/include/rotating_tile_puzzle.h +++ b/include/rotating_tile_puzzle.h @@ -2,8 +2,8 @@ #define GUARD_ROTATING_TILE_PUZZLE_H void InitRotatingTilePuzzle(bool8 isTrickHouse); -void FinishMossdeepGymTiles(void); -u16 MossdeepGym_MoveEvents(u8 puzzleNumber); -void MossdeepGym_TurnEvents(void); +void FreeRotatingTilePuzzle(void); +u16 MoveRotatingTileObjects(u8 puzzleNumber); +void TurnRotatingTileObjects(void); #endif // GUARD_ROTATING_TILE_PUZZLE_H |