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/TrainerHill_Entrance/scripts.inc
+9 -13
View File
@@ -21,7 +21,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
setvar VAR_0x8004, 9
special sp194_trainer_tower
compare VAR_RESULT, 0
goto_eq TrainerHill_Entrance_EventScript_2680FF
goto_if_eq TrainerHill_Entrance_EventScript_2680FF
setobjectxy 255, 9, 6
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
end
@@ -30,7 +30,7 @@ TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
setvar VAR_0x8004, 16
special sp194_trainer_tower
compare VAR_RESULT, 1
goto_eq TrainerHill_Entrance_EventScript_26811A
goto_if_eq TrainerHill_Entrance_EventScript_26811A
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
end
@@ -117,7 +117,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
setvar VAR_0x8004, 10
special sp194_trainer_tower
compare VAR_RESULT, 0
goto_eq TrainerHill_Entrance_EventScript_26821F
goto_if_eq TrainerHill_Entrance_EventScript_26821F
msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT
goto TrainerHill_Entrance_EventScript_268227
@@ -131,8 +131,7 @@ TrainerHill_Entrance_EventScript_268227:: @ 8268227
TrainerHill_Entrance_EventScript_268229:: @ 8268229
lockall
applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
checkflag FLAG_SYS_GAME_CLEAR
goto_if 0, TrainerHill_Entrance_EventScript_26836A
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
setvar VAR_0x8004, 13
special sp194_trainer_tower
@@ -141,7 +140,7 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229
setvar VAR_0x8004, 8
special sp194_trainer_tower
compare VAR_RESULT, 1
goto_eq TrainerHill_Entrance_EventScript_268275
goto_if_eq TrainerHill_Entrance_EventScript_268275
msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT
goto TrainerHill_Entrance_EventScript_26827D
@@ -197,7 +196,7 @@ TrainerHill_Entrance_EventScript_26832E:: @ 826832E
setvar VAR_TEMP_5, 1
call TrainerHill_Entrance_EventScript_27134F
compare VAR_RESULT, 0
goto_eq TrainerHill_Entrance_EventScript_26835C
goto_if_eq TrainerHill_Entrance_EventScript_26835C
setvar VAR_0x8004, 14
special sp194_trainer_tower
return
@@ -242,8 +241,7 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388
end
TrainerHill_Entrance_EventScript_268391:: @ 8268391
checkflag FLAG_SYS_GAME_CLEAR
goto_if 0, TrainerHill_Entrance_EventScript_2683A3
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683A3
msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC
end
@@ -252,8 +250,7 @@ TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3
end
TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC
checkflag FLAG_SYS_GAME_CLEAR
goto_if 0, TrainerHill_Entrance_EventScript_2683BE
goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683BE
msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC
end
@@ -266,8 +263,7 @@ TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7
faceplayer
message gUnknown_08272A21
waitmessage
checkflag FLAG_SYS_GAME_CLEAR
goto_eq TrainerHill_Entrance_EventScript_268402
goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402
pokemart TrainerHill_Entrance_Pokemart_2683E8
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release