diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-09 08:40:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 08:40:14 -0400 |
| commit | 77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (patch) | |
| tree | d628693647f730f285f68fcd39b03e781a1a37ab /data/map_event_scripts.inc | |
| parent | 2a7205dec677c98d087cb8ba191370de464c8bf0 (diff) | |
| parent | 40a810679f0fce5c092f9f619025b04dbbf8a214 (diff) | |
Merge pull request #96 from SatoMew/master
Replace labels for used and unused Saffron City maps
Diffstat (limited to 'data/map_event_scripts.inc')
| -rw-r--r-- | data/map_event_scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/map_event_scripts.inc b/data/map_event_scripts.inc index 908d7e543..e45575959 100644 --- a/data/map_event_scripts.inc +++ b/data/map_event_scripts.inc @@ -196,8 +196,8 @@ .include "data/maps/FuchsiaCity/scripts.inc" .include "data/maps/CinnabarIsland/scripts.inc" .include "data/maps/IndigoPlateau_Exterior/scripts.inc" - .include "data/maps/SaffronCity_Duplicate/scripts.inc" .include "data/maps/SaffronCity/scripts.inc" + .include "data/maps/SaffronCity_Classic/scripts.inc" .include "data/maps/OneIsland/scripts.inc" .include "data/maps/TwoIsland/scripts.inc" .include "data/maps/ThreeIsland/scripts.inc" @@ -529,7 +529,7 @@ .include "data/maps/CeladonCity/text.inc" .include "data/maps/FuchsiaCity/text.inc" .include "data/maps/CinnabarIsland/text.inc" - .include "data/maps/SaffronCity_Duplicate/text.inc" + .include "data/maps/SaffronCity/text.inc" .include "data/maps/OneIsland/text.inc" .include "data/maps/TwoIsland/text.inc" .include "data/maps/ThreeIsland/text.inc" @@ -3329,7 +3329,7 @@ SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4 SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF .incbin "baserom.gba", 0x1ACFEF, 0x4B -SaffronCity_Duplicate_EventScript_1AD03A:: @ 81AD03A +SaffronCity_EventScript_1AD03A:: @ 81AD03A .incbin "baserom.gba", 0x1AD03A, 0x19 CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053 |