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

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland/scripts.inc
+6 -12
View File
@@ -61,12 +61,9 @@ TwoIsland_EventScript_Clerk::
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND, 4
goto_if_eq TwoIsland_EventScript_ClerkShopExpanded3
compare VAR_MAP_SCENE_TWO_ISLAND, 3
goto_if_eq TwoIsland_EventScript_ClerkShopExpanded2
compare VAR_MAP_SCENE_TWO_ISLAND, 2
goto_if_eq TwoIsland_EventScript_ClerkShopExpanded1
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND, 4, TwoIsland_EventScript_ClerkShopExpanded3
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND, 3, TwoIsland_EventScript_ClerkShopExpanded2
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND, 2, TwoIsland_EventScript_ClerkShopExpanded1
goto TwoIsland_EventScript_ClerkShopInitial
end
@@ -105,12 +102,9 @@ TwoIsland_EventScript_ClerkShopInitial::
TwoIsland_EventScript_ClerkShopSkipIntro::
message Text_MayIHelpYou
waitmessage
compare VAR_MAP_SCENE_TWO_ISLAND, 4
goto_if_eq TwoIsland_EventScript_ShopExpanded3
compare VAR_MAP_SCENE_TWO_ISLAND, 3
goto_if_eq TwoIsland_EventScript_ShopExpanded2
compare VAR_MAP_SCENE_TWO_ISLAND, 2
goto_if_eq TwoIsland_EventScript_ShopExpanded1
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND, 4, TwoIsland_EventScript_ShopExpanded3
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND, 3, TwoIsland_EventScript_ShopExpanded2
goto_if_eq VAR_MAP_SCENE_TWO_ISLAND, 2, TwoIsland_EventScript_ShopExpanded1
goto TwoIsland_EventScript_ShopInitial
end