GAY GYM

- Added the unused rainbow palette for Celadon Gym.

- Fixed Faraway Island using Vermilion's palette.

- Rocket Hideout now uses the same palette as the Game Corner

- Minor text fixes

data/maps/objects/CeladonCity.asm

@@ -28,7 +28,7 @@ CeladonCity_Object:
 	bg_event 27, 21, 18 ; CeladonCityText18
 
 	def_object_events
-	object_event  8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
+	object_event  8, 16, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person
 	object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person
 	object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person
 	object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person

data/sgb/sgb_packets.asm

@@ -214,6 +214,14 @@ BlkPacket_GameFreakIntro:
 	db $03, 12,11, 14,13, $03
 	db $00
 
+BlkPacket_Gay:
+	ATTR_BLK 4
+	ATTR_BLK_DATA %011, 0,0,0, 00,00, 04,17 ; left: pal 1
+	ATTR_BLK_DATA %011, 1,1,0, 05,00, 09,17 ; center left: pal 2
+	ATTR_BLK_DATA %011, 2,2,0, 10,00, 14,17 ; center right: pal 3
+	ATTR_BLK_DATA %011, 3,3,0, 15,00, 19,17 ; right: pal 4
+	ds 2, 0
+
 
 PalPacket_Empty:          PAL_SET 0, 0, 0, 0
 PalPacket_PartyMenu:      PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR
@@ -226,6 +234,7 @@ PalPacket_TrainerCard:    PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWM
 PalPacket_Generic:        PAL_SET PAL_MEWMON, 0, 0, 0
 PalPacket_NidorinoIntro:  PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0
 PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON
+PalPacket_Gay:            PAL_SET PAL_YELLOWMON, PAL_REDMON, PAL_GREENMON, PAL_BLUEMON
 
 PalTrnPacket:  PAL_TRN
 MltReq1Packet: MLT_REQ 1

data/trainers/scaled_parties.asm

@@ -107,17 +107,17 @@ LanceData:
 	db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, IGUANARCH, 77, DRAGONITE, 0
 
 YujirouData: ; was unused juggler
-	db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0                                             ; 0
-	db $FF, 11, COINPUR, 12, RATTATA, 14, LICKITUNG, 0                                          ; 1
+	db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0                                           ; 0
+	db $FF, 11, COINPUR, 12, RATTATA, 14, LICKITUNG, 0                                        ; 1
 	db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0                         ; 2
-	db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 25, LICKITUNG, 0         ; 3
-	db $FF, 29, PERSIAN, 28, RATICATE, 28, LUXWAN, 29, JIGGLYPUFF, 31, LICKITUNG, 0           ; 4
-	db $FF, 38, PERSIAN, 37, RATICATE, 37, LUXWAN, 38, CHANSEY, 40, LICKITUNG, 0,             ; 5
-	db $FF, 41, PERSIAN, 40, TAUROS, 40, LUXWAN, 41, CHANSEY, 43, LICKILICKY, 0               ; 6
-	db $FF, 45, PERSIAN, 44, TAUROS, 44, LUXWAN, 45, CHANSEY, 47, LICKILICKY, 0               ; 7
-	db $FF, 47, PERSIAN, 46, TAUROS, 46, LUXWAN, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0  ; 8
+	db $FF, 22, MEOWTH, 21, RATICATE, 21, JIGGLYPUFF, 23, FARFETCHD, 25, LICKITUNG, 0         ; 3
+	db $FF, 29, PERSIAN, 28, RATICATE, 28, JIGGLYPUFF, 29, LUXWAN, 31, LICKITUNG, 0           ; 4
+	db $FF, 38, PERSIAN, 37, RATICATE, 37, CHANSEY, 38, LUXWAN, 40, LICKILICKY, 0,            ; 5
+	db $FF, 41, PERSIAN, 40, TAUROS, 40, CHANSEY, 41, LUXWAN, 43, LICKILICKY, 0               ; 6
+	db $FF, 45, PERSIAN, 44, TAUROS, 44, CHANSEY, 45, LUXWAN, 47, LICKILICKY, 0               ; 7
+	db $FF, 47, PERSIAN, 46, TAUROS, 46, BLISSEY, 48, LUXWAN, 48, SNORLAX, 50, LICKILICKY, 0  ; 8
 ; post-game rematch team
-	db $FF, 66, PERSIAN, 65, TAUROS, 66, LUXWAN, 65, BLISSEY, 66, SNORLAX, 69, LICKILICKY, 0
+	db $FF, 66, PERSIAN, 65, TAUROS, 66, BLISSEY, 65, LUXWAN, 66, SNORLAX, 69, LICKILICKY, 0
 
 BlackbeltData:
 ; Koichi parties

engine/gfx/palettes.asm

@@ -134,6 +134,7 @@ SetPal_GameFreakIntro:
 	ret
 
 ; uses PalPacket_Empty to build a packet based on the current map
