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/LittlerootTown_MaysHouse_2F/scripts.inc
+14 -18
View File
@@ -15,18 +15,17 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1
end
LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
checkflag FLAG_0x124
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F92E6
goto_if_set FLAG_0x124, LittlerootTown_MaysHouse_2F_EventScript_1F92E6
compare VAR_0x4084, 2
goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6
LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
checkplayergender
compare VAR_RESULT, 1
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
compare VAR_0x40D3, 2
goto_if 4, LittlerootTown_MaysHouse_2F_EventScript_1F9309
goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
setobjectxyperm 1, 8, 2
setobjectmovementtype 1, 7
return
@@ -38,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
checkplayergender
compare VAR_RESULT, 0
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
return
LittlerootTown_MaysHouse_2F_EventScript_1F9317:: @ 81F9317
@@ -52,13 +51,13 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
checkplayergender
compare VAR_RESULT, 1
goto_eq EventScript_275D0C
goto_if_eq EventScript_275D0C
end
LittlerootTown_MaysHouse_2F_EventScript_1F9334:: @ 81F9334
lockall
compare VAR_0x408D, 2
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F934A
msgbox LittlerootTown_MaysHouse_2F_Text_1F9991, MSGBOX_DEFAULT
releaseall
end
@@ -250,13 +249,12 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB
LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1
LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1
lockall
checkflag FLAG_0x124
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7
checkplayergender
compare VAR_RESULT, 0
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3
compare VAR_RESULT, 1
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94ED
end
LittlerootTown_BrendansHouse_2F_EventScript_1F94E3:: @ 81F94E3
@@ -282,14 +280,12 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7
end
LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D
checkflag FLAG_0x125
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F9541
goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F9541
msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT
return
LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F
checkflag FLAG_0x125
goto_eq LittlerootTown_BrendansHouse_2F_EventScript_1F954A
goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F954A
msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT
return
@@ -305,9 +301,9 @@ EventScript_PlayerPCFemale:: @ 81F9553
lockall
checkplayergender
compare VAR_RESULT, 0
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F956C
compare VAR_RESULT, 1
goto_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9576
end
LittlerootTown_MaysHouse_2F_EventScript_1F956C:: @ 81F956C