Trainer dump pass 2; flag refactoring

This commit is contained in:
PikalaxALT
2019-10-17 17:11:34 -04:00
parent 0b708aeade
commit 97dc0a6903
13 changed files with 1503 additions and 1004 deletions
+2 -2
View File
@@ -68,7 +68,7 @@ EventScript_16DA06:: @ 816DA06
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B6
setflag FLAG_UNK826
setflag FLAG_0x826
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_UNK826
checkflag FLAG_0x826
goto_if_eq EventScript_16DBDE
msgbox gUnknown_8199C29
releaseall
+2 -2
View File
@@ -18,7 +18,7 @@ EventScript_16D580:: @ 816D580
special SetFlavorTextFlagFromSpecialVars
clearflag FLAG_0x09F
setflag FLAG_0x4B4
setflag FLAG_UNK824
setflag FLAG_0x824
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_UNK824
checkflag FLAG_0x824
goto_if_eq EventScript_16D6BB
msgbox gUnknown_8198B4B
releaseall
+1 -1
View File
@@ -50,7 +50,7 @@ EventScript_1654D8:: @ 81654D8
addobject 3
applymovement 3, Movement_1655AF
waitmovement 0
checkflag FLAG_SYS_RIBBON_GET
checkflag FLAG_0x89B
goto_if 0, EventScript_1655A1
msgbox gUnknown_817D8BF
setvar VAR_0x8004, 0
@@ -974,7 +974,7 @@ EventScript_1699CE:: @ 81699CE
closemessage
compare_var_to_value VAR_0x8009, 60
goto_if 0, EventScript_1699F9
checkflag FLAG_SYS_RIBBON_GET
checkflag FLAG_0x89B
goto_if 0, EventScript_1699F9
delay 30
msgbox gUnknown_818EDF5
+2 -2
View File
@@ -17,7 +17,7 @@ EventScript_16A5C5:: @ 816A5C5
setvar VAR_0x8005, 1
special SetFlavorTextFlagFromSpecialVars
setflag FLAG_0x4B0
setflag FLAG_UNK820
setflag FLAG_0x820
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_UNK820
checkflag FLAG_0x820
goto_if_eq EventScript_16A6C3
msgbox gUnknown_819146E
releaseall
+3 -3
View File
@@ -37,11 +37,11 @@ EventScript_165931:: @ 8165931
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x823
goto_if 0, EventScript_1A77A9
checkflag FLAG_UNK824
checkflag FLAG_0x824
goto_if 0, EventScript_1A77A9
checkflag FLAG_0x825
goto_if 0, EventScript_1A77A9
checkflag FLAG_UNK826
checkflag FLAG_0x826
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_UNK820
checkflag FLAG_0x820
goto_if_eq EventScript_165A23
compare_var_to_value VAR_0x4051, 2
goto_if 4, EventScript_165A4A