Rename Kay to Carrie (and Carrie to Cathy)

Mizo1994 · Aug 26, 2017 · 4e46538 · 4e46538
1 parent 99a0fb2
commit 4e46538
Show file tree

Hide file tree

Showing 27 changed files with 44 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -158,6 +158,7 @@ These changes have been made since the current 2.2.0 release. If you build the p
 * Add: Cross whirlpools, don't remove them (like HGSS).
 * Add: Rename RageCandyBar to Cake of Rage.
 * Add: Rename Guard Spec. to Guard Stats.
+* Add: Rename Kay to Carrie (from Pokémon Stadium 2).
 
 * Fix: Lt. Surge's electric fence color does not override speech bubbles.
 * Fix: Zap Cannon has 120 power.

diff --git a/TODO.md b/TODO.md
@@ -58,7 +58,6 @@ The final, non-beta 3.0 release should include all of these.
 * Calling Lyra should have more varied messages (see [material/lyra-dialog.txt](material/lyra-dialog.txt))
 * Add a sprite for DJ Mary
 * Name trainers after anime characters (Jackson, Ritchie, Liza, Kidd, Lisa)
-* Rename Kay to Carrie?
 
 Shamouti Island:
 

diff --git a/audio/trainer_encounters.asm b/audio/trainer_encounters.asm
@@ -27,7 +27,7 @@ PlayTrainerEncounterMusic:: ; e900a
 
 TrainerEncounterMusic: ; e9027
 	db MUSIC_HIKER_ENCOUNTER
-	db MUSIC_BEAUTY_ENCOUNTER		; kay
+	db MUSIC_BEAUTY_ENCOUNTER		; carrie
 	db MUSIC_HIKER_ENCOUNTER		; cal
 	db MUSIC_YOUNGSTER_ENCOUNTER	; falkner
 	db MUSIC_YOUNGSTER_ENCOUNTER	; bugsy

diff --git a/constants/event_flags.asm b/constants/event_flags.asm
@@ -1011,7 +1011,7 @@
 	const EVENT_BEAT_SUPER_NERD_MAKO
 ; Lass
 	const EVENT_BEAT_LASS_DANA
-	const EVENT_BEAT_LASS_CARRIE
+	const EVENT_BEAT_LASS_CATHY
 	const EVENT_BEAT_LASS_AMANDA
 	const EVENT_BEAT_LASS_KRISE
 	const EVENT_BEAT_LASS_CONNIE
@@ -2242,7 +2242,7 @@
 	const EVENT_REMATCH_GYM_LEADER_5
 	const EVENT_REMATCH_GYM_LEADER_6
 	const EVENT_TRAINER_HOUSE_CAL
-	const EVENT_TRAINER_HOUSE_KAY
+	const EVENT_TRAINER_HOUSE_CARRIE
 	const EVENT_DO_RUINS_OF_ALPH_CLIMAX
 	const EVENT_RUINS_OF_ALPH_CLIMAX_DONE
 	const EVENT_YELLOW_FOREST_ROCKET_TAKEOVER

diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
@@ -10,7 +10,7 @@ CHRIS EQU __enum__
 	const PHONECONTACT_BUENA
 
 KRIS EQU __enum__
-	trainerclass KAY ; 1
+	trainerclass CARRIE ; 1
 
 	trainerclass CAL ; 2
 
@@ -411,7 +411,7 @@ KRIS EQU __enum__
 	const DANA3
 	const DANA4
 	const DANA5
-	const CARRIE
+	const CATHY
 	const AMANDA
 	const KRISE
 	const CONNIE

diff --git a/contents/bank_ends.txt b/contents/bank_ends.txt
@@ -12,7 +12,7 @@ Bank $0a: $7fdc ($0024)
 Bank $0b: $7fc8 ($0038)
 Bank $0c: $7f80 ($0080)
 Bank $0d: $7f93 ($006d)
-Bank $0e: $7fa7 ($0059)
+Bank $0e: $7fa9 ($0057)
 Bank $0f: $7fa5 ($005b)
 Bank $10: $7fee ($0012)
 Bank $11: $7fc9 ($0037)
@@ -176,7 +176,7 @@ Bank $16 has $0065 bytes of free space
 Bank $4d has $0065 bytes of free space
 Bank $0f has $005b bytes of free space
 Bank $76 has $005a bytes of free space
