diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-22 11:41:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 11:41:14 -0500 |
| commit | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (patch) | |
| tree | 0ad5656457aff5ac67fd50c32d6600592815a9a5 /include | |
| parent | 6eec1c1cc9c115492aec43f80c8a6be7a86c61a5 (diff) | |
| parent | a4f5f41e2496a4c2b91cd0643dc44d98faed0c89 (diff) | |
Merge pull request #231 from GriffinRichards/doc-staticmon
Document static mon scripts
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/layouts.h | 4 | ||||
| -rw-r--r-- | include/constants/metatile_labels.h | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/constants/layouts.h b/include/constants/layouts.h index ef3cfe126..657d531e8 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -260,8 +260,8 @@ #define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275 #define LAYOUT_VIRIDIAN_CITY_HOUSE1 276 #define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277 -#define LAYOUT_UNUSED_LAYOUT_833B6EC 278 -#define LAYOUT_UNUSED_LAYOUT_833BE30 279 +#define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278 +#define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279 #define LAYOUT_MT_EMBER_EXTERIOR 280 #define LAYOUT_MT_EMBER_SUMMIT 281 #define LAYOUT_MT_EMBER_SUMMIT_PATH_1F 282 diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index c664290d5..f2bf4b865 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -1,6 +1,9 @@ #ifndef GUARD_METATILE_LABELS_H #define GUARD_METATILE_LABELS_H +// General +#define METATILE_General_CalmWater 0x12B + // Pokemon Mansion #define METATILE_PokemonMansion_Floor 0x284 #define METATILE_PokemonMansion_Floor_ShadeFull 0x285 @@ -34,4 +37,7 @@ #define METATILE_PokemonMansion_Statue_RedEyes_Shade 0x34E #define METATILE_PokemonMansion_Statue_RedEyes_Basement 0x34F +// gTileset_82D504C. Below metatile probably needs generic name +#define METATILE_MtEmber_CaveEntrance 0x346 + #endif // GUARD_METATILE_LABELS_H |