From 1e9b06773fb3f2de32909528347a87c37e11782b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Dec 2023 14:59:02 +0000 Subject: [PATCH] Changing a default player name for Green I know that some people are gonna ask if 'Seren' is a misspelling of 'Serena', so I'm changing it so we won't get questions like that. It's now Elaine, which is the name of the LGPE protag so...kinda works Also changed an inconsistency in Erika's 6 badges party where her Cactormus was a higher level than it should've been --- data/player_names.asm | 2 +- data/player_names_list.asm | 2 +- data/trainers/scaled_parties.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/player_names.asm b/data/player_names.asm index 3c65c57b..6aec50fb 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -9,7 +9,7 @@ DefaultNamesGirl: db "NEW NAME" next "GREEN" next "LEAF" - next "SEREN" + next "ELAINE" db "@" DefaultNamesRival: diff --git a/data/player_names_list.asm b/data/player_names_list.asm index a0ac7579..f5c06f6a 100644 --- a/data/player_names_list.asm +++ b/data/player_names_list.asm @@ -8,7 +8,7 @@ DefaultNamesGirlList: db "NEW NAME@" db "GREEN@" db "LEAF@" - db "SEREN@" + db "ELAINE@" DefaultNamesRivalList: db "NEW NAME@" diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index f32e42ee..11a527db 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -41,7 +41,7 @@ ErikaData: db $FF, 29, WEEPINBELL, 28, PARASECT, 28, CACTORMUS, 29, TANGELA, 31, BELLOSSOM, 0 ; 3 db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTORMUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4 db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5 - db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6 + db $FF, 45, VICTREEBEL, 44, PARASECT, 44, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6 db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTORMUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused) db $FF, 62, BELLOSSOM, 62, TOEDSCRUEL, 61, ELECTRODE_H, 61, LEAFEON, 62, VENUSAUR, 65, TANGROWTH, 0 ; 8 (postgame)