-Bank $0e has $0059 bytes of free space
+Bank $0e has $0057 bytes of free space
 Bank $08 has $0055 bytes of free space
 Bank $4c has $0055 bytes of free space
 Bank $14 has $0054 bytes of free space
@@ -256,4 +256,4 @@ Bank $05 has $0000 bytes of free space
 Bank $26 has $0000 bytes of free space
 Bank $3d has $0000 bytes of free space
 
-Free space: 115484/2097152 (5.51%)
+Free space: 115482/2097152 (5.51%)
diff --git a/data/battle_tower.asm b/data/battle_tower.asm
@@ -141,7 +141,7 @@ BattleTowerTrainers: ; 1f814e
 	db "Blake@@@@@", YOUNGSTER
 	db "James@@@@@", BOARDER
 	db "Kubrick@@@", HEX_MANIAC
-	db "Carrie@@@@", LASS
+	db "Alisha@@@@", LASS
 	db "Sunni@@@@@", KIMONO_GIRL
 	db "Andre@@@@@", ROUGHNECK
 	db "Hill@@@@@@", COOLTRAINERM

diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
@@ -930,7 +930,7 @@ DrawIntroPlayerPic:
 	ld a, [PlayerGender]
 	bit 0, a
 	jr z, .male
-	ld a, KAY
+	ld a, CARRIE
 	jr .ok
 .male
 	ld a, CAL

diff --git a/engine/radio.asm b/engine/radio.asm
@@ -1195,7 +1195,7 @@ PeoplePlaces4: ; People
 
 .E4Names:          db WILL, KOGA, BRUNO, KAREN, CHAMPION
 .KantoLeaderNames: db BROCK, MISTY, LT_SURGE, ERIKA, JANINE, SABRINA, BLAINE, BLUE
-.MiscNames:        db RIVAL1, LYRA1, PROF_OAK, PROF_ELM, CAL, KAY, RED
+.MiscNames:        db RIVAL1, LYRA1, PROF_OAK, PROF_ELM, CAL, CARRIE, RED
                    db -1
 
 PnP_Text4:

diff --git a/event/battle_tower.asm b/event/battle_tower.asm
@@ -350,7 +350,7 @@ Special_BattleTower_LoadOpponentTrainerAndPokemonsWithOTSprite: ; 0x170b44
 ; 170b90
 
 .Sprites:
-	db SPRITE_KRIS          ; KAY
+	db SPRITE_KRIS          ; CARRIE
 	db SPRITE_CHRIS         ; CAL
 	db SPRITE_FALKNER       ; FALKNER
 	db SPRITE_BUGSY         ; BUGSY

diff --git a/event/battle_tower_text.asm b/event/battle_tower_text.asm
@@ -88,7 +88,7 @@ endr
 
 
 BTTrainerClassGenders: ; 11f2f0
-	db FEMALE ; KAY
+	db FEMALE ; CARRIE
 	db MALE   ; CAL
 	db MALE   ; FALKNER
 	db FEMALE ; BUGSY

diff --git a/gfx/pics.asm b/gfx/pics.asm
@@ -791,7 +791,7 @@ MewtwoArmoredBackpic:     INCBIN "gfx/pics/mewtwo_armored/back.2bpp.lz"
 
 SECTION "Trainer Pics 1", ROMX
 
-KayPic:                   INCBIN "gfx/trainers/kay.2bpp.lz"
+CarriePic:                INCBIN "gfx/trainers/carrie.2bpp.lz"
 CalPic:                   INCBIN "gfx/trainers/cal.2bpp.lz"
 FalknerPic:               INCBIN "gfx/trainers/falkner.2bpp.lz"
 BugsyPic:                 INCBIN "gfx/trainers/bugsy.2bpp.lz"

diff --git a/gfx/pics/trainer_pic_pointers.asm b/gfx/pics/trainer_pic_pointers.asm
@@ -1,5 +1,5 @@
 
-	dba KayPic
+	dba CarriePic
 	dba CalPic
 	dba FalknerPic
 	dba BugsyPic

diff --git a/gfx/trainers/kay.2bpp.lz → gfx/trainers/carrie.2bpp.lz b/gfx/trainers/kay.2bpp.lz → gfx/trainers/carrie.2bpp.lz
diff --git a/gfx/trainers/kay.pal → gfx/trainers/carrie.pal b/gfx/trainers/kay.pal → gfx/trainers/carrie.pal
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainers/palette_pointers.asm
@@ -4,7 +4,7 @@ TrainerPalettes: ; b0ce
 if !DEF(MONOCHROME)
 PlayerPalette:           INCLUDE "gfx/trainers/cal.pal"
 KrisPalette:
