A few small improvements

- All of the Silph Gauntlet maps use the same palettes as the map's they're based on
- Viridian Forest uses Viridian's palette, it just makes sense
- Power Plant is now yellow, just 'cause.
- Game Corner payouts are much faster, and have been slightly rebalanced

data/maps/objects/FuchsiaCity.asm

@@ -13,14 +13,14 @@ FuchsiaCity_Object:
 	;warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1
 
 	def_bg_events
-	bg_event 15, 23, 11 ; FuchsiaCityText11
+	bg_event 29, 19, 11 ; FuchsiaCityText11
 	bg_event 25, 15, 12 ; FuchsiaCityText12
 	bg_event 17,  5, 13 ; FuchsiaCityText13
 	bg_event  6, 13, 14 ; MartSignText
 	bg_event 20, 27, 15 ; PokeCenterSignText
 	bg_event 27, 29, 16 ; FuchsiaCityText16
 	bg_event 21, 15, 17 ; FuchsiaCityText17
-	bg_event  5, 29, 18 ; FuchsiaCityText18
+	bg_event  3, 29, 18 ; FuchsiaCityText18
 	bg_event 33,  7, 19 ; FuchsiaCityText19
 	bg_event 27,  7, 20 ; FuchsiaCityText20
 	bg_event 13,  7, 21 ; FuchsiaCityText21

data/maps/songs.asm

@@ -113,7 +113,7 @@ MapSongBanks::
 	db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F
 	db MUSIC_POKEMON_TOWER, 0 ; UNUSED_MAP_6D / Gauntlet 4F
 	db MUSIC_SAFARI_ZONE, 0 ; UNUSED_MAP_6E	/ Gauntlet 5F
-	db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_6F	/ Gauntlet 6F
+	db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_6F / Gauntlet 6F
 	db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_70 / Gauntlet 7F
 	db MUSIC_INDIGO_PLATEAU, 0 ; LANCES_ROOM
 	db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE

engine/gfx/palettes.asm

@@ -148,13 +148,17 @@ SetPal_Overworld:
 	jr z, .celeste
 	cp CITRINE
 	jr z, .citrine
+	cp FOREST
+	jr z, .forest
+	cp SHIP
+	jr z, .ship
 	ld a, [wCurMap]
 	cp FIRST_INDOOR_MAP
 	jr c, .townOrRoute
+	cp POWER_PLANT
+	jr z, .powerPlant
 	cp CERULEAN_CAVE_2F
 	jr c, .normalDungeonOrBuilding
-	cp LORELEIS_ROOM
-	jr z, .Lorelei
 	cp CELESTE_HILL
 	jr z, .celeste
 	cp CITRINE_CITY
@@ -175,32 +179,6 @@ SetPal_Overworld:
 	ld a, SET_PAL_OVERWORLD
 	ld [wDefaultPaletteCommand], a
 	ret
-.citrine
-	ld a, [wCurMap]
-	cp BRUNSWICK_TRAIL
-	jr z, .brunswick
-	cp CITRINE_CITY
-	jr c, .citrineDefault
-.citrineDefault
-	ld a, PAL_CITRINE - 1
-	jr .town
-.celeste
-	ld a, [wCurMap]
-	cp FARAWAY_ISLAND_OUTSIDE
-	jr z, .faraway
-	cp FARAWAY_ISLAND_INSIDE
-	jr z, .faraway
-	cp CELESTE_HILL
-	jr c, .celesteDefault
-.celesteDefault
-	ld a, PAL_CELESTE - 1
-	jr .town
-.faraway
-	ld a, PAL_ROUTE - 1
-	jr .town
-.brunswick
-	ld a, PAL_BRUNSWICK - 1
-	jr .town
 .PokemonTowerOrAgatha
 	ld a, PAL_GREYMON - 1
 	jr .town
@@ -214,15 +192,57 @@ SetPal_Overworld:
 	jr c, .caveDefault
 	cp SEAFOAM_ISLANDS_B4F + 1
 	jr c, .seafoam
+.celeste
+	ld a, [wCurMap]
+	cp FARAWAY_ISLAND_OUTSIDE
+	jr z, .faraway
+	cp FARAWAY_ISLAND_INSIDE
+	jr z, .faraway
+	cp CELESTE_HILL
+	jr c, .celesteDefault
+.celesteDefault
+	ld a, PAL_CELESTE - 1
+	jr .town
+.citrine
+	ld a, [wCurMap]
+	cp BRUNSWICK_TRAIL
+	jr z, .brunswick
+	cp CITRINE_CITY
+	jr c, .citrineDefault
+.citrineDefault
+	ld a, PAL_CITRINE - 1
+	jr .town
+.ship
+	ld a, PAL_VERMILION - 1
+	jr .town
+.forest
+	ld a, [wCurMap]
+	cp VIRIDIAN_FOREST
+	jr z, .viridian
+	cp SILPH_GAUNTLET_1F
+	jr z, .viridian
+	cp MT_MOON_CRATER
+	jr z, .faraway
+	cp SILPH_GAUNTLET_5F
+	jr c, .forestDefault
+.forestDefault
+	ld a, PAL_FUCHSIA - 1
+	jr .town
+.powerPlant
+	ld a, PAL_YELLOWMON - 1
+	jr .town
+.viridian
+	ld a, PAL_VIRIDIAN - 1
+	jr .town
+.faraway
+	ld a, PAL_ROUTE - 1
+	jr .town
+.brunswick
+	ld a, PAL_BRUNSWICK - 1
+	jr .town
 .caveDefault
 	ld a, PAL_CAVE - 1
 	jr .town
