Mt Moon Crater fixes

Now has new music (the Mt. Moon Square theme from GSC, which was originally planned as a victory theme in Gen 1), as well as functioning wild encounters and items.

README.md

@@ -40,9 +40,9 @@ Type Matchups for Steel and Dark for reference:
 
 New Items:
 ====
-- The Sun, Ice, Poison and Heart Stones have been added.
+- The Ice, Poison and Heart Stones have been added.
 - Additional evolution items include the Protector, Black Augurite, Up-Grade, Dubious Disc, Metal Coat and Candy Jar.
-- The Old Sea Chart has been added, allowing access to Faraway Island and Mew.
+- The Old Sea Map has been added, allowing access to Faraway Island and Mew.
 - The Citrine Pass has been added, allowing access to a new post-game area based on the unused "C" map.
 - The Wing Fossil is a new item that allows Aerodactyl to be revived, as the Old Amber was instead used for Decilla.
 
@@ -68,13 +68,12 @@ New areas
 
 Improved areas
 ====
-- Most barriers to travel across the region have been removed, allowing for almost fully open world gameplay. To encourage this, Gym Leaders now have level scaling, giving more consistent challenge across the game. 
+- Some barriers to travel across the region have been removed (for example, Pewter City can be left without defeating Brock) allowing for more open world gameplay.
+	- To encourage this, Gym Leaders now have level scaling, giving more consistent challenge across the game. 
 - Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you!
 - Rock Tunnel has a more workable map, now being easier to go through and having new areas to explore. Includes a way to get renewable fossils, items, and other interesting bits and pieces. Overall, it makes Flash much more rewarding to bring, showing you where the items and content are instead of being an inconvenience. 
 - Diglett's Cave has a more detailed map with Onix, Wiglett, and Wugtrio also appearing!
 - Route 25 has been given a facelift, adding Bill's Lighthouse!
-- The Route 5-6 underground path contains a shortcut to Celadon City. 
-	- This allows you to skip Route 9 and Rock Tunnel, making them optional areas and opening up central Kanto.
 - Cinnabar Island is a lot bigger, and has a new location added to it. The mansion seems different too...
 - Pokemon Tower was shortened, being less intensive and adding room for more maps.
 - Silph Co's pathing was completely overhauled to make navigating it less tedious.
@@ -84,7 +83,7 @@ Improved areas
 
 QoL Enhancements
 ====
-- All 251 (current) Pokemon can be obtained without the use of trading or glitches, including Mew!
+- All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew!
 - 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!
 - Item Descriptions are available!
@@ -96,6 +95,7 @@ QoL Enhancements
 - Lorelei, Bruno, and Agatha now play the Gym Leader Battle theme.
 - HP bar has been doubled in speed, having a 1 frame delay per pixel rather than 2.
 - Trainer DVs are perfect-15s.
+- The Old and Good Rods have been removed, and the Super Rod, now called the Fishing Rod, is obtained in Pewter City. All fishing encounter tables have been altered to roughly match the levels of the surrounding routes. 
 - The protagonist is referred to in a gender neutral manner.
 - PC added to Celadon Hotel where the invisible event usually is. Why not?
 - Artificial Save Delay has been removed.
@@ -109,11 +109,11 @@ QoL Enhancements
 - Yellow learnset changes are imported; eg. Flash Venonat, with tweaks made to ensure nothing is lost from RB either.
 - The Game Corner in general is massively buffed, making everything far more worth going for;
 	- 3x Cherry now gives 100 coins (used to be 8)
-	- 3x Magikarp/Poliwag/Bird/Diglett/Rattata/Jigglypuff now gives 200 coins (used to be 15)
+	- 3x Poliwag/Diglett/Jigglypuff now gives 200 coins (used to be 15)
 	- 3x BAR now gives 500 coins (used to be 100)
 	- 3x 7s now gives 999 coins (used to be 300)
 - Game Corner prizes have been altered;
-	- Version parity is done across prizes, using Blue's superior prices.
+	- Blue's superior prices are used, so Porygon only costs 6500 coins.
 	- New prizes include: Cubone, Blastyke, and Cactus.
 	- The Moon Stone is available over TM23 (Dragon Rage). Dragon Rage is accessible in Celadon University!
 - Bag capacity increased from 20 to 30 items.
@@ -162,9 +162,10 @@ Known Bugs
 - Only portions of spinner tiles animate.
 - Occasionally, menu text sets itself to scroll.
 - The lone Rocket in Viridian Gym's basement needs to be directly spoken to to be battled
-- Should be able to fly from Faraway and Citrine (issue with tilesets)
+- Should be able to fly from Citrine and Brunswick (issue with tilesets)
 - Strength boulders don't fall down holes
 - Pokedex is very laggy
+- Occasionally, newly added static Pokemon remain on the map even after the battle
 - When fighting Omega in Silph Co., the Rocket you fight beforehand will disappear.
 
 Evolution Methods for new Pokemon
@@ -277,7 +278,7 @@ Credits
 * ausma - Showdown Mod assistance
 * Paulluxx - Showdown Mod assistance
 * DuoM2 - Showdown Mod assistance 
