S.S. Anne healer and other bits

This adds the S.S. Anne healer from FRLG that's notorious for gaslighting newer players who just think she's there.

This also adds an extremely early Mewtwo theme. It's far from finished, just happens to be in this commit as I was testing it in debug - thanks to Luci for working on this!

Updated bug list as well with things my friend Crunter found.

README.md

@@ -107,6 +107,7 @@ Improved Areas
 - Viridian Gym now has a minor new area once you make Giovanni leave.
 - Various Move Tutors from FireRed and LeafGreen have been distributed around the region, instead giving their respective TMs.
 - The S.S. Anne now returns after getting the Marsh Badge and features trades for Galarian forms & Evolutions, as well as Paldean Tauros.
+- The healer from the S.S. Anne is now featured in the rightmost room on 1F.
 - A few existing areas have unique palettes to make them stand out:
 	- The Game Corner has a new palette, meant to reflect the bright, exciting colours that casinos and pachinko parlours tend to have.
 	- The Seafoam Islands have a cyan-coloured palette to make it seem more like an ice cave. Lorelei's room also has it.
@@ -120,6 +121,7 @@ QoL Enhancements
 	- To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal.
 - All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew!
 - Bag capacity is increased from 20 to 30 items.
+- Pokemon Box capacity is now 280 Pokemon with 14 boxes.
 - New Pokedex entries for most Pokemon are available, sourced from the original 1996 Pokedex book by Creatures Inc., restoring a ton of old Kanto lore. Thanks to [Dr. Lava and Nob Ogasawara](http://lavacutcontent.com/1996-creatures-pokedex-translation-1/) for their incredible work translating and writing about it!
 - Pikachu and Eevee are now starters, featuring fully functional Rival lineups. If you pick Pikachu, he picks Eevee, and if you pick Eevee, he picks Pikachu! Their growth rates have been changed to Medium Slow to give them the early-game power spike the other starters have.
 - Item Descriptions are available!
@@ -213,6 +215,9 @@ Known Bugs
 - GiveMonName doesn't work properly for the Vermilion Beauty after receiving the Pokemon, jank ensues.
 - Text scrolls immediately when receiving the Pokemon from the Vermilion Beauty.
 - HP DV does not appear to display correctly.
+- Vermilion City sign near Diglett's Cave doesn't show correctly (prolly just an event thing)
+- Vermilion Beauty gives wrong Pokemon when cats are chosen
+- Cancelling teaching with a TM and choosing another crashes the game
 
 Evolution Methods for new Pokemon
 ====
@@ -331,7 +336,9 @@ Credits
 * Paulluxx - Showdown Mod assistance
 * DuoM2 - Showdown Mod assistance 
 * Albatross - Many of the new sprites used in the hack (A significant number of post-Gen 1 evolutions, all regional variants, Meltan and Carapthor lines, etc.)
+* BlueZangoose / Vimescarrot - Pokemon box expansion, general assistance.
 * Frrf - Assisting with the development of the Pikachu / Eevee Mode, debugging
+* LuciShrimp - Mewtwo & Galarian Bird custom battle music
 * dannye33 - Assisting with crysaudio implementation
 * erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects.
 * Chatot4444 - Assisting with gym scaling code

audio.asm

@@ -377,6 +377,7 @@ INCLUDE "crysaudio/music/RBY/digda01.asm"
 INCLUDE "crysaudio/music/RBY/field06.asm"
 INCLUDE "crysaudio/music/RBY/victory4.asm"
 INCLUDE "crysaudio/music/RBY/kinchou01.asm"
+INCLUDE "crysaudio/music/RBY/mewtwo01.asm"
 
 SECTION "TCG Songs 1", ROMX
 

audio/play_battle_music.asm

@@ -16,6 +16,8 @@ PlayBattleMusic::
 	ld a, [wCurOpponent]
 	cp OPP_ID_OFFSET
 	jr c, .wildBattle
+	cp MEWTWO
+	jr z, .mewtwoBattle
 	cp OPP_YUJIROU
 	jr z, .Elite4Battle
 	cp OPP_LORELEI ; elite four now play the gym leader battle theme
@@ -46,5 +48,7 @@ PlayBattleMusic::
 	jr .playSong
 .wildBattle
 	ld a, MUSIC_WILD_BATTLE
+.mewtwoBattle
+	ld a, MUSIC_MEWTWO01
 .playSong
 	jp PlayMusic

constants/music_constants.asm

@@ -61,6 +61,7 @@
 	const MUSIC_SAKAKI
 	const MUSIC_VICTORY4
 	const MUSIC_KINCHOU01
+	const MUSIC_MEWTWO01
 
 	const NUM_SONGS
 

crysaudio/music_pointers_red.asm

@@ -55,3 +55,4 @@ Music:
 	dba Music_Sakaki
 	dba Music_Victory4
 	dba Music_Kinchou01
+	dba Music_Mewtwo01

data/maps/objects/SSAnne1F.asm

@@ -4,9 +4,9 @@ SSAnne1F_Object:
 	def_warp_events
 	warp_event 26,  0, VERMILION_DOCK, 2
 	warp_event 27,  0, VERMILION_DOCK, 2
-	warp_event 31,  8, SS_ANNE_1F_ROOMS, 1
+	warp_event 19,  8, SS_ANNE_1F_ROOMS, 1
 	warp_event 23,  8, SS_ANNE_1F_ROOMS, 2
-	warp_event 19,  8, SS_ANNE_1F_ROOMS, 3
+	warp_event 31,  8, SS_ANNE_1F_ROOMS, 3
 	warp_event 15,  8, SS_ANNE_1F_ROOMS, 4
 	warp_event 11,  8, SS_ANNE_1F_ROOMS, 5
 	warp_event  7,  8, SS_ANNE_1F_ROOMS, 6

data/maps/objects/SSAnne1FRooms.asm

@@ -16,7 +16,7 @@ SSAnne1FRooms_Object:
 	object_event 11,  4, SPRITE_GENTLEMAN, STAY, UP, 2, OPP_GENTLEMAN, 2
 	object_event 11, 14, SPRITE_YOUNGSTER, STAY, UP, 3, OPP_YOUNGSTER, 8
 	object_event 13, 11, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_LASS, 11
-	object_event 22,  3, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person
+	object_event 23, 12, SPRITE_GIRL, WALK, UP_DOWN, 5 ; person
 	object_event  0, 14, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 6 ; person
 	object_event  2, 11, SPRITE_LITTLE_GIRL, STAY, DOWN, 7 ; person
 	object_event  3, 11, SPRITE_FAIRY, STAY, DOWN, 8 ; person
@@ -25,5 +25,6 @@ SSAnne1FRooms_Object:
 	object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person
 	object_event  0,  4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader
 	object_event 10,  4, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader
+	object_event 23,  3, SPRITE_NURSE, STAY, LEFT, 14 ; Healer
 
 	def_warps_to SS_ANNE_1F_ROOMS

engine/debug/debug_menu.asm

@@ -108,7 +108,7 @@ TestBattle:
 	ld [hl], a
 
 	; Player's Pokemon.
-	ld a, NIDOREIGN
+	ld a, MEW
 	ld [wcf91], a
 	ld a, 100
 	ld [wCurEnemyLVL], a
@@ -130,7 +130,7 @@ TestBattle:
 	ld [hli], a
 	
 	; Opponent's Pokemon.
-	ld a, SANDY_SHOCKS
+	ld a, MEWTWO ; Test new theme
 	ld [wCurOpponent], a
 	ld a, 100 ; Set the level you want here.
 	ld [wCurEnemyLVL], a

scripts/SSAnne1FRooms.asm

@@ -26,6 +26,7 @@ SSAnne1FRooms_TextPointers:
 	dw SSAnne8Text11
 	dw PerrserkerTrade
 	dw WeezingTrade
+	dw SSAnneNurse
 
 SSAnne8TrainerHeaders:
 	def_trainers
@@ -151,3 +152,18 @@ WeezingTrade:
 	ld [wWhichTrade], a
 	predef DoInGameTradeDialogue
 	jp TextScriptEnd
+
+SSAnneNurse:
+	text_far _SilphCo9Text_5d8e5
+	text_asm
+	predef HealParty
+	call GBFadeOutToWhite
+	call Delay3
+	call GBFadeInFromWhite
+	ld hl, SSAnneNurseDone
+	call PrintText
+	jp TextScriptEnd
+
+SSAnneNurseDone:
+	text_far _SSAnneNurseDone
+	text_end

text/SSAnne1FRooms.asm

@@ -103,3 +103,9 @@ _SSAnne8Text11::
 	para "I'm on the trail"
 	line "of TEAM ROCKET!"
 	done
+
+_SSAnneNurseDone::
+	text "Thank you for"
+	line "choosing the"
+	cont "S.S. ANNE!"
+	done