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

Merge branch 'master' into doc-inc

Browse Source
This commit is contained in:
GriffinR
2019-10-07 17:37:04 -04:00
committed by GitHub
parent c4deb4db96 7ba11b7a1b
commit d8f5e73bb7
44 changed files with 313 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/MauvilleCity/scripts.inc
+6 -6
View File
@@ -109,8 +109,8 @@ MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
goto_if_eq MauvilleCity_EventScript_1DF683
closemessage
switch VAR_FACING
case 2, MauvilleCity_EventScript_1DF4E0
case 4, MauvilleCity_EventScript_1DF53D
case DIR_NORTH, MauvilleCity_EventScript_1DF4E0
case DIR_EAST, MauvilleCity_EventScript_1DF53D
end
MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
@@ -160,18 +160,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
setflag FLAG_DEFEATED_WALLY_MAUVILLE
setvar VAR_WALLY_CALL_STEP_COUNTER, 0
setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF5F3
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF601
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0
msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
closemessage
addvar VAR_SCOTT_STATE, 1
compare VAR_FACING, 2
compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF616
compare VAR_FACING, 4
compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF628
removeobject 11
releaseall