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

Rename rival trainer constants

Browse Source
This commit is contained in:
PikalaxALT
2019-10-21 11:06:53 -04:00
parent 85a033f350
commit 7e8da8845b
10 changed files with 810 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+6 -6
View File
@@ -1574,12 +1574,12 @@ EventScript_1A6551:: @ 81A6551
clearflag FLAG_DEFEATED_AGATHA clearflag FLAG_DEFEATED_AGATHA
clearflag FLAG_DEFEATED_LANCE clearflag FLAG_DEFEATED_LANCE
clearflag FLAG_DEFEATED_CHAMP clearflag FLAG_DEFEATED_CHAMP
cleartrainerflag TRAINER_CHAMPION_TERRY cleartrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE
cleartrainerflag TRAINER_CHAMPION_TERRY_2 cleartrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR
cleartrainerflag TRAINER_CHAMPION_TERRY_3 cleartrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER
cleartrainerflag TRAINER_CHAMPION_TERRY_4 cleartrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE
cleartrainerflag TRAINER_CHAMPION_TERRY_5 cleartrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR
cleartrainerflag TRAINER_CHAMPION_TERRY_6 cleartrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER
setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0 setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 0
return return
data/maps/CeruleanCity/scripts.inc
+3 -3
View File
@@ -73,15 +73,15 @@ EventScript_1664CC:: @ 81664CC
end end
EventScript_166582:: @ 8166582 EventScript_166582:: @ 8166582
trainerbattle 3, TRAINER_RIVAL_TERRY_7, 0, Text_17EB71 trainerbattle 3, TRAINER_RIVAL_CERULEAN_SQUIRTLE, 0, Text_17EB71
return return
EventScript_16658D:: @ 816658D EventScript_16658D:: @ 816658D
trainerbattle 3, TRAINER_RIVAL_TERRY_8, 0, Text_17EB71 trainerbattle 3, TRAINER_RIVAL_CERULEAN_BULBASAUR, 0, Text_17EB71
return return
EventScript_166598:: @ 8166598 EventScript_166598:: @ 8166598
trainerbattle 3, TRAINER_RIVAL_TERRY_9, 0, Text_17EB71 trainerbattle 3, TRAINER_RIVAL_CERULEAN_CHARMANDER, 0, Text_17EB71
return return
EventScript_1665A3:: @ 81665A3 EventScript_1665A3:: @ 81665A3
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+3 -3
View File
@@ -347,7 +347,7 @@ EventScript_16939C:: @ 816939C
end end
EventScript_1693AC:: @ 81693AC EventScript_1693AC:: @ 81693AC
trainerbattle 9, TRAINER_RIVAL_TERRY, 3, Text_18DDEA, Text_18DE1A trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
goto EventScript_1694C2 goto EventScript_1694C2
end end
@@ -403,7 +403,7 @@ EventScript_169414:: @ 8169414
end end
EventScript_169424:: @ 8169424 EventScript_169424:: @ 8169424
trainerbattle 9, TRAINER_RIVAL_TERRY_3, 3, Text_18DDEA, Text_18DE1A trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
goto EventScript_1694C2 goto EventScript_1694C2
end end
@@ -462,7 +462,7 @@ EventScript_16948F:: @ 816948F
end end
EventScript_16949F:: @ 816949F EventScript_16949F:: @ 816949F
trainerbattle 9, TRAINER_RIVAL_TERRY_2, 3, Text_18DDEA, Text_18DE1A trainerbattle 9, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
goto EventScript_1694C2 goto EventScript_1694C2
end end
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+12 -12
View File
@@ -16,23 +16,23 @@ PokemonLeague_ChampionsRoom_MapScript2_162AF2:: @ 8162AF2
end end
EventScript_162B1E:: @ 8162B1E EventScript_162B1E:: @ 8162B1E
checktrainerflag TRAINER_CHAMPION_TERRY checktrainerflag TRAINER_CHAMPION_FIRST_SQUIRTLE
goto_if eq, EventScript_162B57 goto_if eq, EventScript_162B57
checktrainerflag TRAINER_CHAMPION_TERRY_4 checktrainerflag TRAINER_CHAMPION_REMATCH_SQUIRTLE
goto_if eq, EventScript_162B57 goto_if eq, EventScript_162B57
return return
EventScript_162B31:: @ 8162B31 EventScript_162B31:: @ 8162B31
checktrainerflag TRAINER_CHAMPION_TERRY_2 checktrainerflag TRAINER_CHAMPION_FIRST_BULBASAUR
goto_if eq, EventScript_162B57 goto_if eq, EventScript_162B57
checktrainerflag TRAINER_CHAMPION_TERRY_5 checktrainerflag TRAINER_CHAMPION_REMATCH_BULBASAUR
goto_if eq, EventScript_162B57 goto_if eq, EventScript_162B57
return return
EventScript_162B44:: @ 8162B44 EventScript_162B44:: @ 8162B44
checktrainerflag TRAINER_CHAMPION_TERRY_3 checktrainerflag TRAINER_CHAMPION_FIRST_CHARMANDER
goto_if eq, EventScript_162B57 goto_if eq, EventScript_162B57
checktrainerflag TRAINER_CHAMPION_TERRY_6 checktrainerflag TRAINER_CHAMPION_REMATCH_CHARMANDER
goto_if eq, EventScript_162B57 goto_if eq, EventScript_162B57
return return
@@ -142,27 +142,27 @@ EventScript_162CBC:: @ 8162CBC
return return
EventScript_162CC5:: @ 8162CC5 EventScript_162CC5:: @ 8162CC5
trainerbattle 3, TRAINER_CHAMPION_TERRY, 0, Text_178E3F trainerbattle 3, TRAINER_CHAMPION_FIRST_SQUIRTLE, 0, Text_178E3F
return return
EventScript_162CD0:: @ 8162CD0 EventScript_162CD0:: @ 8162CD0
trainerbattle 3, TRAINER_CHAMPION_TERRY_2, 0, Text_178E3F trainerbattle 3, TRAINER_CHAMPION_FIRST_BULBASAUR, 0, Text_178E3F
return return
EventScript_162CDB:: @ 8162CDB EventScript_162CDB:: @ 8162CDB
trainerbattle 3, TRAINER_CHAMPION_TERRY_3, 0, Text_178E3F trainerbattle 3, TRAINER_CHAMPION_FIRST_CHARMANDER, 0, Text_178E3F
return return
EventScript_162CE6:: @ 8162CE6 EventScript_162CE6:: @ 8162CE6
trainerbattle 3, TRAINER_CHAMPION_TERRY_4, 0, Text_178E3F trainerbattle 3, TRAINER_CHAMPION_REMATCH_SQUIRTLE, 0, Text_178E3F
return return
EventScript_162CF1:: @ 8162CF1 EventScript_162CF1:: @ 8162CF1
trainerbattle 3, TRAINER_CHAMPION_TERRY_5, 0, Text_178E3F trainerbattle 3, TRAINER_CHAMPION_REMATCH_BULBASAUR, 0, Text_178E3F
return return
EventScript_162CFC:: @ 8162CFC EventScript_162CFC:: @ 8162CFC
trainerbattle 3, TRAINER_CHAMPION_TERRY_6, 0, Text_178E3F trainerbattle 3, TRAINER_CHAMPION_REMATCH_CHARMANDER, 0, Text_178E3F
return return
Movement_162D07:: @ 8162D07 Movement_162D07:: @ 8162D07
data/maps/PokemonTower_2F/scripts.inc
+3 -3
View File
@@ -64,15 +64,15 @@ EventScript_16334B:: @ 816334B
return return
EventScript_16335D:: @ 816335D EventScript_16335D:: @ 816335D
trainerbattle 3, TRAINER_RIVAL_TERRY_13, 0, Text_179D73 trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, 0, Text_179D73
return return
EventScript_163368:: @ 8163368 EventScript_163368:: @ 8163368
trainerbattle 3, TRAINER_RIVAL_TERRY_14, 0, Text_179D73 trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, 0, Text_179D73
return return
EventScript_163373:: @ 8163373 EventScript_163373:: @ 8163373
trainerbattle 3, TRAINER_RIVAL_TERRY_15, 0, Text_179D73 trainerbattle 3, TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, 0, Text_179D73
return return
EventScript_16337E:: @ 816337E EventScript_16337E:: @ 816337E
data/maps/Route22/scripts.inc
+6 -6
View File
@@ -73,15 +73,15 @@ EventScript_16835B:: @ 816835B
return return
EventScript_16836D:: @ 816836D EventScript_16836D:: @ 816836D
trainerbattle 9, TRAINER_RIVAL_TERRY_4, 0, Text_188959, Text_18DE1A trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
return return
EventScript_16837C:: @ 816837C EventScript_16837C:: @ 816837C
trainerbattle 9, TRAINER_RIVAL_TERRY_5, 0, Text_188959, Text_18DE1A trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
return return
EventScript_16838B:: @ 816838B EventScript_16838B:: @ 816838B
trainerbattle 9, TRAINER_RIVAL_TERRY_6, 0, Text_188959, Text_18DE1A trainerbattle 9, TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
return return
EventScript_16839A:: @ 816839A EventScript_16839A:: @ 816839A
@@ -235,15 +235,15 @@ EventScript_1684A7:: @ 81684A7
return return
EventScript_1684B9:: @ 81684B9 EventScript_1684B9:: @ 81684B9
trainerbattle 3, TRAINER_RIVAL_TERRY_19, 0, Text_188B08 trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, 0, Text_188B08
return return
EventScript_1684C4:: @ 81684C4 EventScript_1684C4:: @ 81684C4
trainerbattle 3, TRAINER_RIVAL_TERRY_20, 0, Text_188B08 trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, 0, Text_188B08
return return
EventScript_1684CF:: @ 81684CF EventScript_1684CF:: @ 81684CF
trainerbattle 3, TRAINER_RIVAL_TERRY_21, 0, Text_188B08 trainerbattle 3, TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, 0, Text_188B08
return return
Movement_1684DA:: @ 81684DA Movement_1684DA:: @ 81684DA
data/maps/SSAnne_2F_Corridor/scripts.inc
+3 -3
View File
@@ -83,15 +83,15 @@ EventScript_1609CA:: @ 81609CA
return return
EventScript_1609DC:: @ 81609DC EventScript_1609DC:: @ 81609DC
trainerbattle 3, TRAINER_RIVAL_TERRY_10, 0, Text_173110 trainerbattle 3, TRAINER_RIVAL_SS_ANNE_SQUIRTLE, 0, Text_173110
return return
EventScript_1609E7:: @ 81609E7 EventScript_1609E7:: @ 81609E7
trainerbattle 3, TRAINER_RIVAL_TERRY_11, 0, Text_173110 trainerbattle 3, TRAINER_RIVAL_SS_ANNE_BULBASAUR, 0, Text_173110
return return
EventScript_1609F2:: @ 81609F2 EventScript_1609F2:: @ 81609F2
trainerbattle 3, TRAINER_RIVAL_TERRY_12, 0, Text_173110 trainerbattle 3, TRAINER_RIVAL_SS_ANNE_CHARMANDER, 0, Text_173110
return return
EventScript_1609FD:: @ 81609FD EventScript_1609FD:: @ 81609FD
data/maps/SilphCo_7F/scripts.inc
+3 -3
View File
@@ -83,15 +83,15 @@ EventScript_161A7F:: @ 8161A7F
return return
EventScript_161A80:: @ 8161A80 EventScript_161A80:: @ 8161A80
trainerbattle 3, TRAINER_RIVAL_TERRY_16, 0, Text_1767D0 trainerbattle 3, TRAINER_RIVAL_SILPH_SQUIRTLE, 0, Text_1767D0
return return
EventScript_161A8B:: @ 8161A8B EventScript_161A8B:: @ 8161A8B
trainerbattle 3, TRAINER_RIVAL_TERRY_17, 0, Text_1767D0 trainerbattle 3, TRAINER_RIVAL_SILPH_BULBASAUR, 0, Text_1767D0
return return
EventScript_161A96:: @ 8161A96 EventScript_161A96:: @ 8161A96
trainerbattle 3, TRAINER_RIVAL_TERRY_18, 0, Text_1767D0 trainerbattle 3, TRAINER_RIVAL_SILPH_CHARMANDER, 0, Text_1767D0
return return
EventScript_161AA1:: @ 8161AA1 EventScript_161AA1:: @ 8161AA1
include/constants/trainers.h
+27 -27
View File
@@ -642,15 +642,15 @@
#define TRAINER_BLACK_BELT_KIYO 323 #define TRAINER_BLACK_BELT_KIYO 323
#define TRAINER_BLACK_BELT_TAKASHI 324 #define TRAINER_BLACK_BELT_TAKASHI 324
#define TRAINER_BLACK_BELT_DAISUKE 325 #define TRAINER_BLACK_BELT_DAISUKE 325
#define TRAINER_RIVAL_TERRY 326 #define TRAINER_RIVAL_OAKS_LAB_SQUIRTLE 326
#define TRAINER_RIVAL_TERRY_2 327 #define TRAINER_RIVAL_OAKS_LAB_BULBASAUR 327
#define TRAINER_RIVAL_TERRY_3 328 #define TRAINER_RIVAL_OAKS_LAB_CHARMANDER 328
#define TRAINER_RIVAL_TERRY_4 329 #define TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE 329
#define TRAINER_RIVAL_TERRY_5 330 #define TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR 330
#define TRAINER_RIVAL_TERRY_6 331 #define TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER 331
#define TRAINER_RIVAL_TERRY_7 332 #define TRAINER_RIVAL_CERULEAN_SQUIRTLE 332
#define TRAINER_RIVAL_TERRY_8 333 #define TRAINER_RIVAL_CERULEAN_BULBASAUR 333
#define TRAINER_RIVAL_TERRY_9 334 #define TRAINER_RIVAL_CERULEAN_CHARMANDER 334
#define TRAINER_SCIENTIST_TED 335 #define TRAINER_SCIENTIST_TED 335
#define TRAINER_SCIENTIST_CONNOR 336 #define TRAINER_SCIENTIST_CONNOR 336
#define TRAINER_SCIENTIST_JERRY 337 #define TRAINER_SCIENTIST_JERRY 337
@@ -742,21 +742,21 @@
#define TRAINER_GENTLEMAN_TUCKER 423 #define TRAINER_GENTLEMAN_TUCKER 423
#define TRAINER_GENTLEMAN_NORTON 424 #define TRAINER_GENTLEMAN_NORTON 424
#define TRAINER_GENTLEMAN_WALTER 425 #define TRAINER_GENTLEMAN_WALTER 425
#define TRAINER_RIVAL_TERRY_10 426 #define TRAINER_RIVAL_SS_ANNE_SQUIRTLE 426
#define TRAINER_RIVAL_TERRY_11 427 #define TRAINER_RIVAL_SS_ANNE_BULBASAUR 427
#define TRAINER_RIVAL_TERRY_12 428 #define TRAINER_RIVAL_SS_ANNE_CHARMANDER 428
#define TRAINER_RIVAL_TERRY_13 429 #define TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE 429
#define TRAINER_RIVAL_TERRY_14 430 #define TRAINER_RIVAL_POKENON_TOWER_BULBASAUR 430
#define TRAINER_RIVAL_TERRY_15 431 #define TRAINER_RIVAL_POKENON_TOWER_CHARMANDER 431
#define TRAINER_RIVAL_TERRY_16 432 #define TRAINER_RIVAL_SILPH_SQUIRTLE 432
#define TRAINER_RIVAL_TERRY_17 433 #define TRAINER_RIVAL_SILPH_BULBASAUR 433
#define TRAINER_RIVAL_TERRY_18 434 #define TRAINER_RIVAL_SILPH_CHARMANDER 434
#define TRAINER_RIVAL_TERRY_19 435 #define TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE 435
#define TRAINER_RIVAL_TERRY_20 436 #define TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR 436
#define TRAINER_RIVAL_TERRY_21 437 #define TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER 437
#define TRAINER_CHAMPION_TERRY 438 #define TRAINER_CHAMPION_FIRST_SQUIRTLE 438
#define TRAINER_CHAMPION_TERRY_2 439 #define TRAINER_CHAMPION_FIRST_BULBASAUR 439
#define TRAINER_CHAMPION_TERRY_3 440 #define TRAINER_CHAMPION_FIRST_CHARMANDER 440
#define TRAINER_CHANNELER_PATRICIA 441 #define TRAINER_CHANNELER_PATRICIA 441
#define TRAINER_CHANNELER_CARLY 442 #define TRAINER_CHANNELER_CARLY 442
#define TRAINER_CHANNELER_HOPE 443 #define TRAINER_CHANNELER_HOPE 443
@@ -1055,9 +1055,9 @@
#define TRAINER_ELITE_FOUR_BRUNO_2 736 #define TRAINER_ELITE_FOUR_BRUNO_2 736
#define TRAINER_ELITE_FOUR_AGATHA_2 737 #define TRAINER_ELITE_FOUR_AGATHA_2 737
#define TRAINER_ELITE_FOUR_LANCE_2 738 #define TRAINER_ELITE_FOUR_LANCE_2 738
#define TRAINER_CHAMPION_TERRY_4 739 #define TRAINER_CHAMPION_REMATCH_SQUIRTLE 739
#define TRAINER_CHAMPION_TERRY_5 740 #define TRAINER_CHAMPION_REMATCH_BULBASAUR 740
#define TRAINER_CHAMPION_TERRY_6 741 #define TRAINER_CHAMPION_REMATCH_CHARMANDER 741
#define TRAINER_CUE_BALL_PAXTON 742 #define TRAINER_CUE_BALL_PAXTON 742
#define NUM_TRAINERS 743 #define NUM_TRAINERS 743
src/trainers.c
+744 -743
View File
File diff suppressed because it is too large Load Diff