Post-release bugfixes: Batch 2

This commit fixes the following bugs:

- Viewing the Town Map in Viridian Pre-Gym would show the player as being in Cerulean.

- Psychic, Psywave, Night Shade and Dazzling Gleam wouldn't shake the full screen

- Okay, NOW it's impossible to trap yourself in Cinnabar Volcano.

- Getting the Vermilion Beauty gift would lock you out from getting the Silph Co Lapras gift later.

- Text fixes

engine/battle/animations.asm

@@ -1861,8 +1861,8 @@ AnimationWavyScreen:
 	ld c, $ff
 	ld hl, WavyScreenLineOffsets
 .loop
-	; ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow
-	; ldh [hSCX], a
+	ld a, [hl] ; this fixes the wavy screen, but causes a bank overflow
+	ldh [hSCX], a
 	push hl
 .innerLoop
 	call WavyScreen_SetSCX
@@ -1879,7 +1879,7 @@ AnimationWavyScreen:
 	dec c
 	jr nz, .loop
 	xor a
-	; ldh [hSCX], a ; also fixing the wavy screen
+	ldh [hSCX], a ; also fixing the wavy screen
 	ldh [hWY], a
 	call SaveScreenTilesToBuffer2
 	call ClearScreen