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

Assign trainer consts to script cmd args

Browse Source
This commit is contained in:
PikalaxALT
2019-10-18 10:37:48 -04:00
parent 4d8f66774e
commit 9903f7a77a
73 changed files with 805 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CinnabarIsland_Gym/scripts.inc
+20 -20
View File
@@ -56,7 +56,7 @@ CinnabarIsland_Gym_EventScript_16D9D4:: @ 816D9D4
setvar VAR_0x8004, 8
setvar VAR_0x8005, 2
special UpdatePickStateFromSpecialVar8005
trainerbattle 1, 419, 0, Text_199543, Text_1995FA, EventScript_16DA06
trainerbattle 1, TRAINER_LEADER_BLAINE, 0, Text_199543, Text_1995FA, EventScript_16DA06
checkflag FLAG_0x24E
goto_if 0, EventScript_16DA34
msgbox gUnknown_819971D
@@ -95,12 +95,12 @@ EventScript_16DA75:: @ 816DA75
end
CinnabarIsland_Gym_EventScript_16DA7F:: @ 816DA7F
trainerbattle 0, 177, 0, Text_1997A5, Text_1997D6
trainerbattle 0, TRAINER_SUPER_NERD_ERIK, 0, Text_1997A5, Text_1997D6
msgbox gUnknown_81997EA, 6
end
CinnabarIsland_Gym_EventScript_16DA96:: @ 816DA96
trainerbattle 2, 178, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
trainerbattle 2, TRAINER_SUPER_NERD_AVERY, 0, Text_1998BD, Text_1998ED, EventScript_16DAB1
msgbox gUnknown_8199911, 6
end
@@ -115,7 +115,7 @@ EventScript_16DABC:: @ 816DABC
return
CinnabarIsland_Gym_EventScript_16DAC2:: @ 816DAC2
trainerbattle 2, 179, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
trainerbattle 2, TRAINER_SUPER_NERD_DEREK, 0, Text_1999B7, Text_1999DB, EventScript_16DAEA
setvar VAR_0x8004, 8
setvar VAR_0x8005, 2
special SetFlavorTextFlagFromSpecialVars
@@ -133,7 +133,7 @@ EventScript_16DAF5:: @ 816DAF5
return
CinnabarIsland_Gym_EventScript_16DAFB:: @ 816DAFB
trainerbattle 2, 180, 0, Text_199AFC, Text_199B16, EventScript_16DB16
trainerbattle 2, TRAINER_SUPER_NERD_ZAC, 0, Text_199AFC, Text_199B16, EventScript_16DB16
msgbox gUnknown_8199B27, 6
end
@@ -148,7 +148,7 @@ EventScript_16DB21:: @ 816DB21
return
CinnabarIsland_Gym_EventScript_16DB27:: @ 816DB27
trainerbattle 2, 213, 0, Text_19983F, Text_199870, EventScript_16DB42
trainerbattle 2, TRAINER_BURGLAR_QUINN, 0, Text_19983F, Text_199870, EventScript_16DB42
msgbox gUnknown_819987D, 6
end
@@ -163,7 +163,7 @@ EventScript_16DB4D:: @ 816DB4D
return
CinnabarIsland_Gym_EventScript_16DB53:: @ 816DB53
trainerbattle 2, 214, 0, Text_199948, Text_199973, EventScript_16DB6E
trainerbattle 2, TRAINER_BURGLAR_RAMON, 0, Text_199948, Text_199973, EventScript_16DB6E
msgbox gUnknown_8199986, 6
end
@@ -178,7 +178,7 @@ EventScript_16DB79:: @ 816DB79
return
CinnabarIsland_Gym_EventScript_16DB7F:: @ 816DB7F
trainerbattle 2, 215, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
trainerbattle 2, TRAINER_BURGLAR_DUSTY, 0, Text_199A7F, Text_199AB9, EventScript_16DB9A
msgbox gUnknown_8199AC9, 6
end
@@ -276,7 +276,7 @@ EventScript_16DC68:: @ 816DC68
EventScript_16DC6A:: @ 816DC6A
call EventScript_16DC34
checktrainerflag FLAG_0x0D5
checktrainerflag TRAINER_BURGLAR_QUINN
goto_if 0, EventScript_16DC7A
releaseall
end
@@ -288,7 +288,7 @@ EventScript_16DC7A:: @ 816DC7A
call_if 1, EventScript_16DCC6
textcolor 0
msgbox gUnknown_819983F
trainerbattle 3, 213, 0, Text_199870
trainerbattle 3, TRAINER_BURGLAR_QUINN, 0, Text_199870
checkflag FLAG_0x265
goto_if_eq EventScript_16DC68
call EventScript_16DC58
@@ -355,7 +355,7 @@ EventScript_16DD31:: @ 816DD31
EventScript_16DD41:: @ 816DD41
call EventScript_16DC34
checktrainerflag FLAG_0x0B2
checktrainerflag TRAINER_SUPER_NERD_AVERY
goto_if 0, EventScript_16DD51
releaseall
end
@@ -367,7 +367,7 @@ EventScript_16DD51:: @ 816DD51
call_if 1, EventScript_16DD9D
textcolor 0
msgbox gUnknown_81998BD
trainerbattle 3, 178, 0, Text_1998ED
trainerbattle 3, TRAINER_SUPER_NERD_AVERY, 0, Text_1998ED
checkflag FLAG_0x267
goto_if_eq EventScript_16DC68
call EventScript_16DD31
@@ -443,7 +443,7 @@ EventScript_16DE0F:: @ 816DE0F
EventScript_16DE1F:: @ 816DE1F
call EventScript_16DC34
checktrainerflag FLAG_0x0D6
checktrainerflag TRAINER_BURGLAR_RAMON
goto_if 0, EventScript_16DE2F
releaseall
end
@@ -455,7 +455,7 @@ EventScript_16DE2F:: @ 816DE2F
call_if 1, EventScript_16DE7B
textcolor 0
msgbox gUnknown_8199948
trainerbattle 3, 214, 0, Text_199973
trainerbattle 3, TRAINER_BURGLAR_RAMON, 0, Text_199973
checkflag FLAG_0x268
goto_if_eq EventScript_16DC68
call EventScript_16DE0F
@@ -522,7 +522,7 @@ EventScript_16DEE6:: @ 816DEE6
EventScript_16DEF6:: @ 816DEF6
call EventScript_16DC34
checktrainerflag FLAG_0x0B3
checktrainerflag TRAINER_SUPER_NERD_DEREK
goto_if 0, EventScript_16DF06
releaseall
end
@@ -534,7 +534,7 @@ EventScript_16DF06:: @ 816DF06
call_if 1, EventScript_16DF52
textcolor 0
msgbox gUnknown_81999B7
trainerbattle 3, 179, 0, Text_1999DB
trainerbattle 3, TRAINER_SUPER_NERD_DEREK, 0, Text_1999DB
checkflag FLAG_0x269
goto_if_eq EventScript_16DC68
call EventScript_16DEE6
@@ -601,7 +601,7 @@ EventScript_16DFBD:: @ 816DFBD
EventScript_16DFCD:: @ 816DFCD
call EventScript_16DC34
checktrainerflag FLAG_0x0D7
checktrainerflag TRAINER_BURGLAR_DUSTY
goto_if 0, EventScript_16DFDD
releaseall
end
@@ -613,7 +613,7 @@ EventScript_16DFDD:: @ 816DFDD
call_if 1, EventScript_16E029
textcolor 0
msgbox gUnknown_8199A7F
trainerbattle 3, 215, 0, Text_199AB9
trainerbattle 3, TRAINER_BURGLAR_DUSTY, 0, Text_199AB9
checkflag FLAG_0x26A
goto_if_eq EventScript_16DC68
call EventScript_16DFBD
@@ -680,7 +680,7 @@ EventScript_16E094:: @ 816E094
EventScript_16E0A4:: @ 816E0A4
call EventScript_16DC34
checktrainerflag FLAG_0x0B4
checktrainerflag TRAINER_SUPER_NERD_ZAC
goto_if 0, EventScript_16E0B4
releaseall
end
@@ -692,7 +692,7 @@ EventScript_16E0B4:: @ 816E0B4
call_if 1, EventScript_16E100
textcolor 0
msgbox gUnknown_8199AFC
trainerbattle 3, 180, 0, Text_199B16
trainerbattle 3, TRAINER_SUPER_NERD_ZAC, 0, Text_199B16
checkflag FLAG_0x26B
goto_if_eq EventScript_16DC68
call EventScript_16E094