diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-14 12:50:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-14 12:50:57 -0400 |
commit | 308bf88e6078a243c3172f8f5312de6dd5f28a7b (patch) | |
tree | 68f06b5917facd553e4260b64684e60b133671d7 /include/constants | |
parent | 117c3fb8cc0f476cc3408afdb316f3ece41a1fe4 (diff) | |
parent | cac04f6033d63dd645e4d54da458ad32ea32efa6 (diff) |
Merge pull request #68 from pret/ss_anne
Ss anne
Diffstat (limited to 'include/constants')
-rw-r--r-- | include/constants/songs.h | 2 | ||||
-rw-r--r-- | include/constants/vars.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/constants/songs.h b/include/constants/songs.h index 66d239ad8..193a57756 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -251,7 +251,7 @@ #define SE_W114 246 #define SE_W063B 247 #define SE_CASHIER 248 - +#define SE_SHIP_HORN 249 #define SE_HELP_OPEN 250 #define SE_HELP_CLOSE 251 #define SE_HELP_PAGE 252 diff --git a/include/constants/vars.h b/include/constants/vars.h index 54bcb20a0..38c47c965 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -89,7 +89,7 @@ #define VAR_MAP_SCENE_PALLET_TOWN 0x4050 #define VAR_0x4051 0x4051 #define VAR_0x4052 0x4052 -#define VAR_0x4053 0x4053 +#define VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER 0x4053 #define VAR_0x4054 0x4054 #define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB 0x4055 #define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F 0x4056 |