Revamp Pokemon Mansion B2F

This was hell to do. There is still one bug in there, and that's the item pickups don't work for some reason. I don't know how these work honestly so if anyone wants to sort that go ahead.

Anyway, some stuff on the map;
- Currently, a warp from B1F leads there, which is intentionally non-returnable. The player walks through the whole map to get to the warp panel. A walk of humanity's shame, if you will. A warp for where the player is meant to go will be necessary later.
- Lore from Japanese media, particularly the first movie's interpretation of Mewtwo, is included. This is based on context clues on its canonicity from LGPE and other bits.
- A clue on how to get the Old Sea Chart is not-so-subtly included.

The MissingNo. event is unfinished, I intend for Martha to deal with that. The text intentionally lacks a "done" bit to force an unpredictable error; I believe this is inconsequential gameplay-wise and should make for a good opening quote when fighting it.

Oh, and Faraway Island has Mankey, Butterfree, and Primeape as find-able Pokemon now. This should be expanded upon later.
This commit is contained in:
May Evans 2022-10-17 16:57:42 +01:00
parent 97cb4cfaf3
commit 86f111e5d7
15 changed files with 201 additions and 19 deletions

View file

@ -119,7 +119,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw FarawayIslandInsideHS
dw NoHS
dw PokemonMansionB2FHS
dw NoHS
dw NoHS
dw NoHS
@ -571,8 +571,11 @@ SeafoamIslandsB4FHS:
db SEAFOAM_ISLANDS_B4F, $03, SHOW
VermilionDockHS: ; unsure if necessary
db VERMILION_DOCK, $01, SHOW
;db $FF, $01, SHOW ; end
;db $FF, $01, SHOW
FarawayIslandInsideHS:
db FARAWAY_ISLAND_INSIDE, $01, HIDE ; if mew is fucking up this is why
PokemonMansionB2FHS:
db POKEMON_MANSION_B2F, $03, SHOW
db POKEMON_MANSION_B2F, $04, SHOW ; end
assert_table_length NUM_HS_OBJECTS + 1

View file

@ -1,8 +1,9 @@
PokemonMansionB1F_Object:
db $1 ; border block
db $01 ; border block
def_warp_events
warp_event 23, 22, POKEMON_MANSION_1F, 6
warp_event 2, 1, POKEMON_MANSION_B2F, 1 ; temp for debugging purposes...unless?
def_bg_events

View file

@ -1,10 +1,34 @@
PokemonMansionB2F_Object:
db $01 ; border block
db $0D ; border block
def_warp_events
warp_event 26, 22, CINNABAR_ISLAND, 1 ; this should not be accessible, only something the player arrives at.
warp_event 27, 2, CINNABAR_ISLAND, 6
def_bg_events
bg_event 23, 0, 14 ; photo
bg_event 18, 2, 15 ; starter pod
bg_event 14, 2, 16 ; starter pod
bg_event 10, 2, 17 ; starter pod
bg_event 6, 2, 18 ; amber's pod
bg_event 1, 2, 19 ; mewtwo's pod
bg_event 12, 6, 20 ; computer 1
bg_event 14, 6, 21 ; computer 2
bg_event 16, 6, 22 ; computer 3, missingno
def_object_events
object_event 7, 8, SPRITE_POKEDEX, STAY, NONE, 1 ; Book 1
object_event 26, 6, SPRITE_POKEDEX, STAY, NONE, 2 ; Book 2
object_event 8, 8, SPRITE_POKE_BALL, STAY, NONE, 3, TM_PSYCHIC_M
object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 6, 17, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 9, 18, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 5, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
object_event 17, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
object_event 11, 21, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
object_event 8, 19, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
object_event 5, 17, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person
object_event 7, 18, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person
object_event 12, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
def_warps_to POKEMON_MANSION_B2F

View file

@ -116,7 +116,7 @@ MapSongBanks::
db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM
db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE
db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE
db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_74
db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; UNUSED_MAP_74 / POKEMON MANSION B2F
db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75
db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME
db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_NORTH_SOUTH