-* Albatross - Much of the new sprites used in the hack (Electivire, Magmortar, Rhyperior, Tangrowth, Glaceon, Sylveon...)
+* 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.)
 * Frrf - Assisting with the development of the Pikachu / Eevee Mode, debugging
 * dannye33 - Assisting with crysaudio implementation
 * erosunica - Assistance with developing Celadon University & Citrine City, plus sources for various subjects.

constants/hide_show_constants.asm

@@ -251,4 +251,15 @@ DEF SHOW EQU $15
 	const HS_YUJIROU					; EF
 	const HS_YUJIROU_REMATCH			; uhhh F0?
 	const HS_DRAGONITE					; F1
+	const HS_MT_MOON_CRATER_ITEM_1         ; F2
+	const HS_MT_MOON_CRATER_ITEM_2         ; F3
+	const HS_MT_MOON_CRATER_ITEM_3         ; F4
+	const HS_MT_MOON_CRATER_ITEM_4         ; F5
+	const HS_MT_MOON_CRATER_ITEM_5         ; F6
+	const HS_MT_MOON_CRATER_ITEM_6         ; F7
+	const HS_MT_MOON_CRATER_ITEM_7         ; F8
+	const HS_MT_MOON_CRATER_ITEM_8         ; F9
+	const HS_MT_MOON_CRATER_ITEM_9         ; FA
+	const HS_MT_MOON_CRATER_ITEM_10        ; FB
+	const HS_MT_MOON_CRATER_ITEM_11        ; FC		getting dangerously close to filling this...
 DEF NUM_HS_OBJECTS EQU const_value

constants/music_constants.asm

@@ -58,6 +58,7 @@
 	const MUSIC_DIGDA01
 	const MUSIC_FIELD06
 	const MUSIC_MEET_JESSIE_JAMES
+	const MUSIC_MTMOONSQUARE
 
 	const NUM_SONGS
 

crysaudio/music/mtmoonsquare.asm

@@ -7,7 +7,7 @@ Music_MtMoonSquare_Ch1:
 	tempo 112
 	volume 7, 7
 	duty_cycle 2
-	pitch_offset 1
+	toggle_perfect_pitch
 	rest 1
 .mainloop:
 	note_type 12, 4, 4

crysaudio/music_pointers_red.asm

@@ -52,3 +52,4 @@ Music:
 	dba Music_Digda01
 	dba Music_Field06
 	dba Music_MeetJessieJames
+	dba Music_MtMoonSquare

data/maps/hide_show_data.asm

@@ -415,6 +415,7 @@ MtMoonB2FHS:
 	db MT_MOON_B2F, $07, SHOW
 	db MT_MOON_B2F, $08, SHOW
 	db MT_MOON_B2F, $09, SHOW
+	db MT_MOON_B2F, $0A, HIDE	; Crater Guard, currently hidden for testing purposes
 SSAnne2FHS:
 	db SS_ANNE_2F, $02, HIDE
 SSAnne1FRoomsHS:
@@ -582,7 +583,17 @@ PokemonMansionB2FHS:
 Route1HS:
 	db ROUTE_1, $03, HIDE ; PROF OAK fight. To test, change to SHOW. - PvK
 MtMoonCraterHS:
-	db MT_MOON_CRATER, $10, SHOW ; Crater Guard
+	db MT_MOON_CRATER, $01, SHOW
+	db MT_MOON_CRATER, $02, SHOW
+	db MT_MOON_CRATER, $03, SHOW
+	db MT_MOON_CRATER, $04, SHOW
+	db MT_MOON_CRATER, $05, SHOW
+	db MT_MOON_CRATER, $06, SHOW
+	db MT_MOON_CRATER, $07, SHOW
+	db MT_MOON_CRATER, $08, SHOW
+	db MT_MOON_CRATER, $09, SHOW
+	db MT_MOON_CRATER, $0A, SHOW
+	db MT_MOON_CRATER, $0B, SHOW
 ViridianPreGymHS:
 	db VIRIDIAN_PRE_GYM, $01, SHOW ; Initial Yujirou
 	db VIRIDIAN_PRE_GYM, $02, HIDE ; Yujirou Rematch

data/maps/songs.asm

@@ -118,7 +118,7 @@ MapSongBanks::
 	db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE
 	db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE 
 	db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_74 / POKEMON MANSION B2F
-	db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
+	db MUSIC_MTMOONSQUARE, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
 	db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME
 	db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH
 	db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM

data/wild/grass_water.asm

@@ -115,6 +115,7 @@ WildDataPointers:
 	dw Gauntlet6FWildMons
 	dw NothingWildMons
 	dw NothingWildMons
+	dw NothingWildMons
 	dw FarawayIslandInsideMons ; I think this is right??
 	dw NothingWildMons
 	dw MtMoonCraterMons
@@ -142,7 +143,6 @@ WildDataPointers:
 	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
-	dw NothingWildMons
 	dw PokemonTower1FWildMons
 	dw PokemonTower2FWildMons
 	dw PokemonTower3FWildMons