-KayPalette:              INCLUDE "gfx/trainers/kay.pal"
+CarriePalette:           INCLUDE "gfx/trainers/carrie.pal"
 CalPalette:              INCLUDE "gfx/trainers/cal.pal"
 FalknerPalette:          INCLUDE "gfx/trainers/falkner.pal"
 BugsyPalette:            INCLUDE "gfx/trainers/bugsy.pal"

diff --git a/main.asm b/main.asm
@@ -5174,7 +5174,7 @@ endr
 	dw Giovanni2FinalPkmnText
 
 .SinglePhraseFinalTexts:
-	dw KayFinalPkmnText
+	dw CarrieFinalPkmnText
 	dw CalFinalPkmnText
 	dw FalknerFinalPkmnText
 	dw BugsyFinalPkmnText

diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
@@ -20,7 +20,7 @@ GoldenrodGym_MapEventHeader:
 .PersonEvents: db 7
 	person_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerSrandjrJoandcath1, -1
 	person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1
-	person_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerLassCarrie, -1
+	person_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerLassCathy, -1
 	person_event SPRITE_LASS, 7, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerSrandjrJoandcath2, -1
 	person_event SPRITE_BEAUTY, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyVictoria, -1
 	person_event SPRITE_BEAUTY, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerBeautySamantha, -1
@@ -43,7 +43,7 @@ WhitneyScript_0x5400c:
 	dotrigger $1
 	setevent EVENT_BEAT_BEAUTY_VICTORIA
 	setevent EVENT_BEAT_BEAUTY_SAMANTHA
-	setevent EVENT_BEAT_LASS_CARRIE
+	setevent EVENT_BEAT_LASS_CATHY
 	setevent EVENT_BEAT_SR_AND_JR_JO_AND_CATH
 .FightDone:
 	opentext
@@ -73,12 +73,12 @@ UnknownScript_0x54064:
 UnknownScript_0x54077:
 	jumpopenedtext UnknownText_0x54360
 
-TrainerLassCarrie:
-	trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript
+TrainerLassCathy:
+	trainer EVENT_BEAT_LASS_CATHY, LASS, CATHY, LassCathySeenText, LassCathyBeatenText, 0, LassCathyScript
 
-LassCarrieScript:
+LassCathyScript:
 	end_if_just_battled
-	jumptextfaceplayer LassCarrieOWText
+	jumptextfaceplayer LassCathyOWText
 
 WhitneyCriesScript:
 	showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15
@@ -231,20 +231,20 @@ UnknownText_0x54360:
 	line "again! Bye-bye!"
 	done
 
-LassCarrieSeenText:
+LassCathySeenText:
 	text "Don't let my"
 	line "#mon's cute"
 
 	para "looks fool you."
 	line "They can whip you!"
 	done
 
-LassCarrieBeatenText:
+LassCathyBeatenText:
 	text "Darn… I thought"
 	line "you were weak…"
 	done
 
-LassCarrieOWText:
+LassCathyOWText:
 	text "Do my #mon"
 	line "think I'm cute?"
 	done

diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
@@ -16,12 +16,12 @@ TrainerHouseB1F_MapEventHeader:
 
 .PersonEvents: db 3
 	person_event SPRITE_CHRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TRAINER_HOUSE_CAL
-	person_event SPRITE_KRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TRAINER_HOUSE_KAY
+	person_event SPRITE_KRIS, 11, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, ObjectEvent, EVENT_TRAINER_HOUSE_CARRIE
 	person_event SPRITE_RECEPTIONIST, 1, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, ObjectEvent, -1
 
 const_value set 2
 	const TRAINERHOUSEB1F_CAL
-	const TRAINERHOUSEB1F_KAY
+	const TRAINERHOUSEB1F_CARRIE
 
 TrainerHouseReceptionistScript:
 	spriteface PLAYER, UP
@@ -33,11 +33,11 @@ TrainerHouseReceptionistScript:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .GetCalName
 	disappear TRAINERHOUSEB1F_CAL
-	appear TRAINERHOUSEB1F_KAY
-	trainertotext KAY, 1, $0
+	appear TRAINERHOUSEB1F_CARRIE
+	trainertotext CARRIE, 1, $0
 	jump .GotName
 .GetCalName
