diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-19 21:18:39 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-19 21:18:39 -0400 |
| commit | 44a293d84cea9397bc75167f0fd4c418cbdc8952 (patch) | |
| tree | 6a9155166071cd792918efc88bb7c63660382b63 | |
| parent | 2702aa2754ac3f6ae91b61c4fa2177ff5b623717 (diff) | |
Name remaining NPC hide/show flags
| -rw-r--r-- | data/maps/SixIsland_DottedHole_SapphireRoom/map.json | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 0e1701718..9f1c986c9 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -37,7 +37,7 @@ "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, "script": "0x0", - "flag": "s" + "flag": "FLAG_HIDE_DOTTED_HOLE_SCIENTIST" } ], "warp_events": [ diff --git a/include/constants/flags.h b/include/constants/flags.h index b39970090..132b63be6 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -518,6 +518,8 @@ #define FLAG_0x1FC 0x1FC #define FLAG_0x1FD 0x1FD #define FLAG_0x1FE 0x1FE + +// Unused? #define FLAG_0x1FF 0x1FF #define FLAG_0x200 0x200 #define FLAG_0x201 0x201 @@ -567,6 +569,8 @@ #define FLAG_0x22D 0x22D #define FLAG_0x22E 0x22E #define FLAG_0x22F 0x22F + +// Story flags #define FLAG_0x230 0x230 #define FLAG_0x231 0x231 #define FLAG_0x232 0x232 @@ -775,6 +779,8 @@ #define FLAG_0x2FD 0x2FD #define FLAG_0x2FE 0x2FE #define FLAG_0x2FF 0x2FF + +// Unused? #define FLAG_0x300 0x300 #define FLAG_0x301 0x301 #define FLAG_0x302 0x302 |