dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use TRUE and FALSE for flag conditionals; more story flags

Browse Source
This commit is contained in:
PikalaxALT
2019-10-20 21:24:16 -04:00
parent 6b503e306d
commit 9aa5709329
166 changed files with 1167 additions and 1165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+51 -51
View File
@@ -13,7 +13,7 @@ PalletTown_ProfessorOaksLab_MapScript1_168F8E:: @ 8168F8E
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
call_if eq, EventScript_168FC0
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
call_if eq, EventScript_168FBC
call_if TRUE, EventScript_168FBC
end
EventScript_168FBC:: @ 8168FBC
@@ -312,20 +312,20 @@ EventScript_16930B:: @ 816930B
applymovement 4, Movement_1A75F1
waitmovement 0
compare_var_to_value VAR_STARTER_MON, 0
goto_if_eq EventScript_1693D2
goto_if eq, EventScript_1693D2
compare_var_to_value VAR_STARTER_MON, 1
goto_if_eq EventScript_16944D
goto_if eq, EventScript_16944D
compare_var_to_value VAR_STARTER_MON, 2
goto_if_eq EventScript_16935A
goto_if eq, EventScript_16935A
end
EventScript_16935A:: @ 816935A
compare_var_to_value VAR_0x4002, 1
goto_if_eq EventScript_16937C
goto_if eq, EventScript_16937C
compare_var_to_value VAR_0x4002, 2
goto_if_eq EventScript_16938C
goto_if eq, EventScript_16938C
compare_var_to_value VAR_0x4002, 3
goto_if_eq EventScript_16939C
goto_if eq, EventScript_16939C
end
EventScript_16937C:: @ 816937C
@@ -377,11 +377,11 @@ Movement_1693CD:: @ 81693CD
EventScript_1693D2:: @ 81693D2
compare_var_to_value VAR_0x4002, 1
goto_if_eq EventScript_1693F4
goto_if eq, EventScript_1693F4
compare_var_to_value VAR_0x4002, 2
goto_if_eq EventScript_169404
goto_if eq, EventScript_169404
compare_var_to_value VAR_0x4002, 3
goto_if_eq EventScript_169414
goto_if eq, EventScript_169414
end
EventScript_1693F4:: @ 81693F4
@@ -436,11 +436,11 @@ Movement_169447:: @ 8169447
EventScript_16944D:: @ 816944D
compare_var_to_value VAR_0x4002, 1
goto_if_eq EventScript_16946F
goto_if eq, EventScript_16946F
compare_var_to_value VAR_0x4002, 2
goto_if_eq EventScript_16947F
goto_if eq, EventScript_16947F
compare_var_to_value VAR_0x4002, 3
goto_if_eq EventScript_16948F
goto_if eq, EventScript_16948F
end
EventScript_16946F:: @ 816946F
@@ -502,7 +502,7 @@ EventScript_1694C2:: @ 81694C2
playse SE_KAIDAN
fadedefaultbgm
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
setflag FLAG_0x258
setflag FLAG_BEAT_RIVAL_IN_OAKS_LAB
releaseall
end
@@ -575,9 +575,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if_eq EventScript_16958B
goto_if eq, EventScript_16958B
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if_eq EventScript_169581
goto_if eq, EventScript_169581
msgbox gUnknown_818DC67
release
end
@@ -596,23 +596,23 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
lock
faceplayer
checkflag FLAG_TEMP_2
goto_if_eq EventScript_169600
goto_if TRUE, EventScript_169600
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
goto_if_eq EventScript_169903
goto_if eq, EventScript_169903
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
goto_if_eq EventScript_169A6E
goto_if eq, EventScript_169A6E
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_1699CE
goto_if TRUE, EventScript_1699CE
compare_var_to_value VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
goto_if_eq EventScript_169903
goto_if eq, EventScript_169903
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
goto_if_eq EventScript_1698D6
goto_if eq, EventScript_1698D6
compare_var_to_value VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
goto_if ge, EventScript_16961E
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
goto_if_eq EventScript_169614
goto_if eq, EventScript_169614
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if_eq EventScript_16960A
goto_if eq, EventScript_16960A
msgbox gUnknown_818E116
release
end
@@ -840,14 +840,14 @@ EventScript_1698D6:: @ 81698D6
getnumberstring 0, VAR_0x8008
getnumberstring 1, VAR_0x8009
compare_var_to_value VAR_0x8009, 1
goto_if_eq EventScript_1699FB
goto_if eq, EventScript_1699FB
goto EventScript_169903
end
EventScript_169903:: @ 8169903
call EventScript_1A737B
checkflag FLAG_0x2F4
goto_if_eq EventScript_169913
goto_if TRUE, EventScript_169913
release
end
@@ -973,7 +973,7 @@ EventScript_1699CE:: @ 81699CE
compare_var_to_value VAR_0x8009, 60
goto_if lt, EventScript_1699F9
checkflag FLAG_WORLD_MAP_ONE_ISLAND
goto_if lt, EventScript_1699F9
goto_if FALSE, EventScript_1699F9
delay 30
msgbox gUnknown_818EDF5
goto EventScript_169035
@@ -986,15 +986,15 @@ EventScript_1699F9:: @ 81699F9
EventScript_1699FB:: @ 81699FB
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
goto_if_eq EventScript_1A7AE0
goto_if eq, EventScript_1A7AE0
special sub_8112364
checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK
goto_if_eq EventScript_169A6E
goto_if TRUE, EventScript_169A6E
checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
goto_if_eq EventScript_169A78
goto_if TRUE, EventScript_169A78
checkitem ITEM_POKE_BALL, 1
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_169A34
goto_if eq, EventScript_169A34
goto EventScript_169A6E
end
@@ -1156,7 +1156,7 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if_eq EventScript_169BE1
goto_if eq, EventScript_169BE1
msgbox gUnknown_818EA19
release
end
@@ -1167,35 +1167,35 @@ EventScript_169BE1:: @ 8169BE1
drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3
textcolor 0
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0
goto_if_eq EventScript_OakDescribesBulbasaur
goto_if eq, EventScript_OakDescribesBulbasaur
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1
goto_if_eq EventScript_OakDescribesCharmander
goto_if eq, EventScript_OakDescribesCharmander
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2
goto_if_eq EventScript_OakDescribesSquirtle
goto_if eq, EventScript_OakDescribesSquirtle
end
EventScript_OakDescribesBulbasaur:: @ 8169C14
msgbox gUnknown_818E272, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_ThisPokeIsRealyEnergetic
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_DeclinedStarter
goto_if eq, EventScript_DeclinedStarter
end
EventScript_OakDescribesCharmander:: @ 8169C33
msgbox gUnknown_818E207, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_ThisPokeIsRealyEnergetic
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_DeclinedStarter
goto_if eq, EventScript_DeclinedStarter
end
EventScript_OakDescribesSquirtle:: @ 8169C52
msgbox gUnknown_818E194, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_ThisPokeIsRealyEnergetic
goto_if eq, EventScript_ThisPokeIsRealyEnergetic
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_DeclinedStarter
goto_if eq, EventScript_DeclinedStarter
end
EventScript_DeclinedStarter:: @ 8169C71
@@ -1219,9 +1219,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
waitfanfare
msgbox gUnknown_81A56A7, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 1
goto_if_eq EventScript_GiveNicknameToStarter
goto_if eq, EventScript_GiveNicknameToStarter
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_SkipGiveNicknameToStarter
goto_if eq, EventScript_SkipGiveNicknameToStarter
end
EventScript_GiveNicknameToStarter:: @ 8169CCC
@@ -1233,11 +1233,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC
EventScript_SkipGiveNicknameToStarter:: @ 8169CDC
closemessage
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 0
goto_if_eq EventScript_RivalWalksToCharmander
goto_if eq, EventScript_RivalWalksToCharmander
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 1
goto_if_eq EventScript_RivalWalksToSquirtle
goto_if eq, EventScript_RivalWalksToSquirtle
compare_var_to_value VAR_OAKSLAB_PLAYER_STARTER_NO, 2
goto_if_eq EventScript_RivalWalksToBulbasaur
goto_if eq, EventScript_RivalWalksToBulbasaur
end
EventScript_RivalWalksToCharmander:: @ 8169CFF
@@ -1270,7 +1270,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F
waitfanfare
setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
call_if eq, EventScript_169D5C
call_if TRUE, EventScript_169D5C
release
end
@@ -1316,7 +1316,7 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if_eq EventScript_169BE1
goto_if eq, EventScript_169BE1
msgbox gUnknown_818EA19
release
end
@@ -1331,7 +1331,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
goto_if ge, EventScript_169DE4
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
goto_if_eq EventScript_169BE1
goto_if eq, EventScript_169BE1
msgbox gUnknown_818EA19
release
end
@@ -1345,7 +1345,7 @@ PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
lock
faceplayer
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_169E03
goto_if TRUE, EventScript_169E03
msgbox gUnknown_818EBE6
release
end
@@ -1360,7 +1360,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
lock
faceplayer
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_169E2F
goto_if TRUE, EventScript_169E2F
msgbox gUnknown_818EBE6
release
end