diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/metatile_labels.h | 11 | ||||
| -rw-r--r-- | include/event_scripts.h | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index f2bf4b865..7cdfb25e5 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -37,7 +37,18 @@ #define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E #define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F +// Cinnabar Gym +#define METATILE_CinnabarGym_Floor 0x281 +#define METATILE_CinnabarGym_Floor_ShadeDiagonal 0x282 +#define METATILE_CinnabarGym_Floor_ShadeFull 0x289 +#define METATILE_CinnabarGym_Floor_WallRightCorner 0x2C6 +#define METATILE_CinnabarGym_Floor_WallLeftCorner 0x2C7 +#define METATILE_CinnabarGym_Floor_WallRightEdge 0x2CE +#define METATILE_CinnabarGym_Floor_WallLeftEdge 0x2CF +#define METATILE_CinnabarGym_Wall_RetractedBarrier 0x2D1 + // gTileset_82D504C. Below metatile probably needs generic name #define METATILE_MtEmber_CaveEntrance 0x346 + #endif // GUARD_METATILE_LABELS_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 54eb2b2a9..b8da8f3e0 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1190,10 +1190,10 @@ extern const u8 EventScript_PC[]; extern const u8 EventScript_RepelWoreOff[]; // battle_message -extern const u8 Text_1A5CF1[]; -extern const u8 Text_1A5D31[]; -extern const u8 Text_1A5D6E[]; -extern const u8 Text_1A5DB1[]; +extern const u8 Text_MonSentToBoxInSomeonesPC[]; +extern const u8 Text_MonSentToBoxInBillsPC[]; +extern const u8 Text_MonSentToBoxSomeonesBoxFull[]; +extern const u8 Text_MonSentToBoxBillsBoxFull[]; extern const u8 EventScript_BagItemCanBeRegistered[]; |