diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-10-13 15:33:19 -0400 |
| commit | bb23128b77a01d3c39b11aef978acf437ae71974 (patch) | |
| tree | f6de6f5278cc10fba0c7ab159365d3ed16ab6bf9 /data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | |
| parent | 144c5888a11115c93ed065c738a8ab395d71a798 (diff) | |
| parent | a081124a20896a0cc2ee4fac2df6d4b5440125ef (diff) | |
Merge conflict resolves into review changes
Diffstat (limited to 'data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc index 167f9afa0..84aeef182 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9 map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_MapScript1_267904 - map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_PokemonCenter_1F_MapScript1_277C30 + map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 BattleFrontier_PokemonCenter_1F_MapScript1_267904: @ 8267904 |