summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-05-20 03:57:12 -0500
committerBryan Bishop <kanzure@gmail.com>2012-05-20 03:57:12 -0500
commit6a2dc36749563d2db179d8dfe38db445515d5495 (patch)
tree971df773ee5d68ed8a12ffea7e47fc8c8e9beab4
parentbe8a5d6c6a7035c0dbf4c5d407e1aac12769c501 (diff)
rename cal's header to PKMN Trainer
-rw-r--r--extras/trainers.py2
-rw-r--r--main.asm4
2 files changed, 3 insertions, 3 deletions
diff --git a/extras/trainers.py b/extras/trainers.py
index 523e8ce8f..c311a77fb 100644
--- a/extras/trainers.py
+++ b/extras/trainers.py
@@ -24,7 +24,7 @@ trainer_group_names = {
#PokemonProf group is empty :/
0x0A: {"name": "Pokémon Prof.", "constant": "POKEMON_PROF"},
0x0B: {"name": "Elite Four Will", "uses_numeric_trainer_ids": True, "constant": "WILL"},
-0x0C: {"name": "Special PKMN 1 [Cal]", "constant": "CAL"},
+0x0C: {"name": "PKMN [Cal]", "constant": "CAL"},
0x0D: {"name": "Elite Four Bruno", "uses_numeric_trainer_ids": True, "constant": "BRUNO"},
0x0E: {"name": "Elite Four Karen", "uses_numeric_trainer_ids": True, "constant": "KAREN"},
0x0F: {"name": "Elite Four Koga", "uses_numeric_trainer_ids": True, "constant": "KOGA"},
diff --git a/main.asm b/main.asm
index 127d7061b..a8aef251e 100644
--- a/main.asm
+++ b/main.asm
@@ -3238,7 +3238,7 @@ TrainerGroupPointerTable: ; 0x39999
dw Rival1TrainerGroupHeader
dw EliteFourWillTrainerGroupHeader
dw EliteFourWillTrainerGroupHeader
- dw SpecialPKMN1TrainerGroupHeader
+ dw PKMNTrainerGroupHeader
dw EliteFourBrunoTrainerGroupHeader
dw EliteFourKarenTrainerGroupHeader
dw EliteFourKogaTrainerGroupHeader
@@ -3549,7 +3549,7 @@ EliteFourWillTrainerGroupHeader: ; 0x39c51
; last_address=0x39c76 size=37
; 0x39c76
-SpecialPKMN1TrainerGroupHeader: ; 0x39c76
+PKMNTrainerGroupHeader: ; 0x39c76
; CAL1 (2) at 0x39c76
db "CAL@"
db $00 ; data type