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

Fix misspelling: TRAINER_RIVAL_POKENON_TOWER -> TRAINER_RIVAL_POKEMON_TOWER

Browse Source
This commit is contained in:
Edward Nolan
2023-09-10 21:16:06 -04:00
parent f8741615bf
commit 93d4e3ff66
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PokemonTower_2F/scripts.inc
+3 -3
View File
@@ -59,15 +59,15 @@ PokemonTower_2F_EventScript_RivalFacePlayerDown::
return return
PokemonTower_2F_EventScript_RivalSquirtle:: PokemonTower_2F_EventScript_RivalSquirtle::
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, PokemonTower_2F_Text_RivalDefeat trainerbattle_no_intro TRAINER_RIVAL_POKEMON_TOWER_SQUIRTLE, PokemonTower_2F_Text_RivalDefeat
return return
PokemonTower_2F_EventScript_RivalBulbasaur:: PokemonTower_2F_EventScript_RivalBulbasaur::
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, PokemonTower_2F_Text_RivalDefeat trainerbattle_no_intro TRAINER_RIVAL_POKEMON_TOWER_BULBASAUR, PokemonTower_2F_Text_RivalDefeat
return return
PokemonTower_2F_EventScript_RivalCharmander:: PokemonTower_2F_EventScript_RivalCharmander::
trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, PokemonTower_2F_Text_RivalDefeat trainerbattle_no_intro TRAINER_RIVAL_POKEMON_TOWER_CHARMANDER, PokemonTower_2F_Text_RivalDefeat
return return
PokemonTower_2F_EventScript_RivalExitRight:: PokemonTower_2F_EventScript_RivalExitRight::
include/constants/opponents.h
+3 -3
View File
@@ -432,9 +432,9 @@
#define TRAINER_RIVAL_SS_ANNE_SQUIRTLE 426 #define TRAINER_RIVAL_SS_ANNE_SQUIRTLE 426
#define TRAINER_RIVAL_SS_ANNE_BULBASAUR 427 #define TRAINER_RIVAL_SS_ANNE_BULBASAUR 427
#define TRAINER_RIVAL_SS_ANNE_CHARMANDER 428 #define TRAINER_RIVAL_SS_ANNE_CHARMANDER 428
#define TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE 429 #define TRAINER_RIVAL_POKEMON_TOWER_SQUIRTLE 429
#define TRAINER_RIVAL_POKENON_TOWER_BULBASAUR 430 #define TRAINER_RIVAL_POKEMON_TOWER_BULBASAUR 430
#define TRAINER_RIVAL_POKENON_TOWER_CHARMANDER 431 #define TRAINER_RIVAL_POKEMON_TOWER_CHARMANDER 431
#define TRAINER_RIVAL_SILPH_SQUIRTLE 432 #define TRAINER_RIVAL_SILPH_SQUIRTLE 432
#define TRAINER_RIVAL_SILPH_BULBASAUR 433 #define TRAINER_RIVAL_SILPH_BULBASAUR 433
#define TRAINER_RIVAL_SILPH_CHARMANDER 434 #define TRAINER_RIVAL_SILPH_CHARMANDER 434
src/data/trainers.h
+3 -3
View File
@@ -4282,7 +4282,7 @@ const struct Trainer gTrainers[] = {
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.party = NO_ITEM_DEFAULT_MOVES(sParty_RivalSsAnneCharmander), .party = NO_ITEM_DEFAULT_MOVES(sParty_RivalSsAnneCharmander),
}, },
[TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE] = { [TRAINER_RIVAL_POKEMON_TOWER_SQUIRTLE] = {
.trainerClass = TRAINER_CLASS_RIVAL_LATE, .trainerClass = TRAINER_CLASS_RIVAL_LATE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerPic = TRAINER_PIC_RIVAL_LATE,
@@ -4292,7 +4292,7 @@ const struct Trainer gTrainers[] = {
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.party = NO_ITEM_DEFAULT_MOVES(sParty_RivalPokenonTowerSquirtle), .party = NO_ITEM_DEFAULT_MOVES(sParty_RivalPokenonTowerSquirtle),
}, },
[TRAINER_RIVAL_POKENON_TOWER_BULBASAUR] = { [TRAINER_RIVAL_POKEMON_TOWER_BULBASAUR] = {
.trainerClass = TRAINER_CLASS_RIVAL_LATE, .trainerClass = TRAINER_CLASS_RIVAL_LATE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerPic = TRAINER_PIC_RIVAL_LATE,
@@ -4302,7 +4302,7 @@ const struct Trainer gTrainers[] = {
.aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY, .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
.party = NO_ITEM_DEFAULT_MOVES(sParty_RivalPokenonTowerBulbasaur), .party = NO_ITEM_DEFAULT_MOVES(sParty_RivalPokenonTowerBulbasaur),
}, },
[TRAINER_RIVAL_POKENON_TOWER_CHARMANDER] = { [TRAINER_RIVAL_POKEMON_TOWER_CHARMANDER] = {
.trainerClass = TRAINER_CLASS_RIVAL_LATE, .trainerClass = TRAINER_CLASS_RIVAL_LATE,
.encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE, .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
.trainerPic = TRAINER_PIC_RIVAL_LATE, .trainerPic = TRAINER_PIC_RIVAL_LATE,