-.Lorelei
-	jr c, .gbcLorelei
-	jr .seafoam
-.gbcLorelei
-	xor a
-	jr .town
 .seafoam
 	ld a, PAL_CYANMON - 1
 	jr .town

engine/slots/slot_machine.asm

@@ -511,16 +511,16 @@ SlotRewardPointers:
 	dw SlotReward15Text
 
 SlotReward300Text:
-	db "999@"
+	db "900@"
 
 SlotReward100Text:
-	db "500@"
+	db "400@"
 
 SlotReward8Text:
-	db "100@"
+	db "50@"
 
 SlotReward15Text:
-	db "200@"
+	db "100@"
 
 NotThisTimeText:
 	text_far _NotThisTimeText
@@ -574,7 +574,7 @@ SlotReward8Func:
 	dec [hl]
 .skip
 	ld b, $2
-	ld de, 100 ; buffed amounts start here
+	ld de, 50 ; buffed amounts start here
 	ret
 
 SlotReward15Func:
@@ -585,7 +585,7 @@ SlotReward15Func:
 	dec [hl]
 .skip
 	ld b, $4
-	ld de, 200
+	ld de, 100
 	ret
 
 SlotReward100Func:
@@ -594,7 +594,7 @@ SlotReward100Func:
 	xor a
 	ld [wSlotMachineFlags], a
 	ld b, $8
-	ld de, 500
+	ld de, 400
 	ret
 
 SlotReward300Func:
@@ -610,7 +610,7 @@ SlotReward300Func:
 .skip
 	ld [wSlotMachineAllowMatchesCounter], a
 	ld b, $14
-	ld de, 999
+	ld de, 900
 	ret
 
 YeahText:
@@ -668,7 +668,14 @@ SlotMachine_PayCoinsToPlayer:
 	ld hl, wTempCoins1
 	xor a
 	ld [hli], a
-	inc a
+	ld a, [wSlotMachineWinningSymbol]
+	cp HIGH(SLOTSBAR) + 1
+	jr c, .twentyAtATime
+	ld a, 10
+	jr .loadTemp
+.twentyAtATime
+	ld a, 20
+.loadTemp
 	ld [hl], a
 
 	ld a, 5
@@ -683,7 +690,15 @@ SlotMachine_PayCoinsToPlayer:
 	ld h, a
 	or l
 	ret z
-	ld de, -1
+
+	ld a, [wSlotMachineWinningSymbol]
+	cp HIGH(SLOTSBAR) + 1
+	jr c, .twentyAtATime2
+	ld de, -10
+	jr .doSubtract
+.twentyAtATime2
+	ld de, -20
+.doSubtract
 	add hl, de
 	ld a, l
 	ld [wPayoutCoins + 1], a

maps/CeruleanCity.blk

@@ -15,7 +15,8 @@ N\	 !
 
 
 |r



-
3










/\bQQN

+

+










/\bQQN

 tttttt

111_
NttN


 !



 !ttt_
NttN

 V|~
0	|s0	_
NttN













_
Nttbllll6V2llllllll
NttN















NttPRRm]nN]MRRRRNtttttm'n
 

maps/FuchsiaCity.blk

@@ -1,14 +1,11 @@
- 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmoooooyzzzVUVzzzzzo

gmzzM
U
lllll11N
kkkPRRO
U
wwww11N










_tnN1wwwwwVwww1_t
+ 
!zoooooz7:~zooooooznttmVUwn




mnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz 
!znlllmz|szzzz7:~znVwwmmzooooyzzzVUVzzzzzzn

gmzzM
U
lllll11N
kkkPRRO
U
wVww11N










_tnN>?????????;_t
 
 
-nNn 
! !m_8989nNn|~0|rm1<=<=1nNn11111111m_Vw1wnN
+nN$ 
!WWWW !%_8989nN
+|~0|r
+1<=<=1nN111111111
+_Vw1wnN
 
 11
 
-
+



11nPRRRR>?;ttttRRRRRRn11111(,)1111>?;
-
-
-
-
-
-nPRRRR>?;ttttRRRRRRn11111(,)1111>?;

maps/Route9.blk

@@ -12,7 +12,7 @@
 
 (,,)ttM>;/()/$%/>;(,,)RROL()11$%11111111$%1$WW%
 
-L1111>,)/>;1>;1>;1111111QQc>;$W%1111
+51111>,)/>;1>;1>;1111111QQc>;$W%1111
 $%$%/()>;>??ttM()/>;/$%$%(,,ttM()1111111()