diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-18 18:23:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-18 18:23:00 -0400 |
| commit | 918ed2d31eeeb036230d0912cc2527b83788bc85 (patch) | |
| tree | d4a6e64701f4c79fcb00c20d2efd01a6e43da177 /data/maps/OneIsland_PokemonCenter_1F | |
| parent | 9392ba8ab1a726e48c0a40321ede325bdb74178c (diff) | |
| parent | c128e68062b0f9ff06be35d8563549fe8144f7d4 (diff) | |
Merge pull request #417 from SatoMew/master
Replace rival labels
Diffstat (limited to 'data/maps/OneIsland_PokemonCenter_1F')
| -rw-r--r-- | data/maps/OneIsland_PokemonCenter_1F/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 1d46a2bf8..1bcb8aa24 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -111,9 +111,9 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage - compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 call_if_lt OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap setflag FLAG_SYS_SEVII_MAP_123 msgbox OneIsland_PokemonCenter_1F_Text_BillCatchYouLater @@ -146,7 +146,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP - setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 + setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM return |