+; are the edits I've made here horribly inefficient? yes, but as long as it works, who cares?
 SetPal_Overworld:
 	ld hl, PalPacket_Empty
 	ld de, wPalPacket
@@ -141,44 +142,72 @@ SetPal_Overworld:
 	call CopyData
 	ld a, [wCurMapTileset]
 	cp CEMETERY
-	jr z, .PokemonTowerOrAgatha
+	jp z, .PokemonTowerOrAgatha
 	cp CAVERN
-	jr z, .caveOrBruno
+	jp z, .caveOrBruno
 	ld a, [wCurMap]
 	cp BRUNSWICK_TRAIL
-	jr z, .brunswick
+	jp z, .brunswick
 	cp FIRST_INDOOR_MAP
-	jr c, .townOrRoute
+	jp c, .townOrRoute
+	cp CELADON_GYM
+	jp z, .gay
 	cp POWER_PLANT
-	jr z, .powerPlant
+	jp z, .powerPlant
 	cp BRUNSWICK_GLADE
-	jr z, .brunswick
+	jp z, .brunswick
 	cp BRUNSWICK_GROTTO
-	jr z, .brunswick
+	jp z, .brunswick
 	cp SILPH_GAUNTLET_3F
-	jr z, .ship
+	jp z, .ship
 	cp GAME_CORNER
-	jr z, .pachinko
+	jp z, .pachinko
 	cp GAME_CORNER_PRIZE_ROOM
-	jr z, .pachinko
+	jp z, .pachinko
+	cp ROCKET_HIDEOUT_B1F
+	jp z, .pachinko
+	cp ROCKET_HIDEOUT_B2F
+	jp z, .pachinko
+	cp ROCKET_HIDEOUT_B3F
+	jp z, .pachinko
+	cp ROCKET_HIDEOUT_B4F
+	jp z, .pachinko
+	cp ROCKET_HIDEOUT_ELEVATOR
+	jp z, .pachinko
+	cp FARAWAY_ISLAND_OUTSIDE
+	jp z, .faraway
+	cp FARAWAY_ISLAND_INSIDE
+	jp z, .faraway
+	cp SILPH_GAUNTLET_1F
+	jp z, .faraway
 	cp CELESTE_HILL_OUTSIDE
-	jr z, .celeste
+	jp z, .celeste
 	cp CELESTE_HILL
-	jr z, .celeste
+	jp z, .celeste
 	cp SILPH_GAUNTLET_5F
-	jr z, .trans
+	jp z, .trans
 	cp CERULEAN_CAVE_2F
-	jr c, .normalDungeonOrBuilding
+	jp c, .normalDungeonOrBuilding
 	cp LORELEIS_ROOM
-	jr z, .seafoam
+	jp z, .seafoam
 	cp BRUNOS_ROOM
-	jr z, .caveOrBruno
+	jp z, .caveOrBruno
 .normalDungeonOrBuilding
 	ld a, [wLastMap] ; town or route that current dungeon or building is located
 .townOrRoute
 	cp NUM_CITY_MAPS
-	jr c, .town
+	jp c, .town
 	ld a, PAL_ROUTE - 1
+.gay
+	ld hl, PalPacket_Gay
+	ld de, wPalPacket
+	ld bc, $10
+	call CopyData
+	ld hl, PalPacket_Gay
+	ld de, BlkPacket_Gay
+	ld a, SET_PAL_OVERWORLD
+	ld [wDefaultPaletteCommand], a
+	ret
 .town
 	inc a ; a town's palette ID is its map ID + 1
 	ld hl, wPalPacket + 1
@@ -245,30 +274,9 @@ SetPal_Overworld:
 .trans
 	ld a, PAL_FUCHSIA - 1
 	jr .town
-
-; these can't be added without a more efficient solution
-;	cp ROCKET_HIDEOUT_B1F
-;	jr z, .pachinko
-;	cp ROCKET_HIDEOUT_B2F
-;	jr z, .pachinko
-;	cp ROCKET_HIDEOUT_B3F
-;	jr z, .pachinko
-;	cp ROCKET_HIDEOUT_B4F
-;	jr z, .pachinko
-;	cp ROCKET_HIDEOUT_ELEVATOR
-;	jr z, .pachinko
-;	cp FARAWAY_ISLAND_OUTSIDE
-;	jr z, .faraway
-;	cp FARAWAY_ISLAND_INSIDE
-;	jr z, .faraway
-;	cp SILPH_GAUNTLET_1F
-;	jr z, .faraway
-;.pachinko
-;	ld a, PAL_CASINO - 1
-;	jr .town
-;.faraway
-;	ld a, PAL_ROUTE - 1
-;	jr .town
+.faraway
+	ld a, PAL_ROUTE - 1
+	jr .town
 
 ; used when a Pokemon is the only thing on the screen
 ; such as evolution, trading and the Hall of Fame

