diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc')
| -rw-r--r-- | data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc b/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc new file mode 100644 index 000000000..7d3c3a2f1 --- /dev/null +++ b/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc @@ -0,0 +1,19 @@ +BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 + map_script 2, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B + map_script 4, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C + map_script 1, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE + map_script 3, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + .byte 0 + +BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 + call OldaleTown_PokemonCenter_2F_EventScript_276EB7 + end + +BattleFrontier_PokemonCenter_2F_EventScript_267ABF:: @ 8267ABF + call OldaleTown_PokemonCenter_2F_EventScript_2770B2 + end + +BattleFrontier_PokemonCenter_2F_EventScript_267AC5:: @ 8267AC5 + call OldaleTown_PokemonCenter_2F_EventScript_2771DB + end + |