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

Merge branch 'master' into multiplayer-stuff

Browse Source
This commit is contained in:
Phlosioneer
2019-02-26 22:07:29 -05:00
parent accea672f1 231355f84d
commit 3a44b090d1
457 changed files with 17621 additions and 23559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+12 -12
View File
@@ -1,6 +1,6 @@
SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
map_script 3, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E
map_script 2, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E
map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
.byte 0
SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
@@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
special CallFrontierUtilFunc
compare VAR_RESULT, 0
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
compare VAR_0x40C0, 0
compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
end
@@ -25,9 +25,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
return
SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
.2byte 0
SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
@@ -37,16 +37,16 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
waitmovement 0
moveobjectoffscreen 1
applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
waitmovement 0
compare VAR_0x40C0, 1
compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
compare VAR_0x40C0, 2
compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
compare VAR_0x40C0, 3
compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
special LoadPlayerParty
setvar VAR_0x40C0, 0
setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
releaseall
end
@@ -102,7 +102,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
special LoadPlayerParty
call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F
call Common_EventScript_SaveGame
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
special SavePlayerParty