this is a commit.

- Added another counter to the Game Corner prize room, adding Abra, Clefairy and Dratini back as prizes.

- Fixed Thorn Avery's and Zeta Null's names in the credits

- Small map changes to postgame areas

- Polished the new dex entries again

- Mewtwo no longer gets Waterfall and Roar from tradebacks

- Fixed a bug where you couldn't surf in the water on the Ferry tileset

- Gave Giovanni's room the same palette as Rocket HQ

- Minor text fixes

- Fixed an issue where LAST_MAP wouldn't update when sailing to Citrine

engine/events/prize_menu.asm

@@ -88,7 +88,7 @@ GetPrizeMenuId:
 	ld bc, 6
 	call CopyData
 	ld a, [wWhichPrizeWindow]
-	cp 2        ;is TM_menu?
+	cp 3        ;is TM_menu?
 	jr nz, .putMonName
 	ld a, [wPrize1]
 	ld [wd11e], a
@@ -194,7 +194,7 @@ HandlePrizeChoice:
 	ld a, [hl]
 	ld [wd11e], a
 	ld a, [wWhichPrizeWindow]
-	cp 2 ; is prize a TM?
+	cp 3 ; is prize a TM?
 	jr nz, .getMonName
 	call GetItemName
 	jr .givePrize
@@ -211,7 +211,7 @@ HandlePrizeChoice:
 	call HasEnoughCoins
 	jr c, .notEnoughCoins
 	ld a, [wWhichPrizeWindow]
-	cp $02
+	cp $03
 	jr nz, .giveMon
 	ld a, [wd11e]
 	ld b, a

engine/gfx/palettes.asm

@@ -171,6 +171,8 @@ SetPal_Overworld:
 	jp z, .brunswick
 	cp SILPH_GAUNTLET_3F
 	jp z, .ship
+	cp VERMILION_FERRY_DOCK
+	jp z, .ship
 	cp GAME_CORNER
 	jp z, .pachinko
 	cp GAME_CORNER_PRIZE_ROOM
@@ -185,6 +187,8 @@ SetPal_Overworld:
 	jp z, .pachinko
 	cp ROCKET_HIDEOUT_ELEVATOR
 	jp z, .pachinko
+	cp GIOVANNIS_ROOM
+	jp z, .pachinko
 	cp FARAWAY_ISLAND_OUTSIDE
 	jp z, .faraway
 	cp FARAWAY_ISLAND_INSIDE
@@ -197,6 +201,10 @@ SetPal_Overworld:
 	jp z, .celeste
 	cp CELESTE_HILL
 	jp z, .celeste
+	cp CITRINE_FERRY_DOCK
+	jp z, .citrine
+	cp SEAGALLOP_FERRY
+	jp z, .ferry
 	cp SILPH_GAUNTLET_5F
 	jp z, .trans
 	cp CERULEAN_CAVE_2F
@@ -280,6 +288,12 @@ SetPal_Overworld:
 .faraway
 	ld a, PAL_ROUTE - 1
 	jr .town
+.citrine
+	ld a, PAL_CITRINE - 1
+	jr .town
+.ferry
+	ld a, PAL_BLUEMON - 1
+	jr .town
 
 ; used when a Pokemon is the only thing on the screen
 ; such as evolution, trading and the Hall of Fame

engine/items/town_map.asm

@@ -382,6 +382,8 @@ DisplayWildLocations:
 	call LoadTownMapEntry
 	pop hl
 	ld a, [de]
+	cp $0C ; Bill's Garden's coordinates
+	jr z, .nextEntry ; skip
 	cp $16 ; Mt. Moon Crater's coordinates
 	jr z, .nextEntry ; skip
 	cp $19 ; Cerulean Cave's coordinates