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.
This commit is contained in:
MementoMartha 2023-04-25 23:15:02 +01:00
parent 9938617229
commit 14626866b6
8 changed files with 39 additions and 14 deletions

View file

@ -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

View file

@ -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

View file

@ -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