Summer Beach House (buggy!)

This adds the Summer Beach House from Pokemon Yellow to Route 19, in an effort to make Kanto a bit more interesting.

The code for teaching Pikachu is very buggy right now and someone should check it out. I usually throw code out if it isn't functional but this seems extremely close to working.
This commit is contained in:
Llinos Evans 2024-08-04 02:27:27 +01:00
parent 88390e8282
commit 0dd22ececa
20 changed files with 301 additions and 6 deletions

View file

@ -192,3 +192,5 @@ SpecialsPointers::
add_special ShoveSafariBallsDownKrissThroat
add_special GiveKrisSneakers
add_special DebugGiveMonSpecialMove
add_special CheckPikachu
add_special TeachPikachuSurf

View file

@ -854,6 +854,7 @@ ENDM
map_attributes PokemonPagoda4F, POKEMON_PAGODA_4F, $00, 0
map_attributes PokemonPagoda5F, POKEMON_PAGODA_5F, $00, 0
map_attributes JackysHouse, JACKYS_HOUSE, $00, 0
map_attributes SummerBeachHouse, SUMMER_BEACH_HOUSE, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

View file

@ -1279,4 +1279,7 @@ TwoIsland_Blocks:
CapeBrink_Blocks:
INCBIN "maps/CapeBrink.ablk"
SummerBeachHouse_Blocks:
INCBIN "maps/SummerBeachHouse.ablk"

View file

@ -412,6 +412,7 @@ MapGroup_Fuchsia:
map FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SafariZoneWardensHome, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route15FuchsiaGate, TILESET_GATE, GATE, LANDMARK_ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SummerBeachHouse, TILESET_HOUSE, INDOOR, LANDMARK_FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_FUCHSIA_MAPS
MapGroup_Lavender:

View file

@ -602,6 +602,7 @@ INCLUDE "maps/LavenderCryptSet3.asm"
INCLUDE "maps/LavenderCryptDokuroarsRoom.asm"
INCLUDE "maps/Route50.asm"
INCLUDE "maps/JackysHouse.asm"
INCLUDE "maps/SummerBeachHouse.asm"
SECTION "Map Scripts 31", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"

View file

@ -149,4 +149,5 @@ OverworldSprites:
overworld_sprite ChannelerGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite BaldingGuyGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
overworld_sprite GameboyGirlGFX, 12, STANDING_SPRITE, PAL_OW_RED
overworld_sprite OverworldPikachuGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
assert_table_length NUM_OVERWORLD_SPRITES

Binary file not shown.

View file

@ -63,3 +63,14 @@
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 40
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42
tilecoll WALL, FLOOR, WALL, FLOOR ; 43
tilecoll WALL, WALL, FLOOR, FLOOR ; 44
tilecoll WALL, WALL, FLOOR, FLOOR ; 45
tilecoll WALL, WALL, FLOOR, FLOOR ; 46
tilecoll WALL, WALL, FLOOR, FLOOR ; 47
tilecoll WALL, WALL, FLOOR, WALL ; 48
tilecoll FLOOR, WALL, FLOOR, WALL ; 49
tilecoll WALL, FLOOR, WALL, FLOOR ; 4a
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 4b

Binary file not shown.