Assign trainer consts to script cmd args

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
+10 -10
View File
@@ -4,9 +4,9 @@ RocketHideout_B4F_MapScripts:: @ 81612E8
RocketHideout_B4F_MapScript1_1612EE:: @ 81612EE
setvar VAR_0x4001, 0
checktrainerflag FLAG_0x16E
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if 1, EventScript_161311
checktrainerflag FLAG_0x16F
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if 1, EventScript_161311
compare_var_to_value VAR_0x4001, 2
call_if 5, EventScript_16146A
@@ -26,7 +26,7 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
waitmessage
playbgm MUS_ROCKET, 0
waitbuttonpress
trainerbattle 3, 348, 0, Text_175318
trainerbattle 3, TRAINER_BOSS_GIOVANNI, 0, Text_175318
msgbox gUnknown_817532D
fadescreen 1
closemessage
@@ -52,7 +52,7 @@ RocketHideout_B4F_EventScript_161363:: @ 8161363
end
RocketHideout_B4F_EventScript_161381:: @ 8161381
trainerbattle 2, 368, 0, Text_175488, Text_1754B9, EventScript_16139D
trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_18, 0, Text_175488, Text_1754B9, EventScript_16139D
msgbox gUnknown_81754BD
release
end
@@ -76,15 +76,15 @@ RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
end
RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
trainerbattle 2, 366, 0, Text_1753D0, Text_1753FE, EventScript_1613E9
trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_16, 0, Text_1753D0, Text_1753FE, EventScript_1613E9
msgbox gUnknown_817540C, 6
end
EventScript_1613E9:: @ 81613E9
setvar VAR_0x4001, 0
checktrainerflag FLAG_0x16E
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if 1, EventScript_161311
checktrainerflag FLAG_0x16F
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if 1, EventScript_161311
compare_var_to_value VAR_0x4001, 2
call_if 1, EventScript_1614A1
@@ -94,15 +94,15 @@ EventScript_1613E9:: @ 81613E9
end
RocketHideout_B4F_EventScript_161418:: @ 8161418
trainerbattle 2, 367, 0, Text_175437, Text_175463, EventScript_161433
trainerbattle 2, TRAINER_TEAM_ROCKET_GRUNT_17, 0, Text_175437, Text_175463, EventScript_161433
msgbox gUnknown_817546A, 6
end
EventScript_161433:: @ 8161433
setvar VAR_0x4001, 0
checktrainerflag FLAG_0x16E
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_16
call_if 1, EventScript_161311
checktrainerflag FLAG_0x16F
checktrainerflag TRAINER_TEAM_ROCKET_GRUNT_17
call_if 1, EventScript_161311
compare_var_to_value VAR_0x4001, 2
call_if 1, EventScript_1614A1