dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into event-vars

Browse Source
This commit is contained in:
Phlosioneer
2019-02-25 02:24:20 -05:00
parent 87859a655b a589d4a630
commit 4e5fae0086
201 changed files with 4075 additions and 7997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cable_club.inc
+8 -8
View File
@@ -328,7 +328,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276DD5:: @ 8276DD5
OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0
lockall
applymovement EVENT_OBJ_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
msgbox OldaleTown_PokemonCenter_2F_Text_27964A, MSGBOX_DEFAULT
closemessage
@@ -425,7 +425,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55
end
OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
call OldaleTown_PokemonCenter_2F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -527,7 +527,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
call OldaleTown_PokemonCenter_2F_EventScript_277199
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
call OldaleTown_PokemonCenter_2F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -602,7 +602,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD
OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
copyvar VAR_0x8007, VAR_LAST_TALKED
call OldaleTown_PokemonCenter_2F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
message gText_PleaseWaitForLink
@@ -1023,7 +1023,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
call OldaleTown_PokemonCenter_2F_EventScript_277626
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
call OldaleTown_PokemonCenter_2F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
msgbox OldaleTown_PokemonCenter_2F_Text_27961C, MSGBOX_DEFAULT
@@ -1234,7 +1234,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923
end
OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931
call OldaleTown_PokemonCenter_2F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
switch VAR_0x8004
@@ -1513,7 +1513,7 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
waitstate
compare VAR_0x8004, 6
goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
call MossdeepCity_GameCorner_1F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
setvar VAR_0x8004, 4
@@ -1532,7 +1532,7 @@ MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
waitstate
compare VAR_0x8004, 6
goto_if_ge MossdeepCity_GameCorner_1F_EventScript_2772F9
call MossdeepCity_GameCorner_1F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
setvar VAR_0x8004, 6