maps/CeladonCity.blk

@@ -3,7 +3,7 @@ U
 lllllllllllloooooooooUo
 ooo
 oooooo
-n ! 
!U 
!UUUUUUUUUmnhi 

!hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0	VwwwwUwwwwUUUUUUUUUNTM 
! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !

 ! !UU ! ! ! ! !
+n ! 
!U 
!UUUUUUUUUmnhi 

!hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0	VwwwwUwwwwUUUUUUUUUNTM 
! !U ! !nwUUUUUUUgj7:~|~U7~7~nUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !

 ! !UU ! ! ! ! !
 n7~7~7~UU7~|~|~7~|~
 nUUUUUyUU !UUUUUUUUUUUU
 n/7~UUUUUUUUUUUU
@@ -17,5 +17,5 @@ n
 
 
 
-llllllm6llll
-nooooooooooooooooo6ooooo
+llllllmllll
+noooooooooooooooooooooo

text/RocketHideoutB4F.asm

@@ -3,15 +3,14 @@ _RocketHideout4Text_4557a::
 	line "am impressed you"
 	cont "got here!"
 	
-	para "TEAM ROCKET"
-	line "captures #MON"
-	cont "from around the"
-	cont "world."
+	para "We, TEAM ROCKET,"
+	line "capture #MON"
+	cont "from all around"
+	cont "the world."
 	
 	para "They're important"
 	line "tools for keeping"
-	cont "our criminal"
-	cont "enterprise"
+	cont "our enterprise"
 	cont "running."
 	
 	para "And I am the"
@@ -38,7 +37,7 @@ _RocketHideout4Text_4557a::
 	done
 
 _RocketHideout4Text_4557f::
-	text "WHAT!"
+	text "What?!"
 	line "This cannot be!"
 	prompt
 

text/Route14.asm

@@ -68,8 +68,8 @@ _Route14AfterBattleText4::
 	done
 
 _Route14BattleText5::
-	text "Have you heard of"
-	line "the winged"
+	text "Have you heard"
+	line "of the winged"
 	cont "mirages?"
 	done
 
@@ -79,16 +79,14 @@ _Route14EndBattleText5::
 	prompt
 
 _Route14AfterBattleText5::
-	text "The winged" ; jp / remake restoration
+	text "The three winged" ; jp / remake restoration
 	line "mirages are the"
+	cont "legendary bird"
+	cont "#MON."
 	
-	para "legendary bird"
-	line "#MON."
-	
-	para "There are 3 of"
-	line "them: ZAPDOS,"
-	cont "ARTICUNO, and"
-	cont "MOLTRES."
+	para "Their names are"
+	line "ARTICUNO, ZAPDOS,"
+	cont "and MOLTRES."
 	
 	done
 

text/ViridianCity.asm

@@ -24,7 +24,7 @@ _ViridianCityText_19127::
 
 _ViridianCityText_1914d::
 	text "You want to know"
-	line "about the 2 kinds"
+	line "about the 3 kinds"
 	cont "of caterpillar"
 	cont "#MON?"
 	done
@@ -34,19 +34,22 @@ _ViridianCityText_19152::
 	done
 
 _ViridianCityText_19157::
-	text "CATERPIE has no"
-	line "poison, but"
+	text "Both CATERPIE and"
+	line "GENTLARVA have"
+	cont "no poison, but"
 	cont "WEEDLE does."
 
 	para "Watch out for its"
 	line "POISON STING!"
 	done
 
-_ViridianCityText_19175::
+_ViridianCityText_19175::	; undoing localisation change
 	text "Oh Grandpa! Don't"
 	line "be so mean!"
-	cont "He hasn't had his"
-	cont "coffee yet."
+
+	para "I'm sorry, but"
+	cont "he hasn't sobered"
+	cont "up yet..."
 	done
 
 _ViridianCityText_1917a::
@@ -98,13 +101,13 @@ _TM42NoRoomText::
 	line "stuff already."
 	done
 
-_ViridianCityText_1920a::
-	text "Ahh, I've had my"
-	line "coffee now and I"
-	cont "feel great!"
+_ViridianCityText_1920a::	; undoing localisation change
+	text "Hmm..."
+	line "Looks like I was"
+	cont "pretty drunk!"
 
-	para "Sure you can go"
-	line "through!"
+	para "My head hurts,"
+	line "though..."
 
 	para "Are you in a"
 	line "hurry?"
@@ -115,8 +118,8 @@ _ViridianCityText_1920f::
 	line "a #DEX."
 
 	para "When you catch a"
-	line "#MON, #DEX"
-	cont "is automatically"
+	line "#MON, it will"
+	cont "be automatically"
 	cont "updated."
 
 	para "What? Don't you"