-	disappear TRAINERHOUSEB1F_KAY
+	disappear TRAINERHOUSEB1F_CARRIE
 	appear TRAINERHOUSEB1F_CAL
 	trainertotext CAL, 1, $0
 .GotName:
@@ -55,8 +55,8 @@ TrainerHouseReceptionistScript:
 	winlosstext TrainerHouseB1FCalBeatenText, 0
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .LoadTrainerCal
-	setlasttalked TRAINERHOUSEB1F_KAY
-	loadtrainer KAY, 1
+	setlasttalked TRAINERHOUSEB1F_CARRIE
+	loadtrainer CARRIE, 1
 	jump .StartBattle
 .LoadTrainerCal
 	setlasttalked TRAINERHOUSEB1F_CAL

diff --git a/material/shamouti.txt b/material/shamouti.txt
@@ -1,6 +1,5 @@
 ....... Marguerite
 ............ Semra
-........... Alisha
 ............Louise
 ............ Carla
 .......... Celeste

diff --git a/roms.md5 b/roms.md5
@@ -1 +1 @@
-6cb0ee472e536f3426d8005aeb068974 *polishedcrystal-3.0.0-beta.gbc
+a610a14ccf3576c0a3dfaddcc96c1535 *polishedcrystal-3.0.0-beta.gbc
diff --git a/text/battle.asm b/text/battle.asm
@@ -1523,7 +1523,7 @@ GetOutText:
 	line "Get out…"
 	prompt
 
-KayFinalPkmnText:
+CarrieFinalPkmnText:
 CalFinalPkmnText:
 	text "I still have one"
 	line "#mon!"

diff --git a/text/trainer_class_names.asm b/text/trainer_class_names.asm
@@ -1,4 +1,4 @@
-	db "<PK><MN> Trainer@" ; KAY
+	db "<PK><MN> Trainer@" ; CARRIE
 	db "<PK><MN> Trainer@" ; CAL
 	db "Leader@"           ; FALKNER
 	db "Leader@"           ; BUGSY

diff --git a/trainers/attributes.asm b/trainers/attributes.asm
@@ -1,6 +1,6 @@
 TrainerClassAttributes: ; 3959c
 
-; Kay
+; Carrie
 	db MAX_POTION, 0 ; items
 	db 25 ; base reward
 	dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY

diff --git a/trainers/dvs.asm b/trainers/dvs.asm
@@ -30,7 +30,7 @@ endr
 TrainerClassDVsAndPersonality: ; 270d6
 	;  EVs  HP   Def  SAt  Ability  Gender
 	;  *    Atk  Spd  SDf  Nature   Form
-	db 252, PERFECT_DVS,   ABILITY_1 | QUIRKY, FEMALE ; kay
+	db 252, PERFECT_DVS,   ABILITY_1 | QUIRKY, FEMALE ; carrie
 	db 252, PERFECT_DVS,   ABILITY_1 | QUIRKY, MALE   ; cal
 	db 252, $CC, $CC, $CC, ABILITY_1 | QUIRKY, MALE   ; falkner
 	db 252, $CC, $CC, $CC, ABILITY_1 | QUIRKY, MALE   ; bugsy

diff --git a/trainers/trainer_pointers.asm b/trainers/trainer_pointers.asm
@@ -1,7 +1,7 @@
 ; Each trainer class has its own group. See trainers.asm.
 
 TrainerGroups: ; 0x39999
-	dba KayGroup
+	dba CarrieGroup
 	dba CalGroup
 	dba FalknerGroup
 	dba BugsyGroup

diff --git a/trainers/trainers.asm b/trainers/trainers.asm
@@ -25,12 +25,12 @@
 SECTION "Enemy Trainer Parties 1", ROMX
 
 
-KayGroup:
+CarrieGroup:
 ; ================================
 ; ================
 
-	; KAY
-	db "Kay@"
+	; CARRIE
+	db "Carrie@"
 	db TRAINERTYPE_ITEM | TRAINERTYPE_MOVES
 
 	; party
@@ -7670,7 +7670,7 @@ endc
 ; ================
 
 	; LASS
-	db "Carrie@"
+	db "Cathy@"
 	db TRAINERTYPE_MOVES
 
 	; party
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6cb0ee472e536f3426d8005aeb068974 *polishedcrystal-3.0.0-beta.gbc
		a610a14ccf3576c0a3dfaddcc96c1535 *polishedcrystal-3.0.0-beta.gbc