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

sys flag rearrange

Browse Source
This commit is contained in:
PikalaxALT
2019-10-17 21:24:47 -04:00
parent 97dc0a6903
commit 2435bcc09d
32 changed files with 192 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_Condominiums_1F/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
faceplayer
checkflag FLAG_0x2F8
goto_if_eq EventScript_16C36A
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_16C374
checkflag FLAG_0x2A6
goto_if_eq EventScript_16C36A
data/maps/CeladonCity_Gym/scripts.inc
+2 -2
View File
@@ -21,7 +21,7 @@ EventScript_16D0A0:: @ 816D0A0
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x09E
setflag FLAG_0x4B3
setflag FLAG_0x823
setflag FLAG_BADGE04_GET
setvar VAR_0x8008, 4
call EventScript_1A6B18
goto EventScript_16D0C6
@@ -91,7 +91,7 @@ CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
lockall
checkflag FLAG_0x823
checkflag FLAG_BADGE04_GET
goto_if_eq EventScript_16D1E0
msgbox gUnknown_8197874
releaseall
data/maps/CeruleanCity_Gym/scripts.inc
+2 -2
View File
@@ -17,7 +17,7 @@ EventScript_16AAD3:: @ 816AAD3
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B1
setflag FLAG_0x821
setflag FLAG_BADGE02_GET
setrespawn SPAWN_CERULEAN_CITY
setvar VAR_0x8008, 2
call EventScript_1A6B18
@@ -70,7 +70,7 @@ EventScript_16AB94:: @ 816AB94
CeruleanCity_Gym_EventScript_16AB9E:: @ 816AB9E
lockall
checkflag FLAG_0x821
checkflag FLAG_BADGE02_GET
goto_if_eq EventScript_16ABB2
msgbox gUnknown_81926E1
releaseall
data/maps/CinnabarIsland_Gym/scripts.inc
+2 -2
View File
@@ -68,7 +68,7 @@ EventScript_16DA06:: @ 816DA06
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B6
setflag FLAG_0x826
setflag FLAG_BADGE07_GET
setrespawn SPAWN_CINNABAR_ISLAND
setvar VAR_0x4071, 1
clearflag FLAG_0x062
@@ -208,7 +208,7 @@ EventScript_16DBC0:: @ 816DBC0
CinnabarIsland_Gym_EventScript_16DBCA:: @ 816DBCA
lockall
checkflag FLAG_0x826
checkflag FLAG_BADGE07_GET
goto_if_eq EventScript_16DBDE
msgbox gUnknown_8199C29
releaseall
data/maps/FuchsiaCity_Gym/scripts.inc
+2 -2
View File
@@ -18,7 +18,7 @@ EventScript_16D580:: @ 816D580
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x09F
setflag FLAG_0x4B4
setflag FLAG_0x824
setflag FLAG_BADGE05_GET
setvar VAR_0x8008, 5
call EventScript_1A6B18
goto EventScript_16D5A6
@@ -90,7 +90,7 @@ EventScript_16D69D:: @ 816D69D
FuchsiaCity_Gym_EventScript_16D6A7:: @ 816D6A7
lockall
checkflag FLAG_0x824
checkflag FLAG_BADGE05_GET
goto_if_eq EventScript_16D6BB
msgbox gUnknown_8198B4B
releaseall
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -84,9 +84,9 @@ EventScript_170CB1:: @ 8170CB1
waitmovement 0
applymovement 255, Movement_1A75EB
waitmovement 0
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_170E34
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 0, EventScript_170E3D
applymovement 3, Movement_1A75ED
waitmovement 0
data/maps/PalletTown/scripts.inc
+1 -1
View File
@@ -50,7 +50,7 @@ EventScript_1654D8:: @ 81654D8
addobject 3
applymovement 3, Movement_1655AF
waitmovement 0
checkflag FLAG_0x89B
checkflag FLAG_WORLD_MAP_ONE_ISLAND
goto_if 0, EventScript_1655A1
msgbox gUnknown_817D8BF
setvar VAR_0x8004, 0
data/maps/PalletTown_GarysHouse/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ PalletTown_GarysHouse_EventScript_168D56:: @ 8168D56
setvar VAR_0x8004, 1
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_168DB9
compare_var_to_value VAR_0x4001, 1
goto_if_eq EventScript_168EEC
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+6 -6
View File
@@ -601,7 +601,7 @@ PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
goto_if_eq EventScript_169903
compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
goto_if_eq EventScript_169A6E
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_1699CE
compare_var_to_value VAR_0x4052, 1
goto_if_eq EventScript_169903
@@ -706,7 +706,7 @@ EventScript_16961E:: @ 816961E
waitmessage
waitfanfare
call EventScript_1A6675
setflag FLAG_0x829
setflag FLAG_SYS_POKEDEX_GET
special sub_810B810
setvar VAR_0x407C, 1
msgbox gUnknown_818E612
@@ -974,7 +974,7 @@ EventScript_1699CE:: @ 81699CE
closemessage
compare_var_to_value VAR_0x8009, 60
goto_if 0, EventScript_1699F9
checkflag FLAG_0x89B
checkflag FLAG_WORLD_MAP_ONE_ISLAND
goto_if 0, EventScript_1699F9
delay 30
msgbox gUnknown_818EDF5
@@ -1205,7 +1205,7 @@ EventScript_169C74:: @ 8169C74
removeobject VAR_LAST_TALKED
msgbox gUnknown_818E2E5
call EventScript_1A6675
setflag FLAG_0x828
setflag FLAG_SYS_POKEMON_GET
setflag FLAG_0x291
givemon VAR_0x4002, 5, ITEM_NONE, 0, 0, 0
copyvar VAR_STARTER_MON, VAR_0x4001
@@ -1341,7 +1341,7 @@ EventScript_169DE4:: @ 8169DE4
PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
lock
faceplayer
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_169E03
msgbox gUnknown_818EBE6
release
@@ -1358,7 +1358,7 @@ EventScript_169E03:: @ 8169E03
PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
lock
faceplayer
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_169E2F
msgbox gUnknown_818EBE6
release
data/maps/PewterCity_Gym/scripts.inc
+2 -2
View File
@@ -17,7 +17,7 @@ EventScript_16A5C5:: @ 816A5C5
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B0
setflag FLAG_0x820
setflag FLAG_BADGE01_GET
setvar VAR_0x406C, 1
setflag FLAG_0x02E
clearflag FLAG_0x092
@@ -82,7 +82,7 @@ EventScript_16A6A5:: @ 816A6A5
PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF
lockall
checkflag FLAG_0x820
checkflag FLAG_BADGE01_GET
goto_if_eq EventScript_16A6C3
msgbox gUnknown_819146E
releaseall
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+2 -2
View File
@@ -61,9 +61,9 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
setvar VAR_0x8004, 0
setvar VAR_0x8005, 4
special SetFlavorTextFlagFromSpecialVars
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 0, EventScript_1628E9
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_1628F2
setflag FLAG_0x003
setflag FLAG_0x005
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+2 -2
View File
@@ -58,9 +58,9 @@ PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
setvar VAR_0x8004, 10
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 0, EventScript_162751
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_16275A
setflag FLAG_0x003
setflag FLAG_0x005
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+2 -2
View File
@@ -59,9 +59,9 @@ EventScript_162B76:: @ 8162B76
applymovement 255, Movement_162D07
waitmovement 0
delay 20
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 0, EventScript_162CB3
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_162CBC
special sub_8110AB4
compare_var_to_value VAR_RESULT, 2
data/maps/PokemonLeague_LancesRoom/scripts.inc
+2 -2
View File
@@ -112,9 +112,9 @@ PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
setvar VAR_0x8004, 12
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 0, EventScript_162A79
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
call_if 1, EventScript_162A82
setflag FLAG_0x003
setflag FLAG_0x005
data/maps/SaffronCity_Gym/scripts.inc
+2 -2
View File
@@ -21,7 +21,7 @@ EventScript_16EE0A:: @ 816EE0A
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x0AE
setflag FLAG_0x4B5
setflag FLAG_0x825
setflag FLAG_BADGE06_GET
setvar VAR_0x8008, 6
call EventScript_1A6B18
goto EventScript_16EE3D
@@ -98,7 +98,7 @@ EventScript_16EF4B:: @ 816EF4B
SaffronCity_Gym_EventScript_16EF55:: @ 816EF55
lockall
checkflag FLAG_0x825
checkflag FLAG_BADGE06_GET
goto_if_eq EventScript_16EF69
msgbox gUnknown_819BDFE
releaseall
data/maps/TwoIsland/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ TwoIsland_MapScript1_16756A:: @ 816756A
EventScript_167576:: @ 8167576
checkflag FLAG_0x844
goto_if_eq EventScript_167597
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_1675B8
checkflag FLAG_0x2A3
goto_if_eq EventScript_1675D9
data/maps/VermilionCity_Gym/scripts.inc
+2 -2
View File
@@ -226,7 +226,7 @@ EventScript_16B97C:: @ 816B97C
call_if 0, EventScript_16B9AB
clearflag FLAG_0x0A0
setflag FLAG_0x4B2
setflag FLAG_0x822
setflag FLAG_BADGE03_GET
setvar VAR_0x8008, 3
call EventScript_1A6B18
goto EventScript_16B9AF
@@ -297,7 +297,7 @@ EventScript_16BA81:: @ 816BA81
VermilionCity_Gym_EventScript_16BA8B:: @ 816BA8B
lockall
checkflag FLAG_0x822
checkflag FLAG_BADGE03_GET
goto_if_eq EventScript_16BA9F
msgbox gUnknown_819520B
releaseall
data/maps/VermilionCity_PokemonFanClub/scripts.inc
+1 -1
View File
@@ -38,7 +38,7 @@ EventScript_16B4F2:: @ 816B4F2
VermilionCity_PokemonFanClub_EventScript_16B4FC:: @ 816B4FC
lock
faceplayer
checkflag FLAG_0x82C
checkflag FLAG_SYS_GAME_CLEAR
goto_if_eq EventScript_16B511
msgbox gUnknown_81948E6
release
data/maps/ViridianCity/scripts.inc
+7 -7
View File
@@ -31,17 +31,17 @@ EventScript_165920:: @ 8165920
return
EventScript_165931:: @ 8165931
checkflag FLAG_0x821
checkflag FLAG_BADGE02_GET
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x822
checkflag FLAG_BADGE03_GET
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x823
checkflag FLAG_BADGE04_GET
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x824
checkflag FLAG_BADGE05_GET
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x825
checkflag FLAG_BADGE06_GET
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x826
checkflag FLAG_BADGE07_GET
goto_if 0, EventScript_1A77A9
setvar VAR_0x405A, 1
return
@@ -107,7 +107,7 @@ EventScript_1659EC:: @ 81659EC
ViridianCity_EventScript_1659F6:: @ 81659F6
lock
faceplayer
checkflag FLAG_0x820
checkflag FLAG_BADGE01_GET
goto_if_eq EventScript_165A23
compare_var_to_value VAR_0x4051, 2
goto_if 4, EventScript_165A4A
data/maps/ViridianCity_Gym/scripts.inc
+2 -2
View File
@@ -22,7 +22,7 @@ EventScript_169F04:: @ 8169F04
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x0AD
setflag FLAG_0x4B7
setflag FLAG_0x827
setflag FLAG_BADGE08_GET
setvar VAR_0x4054, 3
setvar VAR_0x8008, 8
call EventScript_1A6B18
@@ -105,7 +105,7 @@ EventScript_16A047:: @ 816A047
ViridianCity_Gym_EventScript_16A05E:: @ 816A05E
lockall
checkflag FLAG_0x827
checkflag FLAG_BADGE08_GET
goto_if_eq EventScript_16A072
msgbox gUnknown_818FB8D
releaseall
data/maps/ViridianCity_Mart/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3
.byte 0
ViridianCity_Mart_MapScript1_16A1DE:: @ 816A1DE
checkflag FLAG_0x829
checkflag FLAG_SYS_POKEDEX_GET
goto_if 0, EventScript_16A1E8
end
data/mystery_event_msg.s
+1 -1
View File
@@ -18,7 +18,7 @@ MysteryEventScript_StampCard:: @ 8488E2
@ specialvar VAR_0x8008, sub_813986C
@ setorcopyvar VAR_RESULT, 0
@ specialvar VAR_0x8009, sub_813986C
@ subvar VAR_0x8008, 32777
@ subvar VAR_0x8008, VAR_0x8009
@ getnumberstring 0, VAR_0x8008
@ lock
@ faceplayer