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

improve goto_if macros

Browse Source
This commit is contained in:
Melody
2018-12-21 20:28:24 -05:00
parent 87fd6b8dc2
commit ac2e4adf2d
273 changed files with 2555 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/MauvilleCity/scripts.inc
+8 -13
View File
@@ -54,8 +54,7 @@ MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2
MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB
lock
faceplayer
checkflag FLAG_0x062
goto_eq MauvilleCity_EventScript_1DF413
goto_if_set FLAG_0x062, MauvilleCity_EventScript_1DF413
msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT
setflag FLAG_0x062
release
@@ -69,8 +68,7 @@ MauvilleCity_EventScript_1DF413:: @ 81DF413
MauvilleCity_EventScript_1DF41D:: @ 81DF41D
lock
faceplayer
checkflag FLAG_0x11C
goto_eq MauvilleCity_EventScript_1DF43D
goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF43D
msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT
closemessage
applymovement 7, MauvilleCity_Movement_2725A2
@@ -88,8 +86,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D
MauvilleCity_EventScript_1DF452:: @ 81DF452
lockall
checkflag FLAG_0x11C
goto_eq MauvilleCity_EventScript_1DF690
goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF690
applymovement 6, MauvilleCity_Movement_2725A8
waitmovement 0
msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
@@ -110,7 +107,7 @@ MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
compare VAR_RESULT, 1
call_if 1, MauvilleCity_EventScript_1DF63A
compare VAR_RESULT, 0
goto_eq MauvilleCity_EventScript_1DF683
goto_if_eq MauvilleCity_EventScript_1DF683
closemessage
switch VAR_FACING
case 2, MauvilleCity_EventScript_1DF4E0
@@ -424,12 +421,10 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
MauvilleCity_EventScript_1DF73A:: @ 81DF73A
lock
faceplayer
checkflag FLAG_GOT_TM24_FROM_WATTSON
goto_eq MauvilleCity_EventScript_1DF7B0
goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0
compare VAR_0x40BA, 2
goto_eq MauvilleCity_EventScript_1DF784
checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
goto_eq MauvilleCity_EventScript_1DF77A
goto_if_eq MauvilleCity_EventScript_1DF784
goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A
msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT
giveitem_std ITEM_BASEMENT_KEY
setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
@@ -446,7 +441,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784
msgbox MauvilleCity_Text_1E020E, MSGBOX_DEFAULT
giveitem_std ITEM_TM24
compare VAR_RESULT, 0
goto_eq MauvilleCity_EventScript_272054
goto_if_eq MauvilleCity_EventScript_272054
setflag FLAG_GOT_TM24_FROM_WATTSON
msgbox MauvilleCity_Text_1E02AA, MSGBOX_DEFAULT
release