dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-tilesets

Browse Source
This commit is contained in:
GriffinR
2020-02-16 11:29:06 -05:00
committed by GitHub
parent 659afd708b 4e07002d13
commit b4fce4020d
62 changed files with 911 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+8 -8
View File
@@ -418,15 +418,15 @@ gStdScriptsEnd::
.include "data/maps/CinnabarIsland_Mart/scripts.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc"
.include "data/maps/SaffronCity_House1_1F/scripts.inc"
.include "data/maps/SaffronCity_House1_2F/scripts.inc"
.include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc"
.include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc"
.include "data/maps/SaffronCity_Dojo/scripts.inc"
.include "data/maps/SaffronCity_Gym/scripts.inc"
.include "data/maps/SaffronCity_House2/scripts.inc"
.include "data/maps/SaffronCity_House/scripts.inc"
.include "data/maps/SaffronCity_Mart/scripts.inc"
.include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc"
.include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc"
.include "data/maps/SaffronCity_House3/scripts.inc"
.include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc"
.include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc"
.include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc"
.include "data/maps/Route2_House/scripts.inc"
@@ -733,14 +733,14 @@ gStdScriptsEnd::
.include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc"
.include "data/maps/CinnabarIsland_Mart/text.inc"
.include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc"
.include "data/maps/SaffronCity_House1_1F/text.inc"
.include "data/maps/SaffronCity_House1_2F/text.inc"
.include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc"
.include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc"
.include "data/maps/SaffronCity_Dojo/text.inc"
.include "data/maps/SaffronCity_Gym/text.inc"
.include "data/maps/SaffronCity_House2/text.inc"
.include "data/maps/SaffronCity_House/text.inc"
.include "data/maps/SaffronCity_Mart/text.inc"
.include "data/maps/SaffronCity_PokemonCenter_1F/text.inc"
.include "data/maps/SaffronCity_House3/text.inc"
.include "data/maps/SaffronCity_MrPsychicsHouse/text.inc"
.include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc"
.include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc"
.include "data/maps/Route2_House/text.inc"