A few tiny changes

- Gave Lorelei's room the cyan palette

- rearranged gym leader parties a little

- slightly better Tsubomitto sprite

README.md

@@ -35,6 +35,7 @@ Changes at a glance:
 	- Scream Tail remains Fairy/Psychic.
 - Fire remains neutral against Ice.
 - Bug and Poison remain super effective against each other.
+- Psychic remains immune to Ghost.
 
 Type Matchups for Steel and Dark for reference:
 - Steel...
@@ -216,7 +217,6 @@ New Pokemon:
 - Magmar -> Magmortar | Use Fire Stone
 - Electabuzz -> Electivire | Use Thunder Stone
 - Magneton -> Magnezone | Use Thunder Stone
-- Farfetch'd -> Sirfetch'd | Use Heart Stone
 - Poliwhirl -> Politoed | Use Heart Stone
 - Ditto -> Animon | Use Metal Coat
 - Seadra -> Kingdra | Trade
@@ -292,6 +292,7 @@ Much like in Let's Go Pikachu and Let's Go Eevee, traders are available who will
 - Fuchsia City: Marowak
 - Cinnabar Island: Muk
 - Indigo Plateau: Exeggutor
+
 Version exclusivity was factored in, instead moving Raticate and Golem to the cities without a trader, which were strangely appropriate thematically.
 
 Galarian and Paldean formes are accessed on the S.S. Anne, which now returns after receiving the Marsh Badge. Hisuian formes are found in the wild in Bill's Garden, which is accessible in the post-game. The idea is a prototype version of his Time Capsule yanks them in or something.

constants/move_constants.asm

@@ -183,14 +183,14 @@
 	const CHARM 	 ; af
 	const SWEET_KISS   ; b0
 	const BULLET_PUNCH ; b1
-	const MIRROR_SHOT  ; B2
+	const MIRROR_SHOT  ; b2
-	const SMART_STRIKE ; B3
+	const SMART_STRIKE ; b3
-	const FAKE_TEARS   ; B4
+	const FAKE_TEARS   ; b4
-	const FALSE_SURRENDER ; B5
+	const FALSE_SURRENDER ; b5
-	const KOWTOW_CLEAVE ; B6
+	const KOWTOW_CLEAVE ; b6
-	const DISARMING_VOICE ; B7
+	const DISARMING_VOICE ; b7
-	const NASTY_PLOT ; B8
+	const NASTY_PLOT   ; b8
-	const STRUGGLE     ; formerly a5, now B9
+	const STRUGGLE     ; formerly a5, now b9
 DEF NUM_ATTACKS EQU const_value - 1
 
 	; Moves do double duty as animation identifiers.

data/maps/songs.asm

@@ -244,12 +244,12 @@ MapSongBanks::
 	db MUSIC_CELADON, 0 ; COLOSSEUM
 	db MUSIC_OAKS_LAB, 0 ; UNUSED_MAP_F1 / Celadon University Outside
 	db MUSIC_POKECENTER, 0 ; UNUSED_MAP_F2 / Celadon University Pokecenter
-	db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F3
+	db MUSIC_ROUTES2, 0 ; UNUSED_MAP_F3 / Bill's Garden
 	db MUSIC_GYM, 0 ; LORELEIS_ROOM
 	db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
 	db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
 	db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
-	db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
+	db MUSIC_DUNGEON1, 0 ; GIOVANNIS_ROOM
 	db MUSIC_GYM, 0 ; BATTLE_TENT
 	db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
 	assert_table_length NUM_MAPS

data/trainers/scaled_parties.asm

@@ -19,21 +19,21 @@ MistyData:
 	db $FF, 41, SEADRA, 40, JABETTA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0                    ; 5
 	db $FF, 45, KINGDRA, 44, JABETTA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0                   ; 6
 	db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, JAGG, 50, STARMIE, 0         ; 7 (unused)
-	db $FF, 66, STARMIE, 67, VAPOREON, 67, TAUROS_PA, 66, TOTARTLE, 67, GOLDUCK, 70, GYARADOS, 0 ; 8 (postgame)
+	db $FF, 66, STARMIE, 67, GOLDUCK, 67, TAUROS_PA, 66, TOTARTLE, 67, VAPOREON, 70, GYARADOS, 0 ; 8 (postgame)
 
 LtSurgeData:
-	db $FF, 10, VOLTORB, 11, PIKACHU, 13, MAGNETITE, 0                                              ; 0 badges
+	db $FF, 10, VOLTORB, 11, PIKACHU, 13, GAOTORA, 0                                                ; 0 badges
-	db $FF, 19, VOLTORB, 18, PIKACHU, 19, MAGNETITE, 21, ELECTABUZZ, 0                              ; 1
+	db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0                                ; 1
 	db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0                  ; 2
 	db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, GOROCHU, 0               ; 3
 	db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0               ; 4
 	db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0               ; 5
 	db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0              ; 6
 	db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused)
-	db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, GOLEM_A, 67, GOROCHU, 70, ZAPDOS, 0      ; 8 (postgame)
+	db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, GOLEM_A, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0      ; 8 (postgame)
 
 ErikaData:
-	db $FF, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0                                                     ; 0 badges
+	db $FF, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0                                                     ; 0 badges (unused)
 	db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, MONJA, 21, GLOOM, 0                                      ; 1
 	db $FF, 22, BELLSPROUT, 21, PARAS, 21, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0                         ; 2
 	db $FF, 29, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0                  ; 3
@@ -44,29 +44,29 @@ ErikaData:
 	db $FF, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, ELECTRODE_H, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0 ; 8 (postgame)
 
 KogaData:
-	db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0                                        ; 0 badges
+	db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0                                        ; 0 badges (unused)
 	db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0                            ; 1
 	db $FF, 22, VENONAT, 21, NIDORINO, 21, GRIMER, 23, KOFFING, 25, GOLBAT, 0                ; 2
 	db $FF, 29, VENOMOTH, 28, NIDORINO, 28, GRIMER, 29, KOFFING, 31, GOLBAT, 0               ; 3
 	db $FF, 38, TENTACRUEL, 37, VENOMOTH, 37, MUK, 38, WEEZING, 40, CROBAT, 0                ; 4
 	db $FF, 41, TENTACRUEL, 40, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0                ; 5
 	db $FF, 45, TENTACRUEL, 44, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0                ; 6
-	db $FF, 47, TENTACRUEL, 46, NIDOKING, 46, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0  ; 7
+	db $FF, 47, TENTACRUEL, 46, NIDOKING, 46, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0  ; 7 (unused)
 	db $FF, 66, TSUBOMITTO, 67, NIDOKING, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
 
 BlaineData:
-	db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0                                                 ; 0 badges (unused?)
+	db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0                                                 ; 0 badges (unused)
-	db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0                                     ; 1
+	db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0                                     ; 1 (unused)
 	db $FF, 22, PONYTA, 21, VULPIX, 21, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0                     ; 2
 	db $FF, 29, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, CHARMELEON, 31, MAGMAR, 0                     ; 3
 	db $FF, 38, PONYTA, 37, NINETALES, 37, FLAREON, 38, ARCANINE, 40, MAGMORTAR, 0                   ; 4
 	db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0                 ; 5
 	db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0                 ; 6
 	db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0  ; 7 (unused)
-	db $FF, 66, NINETALES, 67, TAUROS_PB, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame)
+	db $FF, 66, ARCANINE, 67, TAUROS_PB, 67, FLAREON, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0   ; 8 (postgame)
 
 SabrinaData:
-	db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0                                            ; 0 badges
+	db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0                                            ; 0 badges (unused)
 	db $FF, 19, DROWZEE, 18, SLOWPOKE, 19, KADABRA, 21, MR_MIME, 0                               ; 1
 	db $FF, 22, DROWZEE, 21, SLOWPOKE, 21, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0                ; 2
 	db $FF, 29, MR_MIME, 28, SLOWPOKE, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0                 ; 3
@@ -85,9 +85,9 @@ GiovanniData: ; is not scaled as he is always fought last
 	db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0
 
 LoreleiData:
-	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, NINETALES_A, 55, BUU, 56, LAPRAS, 0
+	db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, NINETALES_A, 55, JYNX, 56, LAPRAS, 0
 ; post-game rematch team (currently unused)
-	db $FF, 74, DEWGONG, 73, CLOYSTER, 74, NINETALES_A, 75, GLACEON, 75, LAPRAS, 76, ARTICUNO, 0
+	db $FF, 74, JYNX, 73, CLOYSTER, 74, NINETALES_A, 75, GLACEON, 75, LAPRAS, 76, ARTICUNO, 0
 
 BrunoData:
 	db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, SIRFETCHD, 56, PURAKKUSU, 58, MACHAMP, 0
@@ -95,9 +95,9 @@ BrunoData:
 	db $FF, 74, POLIWRATH, 75, STEELIX, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, ZAPDOS_G, 0
 
 AgathaData:
-	db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, ANNIHILAPE, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0
+	db $FF, 57, CROAKOZUNA, 56, ANNIHILAPE, 56, CROBAT, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0
 ; post-game rematch team (currently unused)
-	db $FF, 77, ANNIHILAPE, 76, UMBREON, 76, MAROWAK_A, 78, CROBAT, 78, GENGAR, 80, MOLTRES_G, 0
+	db $FF, 77, ANNIHILAPE, 76, CROBAT, 76, MAROWAK_A, 78, UMBREON, 78, GENGAR, 80, MOLTRES_G, 0
 
 LanceData:
 	db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, EXEGGUTOR_A, 59, CRYITHAN, 62, DRAGONITE, 0

engine/gfx/palettes.asm

@@ -159,6 +159,8 @@ SetPal_Overworld:
 	jr z, .celeste
 	cp CERULEAN_CAVE_2F
 	jr c, .normalDungeonOrBuilding
+	cp LORELEIS_ROOM
+	jr z, .seafoam
 	cp BRUNOS_ROOM
 	jr z, .caveOrBruno
 .normalDungeonOrBuilding
@@ -215,8 +217,6 @@ SetPal_Overworld:
 	jr c, .faraway
 	cp SAFARI_ZONE_CENTER + 1
 	jr c, .forestDefault
-	cp BILLS_GARDEN
-	jr z, .faraway
 .forestDefault
 	ld a, PAL_FUCHSIA - 1
 	jr .town