New Citrine map architecture, Kinchou01

This adds all the required architecture for the new maps to work, as well as Kinchou01 to play when in Celeste Hill itself.

This doesn't add the events, though.
This commit is contained in:
Llinos Evans 2023-06-14 22:49:03 +01:00
parent 8045451b78
commit 86230c64f1
25 changed files with 277 additions and 6 deletions

View file

@ -0,0 +1,2 @@
map_header BrunswickGrotto, BRUNSWICK_GROTTO, FOREST, 0
end_map_header

View file

@ -0,0 +1,2 @@
map_header CelesteHillCave, CELESTE_HILL_CAVE, CAVERN, 0
end_map_header

View file

@ -0,0 +1,2 @@
map_header CelesteHillOutside, CELESTE_HILL_OUTSIDE, CELESTE, 0
end_map_header

View file

@ -255,7 +255,10 @@ MapHSPointers:
dw GiovannisRoomHS
dw NoHS ; Battle Tent
dw NoHS ; Mt Moon Square
DW NoHS ; Mt Moon Square House
dw NoHS ; Mt Moon Square House
dw NoHS ; Celeste Hill Cave
dw NoHS ; Celeste Hill Outside
dw NoHS ; Brunswick Grotto, should have HS Data later.
assert_table_length NUM_MAPS
dw -1 ; end

View file

@ -254,4 +254,7 @@ MapHeaderBanks::
db BANK(BattleTent_h)
db BANK(MtMoonSquare_h)
db BANK(MtMoonSquareHouse_h)
db BANK(CelesteHillCave_h)
db BANK(CelesteHillOutside_h)
db BANK(BrunswickGrotto_h)
assert_table_length NUM_MAPS

View file

@ -254,4 +254,7 @@ MapHeaderPointers::
dw BattleTent_h
dw MtMoonSquare_h
dw MtMoonSquareHouse_h
dw CelesteHillCave_h
dw CelesteHillOutside_h
dw BrunswickGrotto_h
assert_table_length NUM_MAPS

View file

@ -0,0 +1,11 @@
BrunswickGrotto_Object:
db $0 ; border block
def_warp_events
warp_event 4, 11, 0, REDS_HOUSE_2F
def_bg_events
def_object_events
def_warps_to BRUNSWICK_GROTTO

View file

@ -0,0 +1,11 @@
CelesteHillCave_Object:
db $0 ; border block
def_warp_events
warp_event 4, 11, 0, REDS_HOUSE_2F
def_bg_events
def_object_events
def_warps_to CELESTE_HILL_CAVE

View file

@ -0,0 +1,11 @@
CelesteHillOutside_Object:
db $0 ; border block
def_warp_events
warp_event 4, 11, 0, REDS_HOUSE_2F
def_bg_events
def_object_events
def_warps_to CELESTE_HILL_OUTSIDE

View file

@ -253,4 +253,7 @@ MapSongBanks::
db MUSIC_GYM, 0 ; BATTLE_TENT
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE
db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE
db MUSIC_KINCHOU01, 0 ; CELESTE_HILL_CAVE
db MUSIC_KINCHOU01, 0 ; CELESTE_HILL_OUTSIDE
db MUSIC_DUNGEON2, 0 ; BRUNSWICK_GROTTO
assert_table_length NUM_MAPS

View file

@ -253,6 +253,9 @@ WildDataPointers:
dw NothingWildMons ; battle tent
dw NothingWildMons ; mt moon square
dw NothingWildMons
dw CelesteHillCaveWildMons
dw CelesteHillWildMons ; using Celeste Hill's summit for Celeste Hill Outside
dw BrunswickGrottoWildMons
assert_table_length NUM_MAPS
dw -1 ; end
@ -343,3 +346,5 @@ INCLUDE "data/wild/maps/BrunswickTrail.asm"
INCLUDE "data/wild/maps/GarnetCavern1F.asm"
INCLUDE "data/wild/maps/GarnetCavernB1F.asm"
INCLUDE "data/wild/maps/GarnetCavern2F.asm"
INCLUDE "data/wild/maps/CelesteHillCave.asm"
INCLUDE "data/wild/maps/BrunswickGrotto.asm"

View file

@ -0,0 +1,17 @@
; Another way to obtain Virdian Forest bugs, which are hard to bring up to speed post-game.
BrunswickGrottoWildMons:
def_grass_wildmons 10 ; encounter rate
db 51, BEEDRILL
db 52, BUTTERFREE
db 52, CARAPTHOR
db 51, VENOMOTH
db 53, PARASECT
db 53, PARASECT
db 53, CACTUS
db 54, SCYTHER
db 54, PINSIR
db 55, PINSIR
end_grass_wildmons
def_water_wildmons 0 ; encounter rate
end_water_wildmons

View file

@ -0,0 +1,18 @@
; Pretty generic cave, only it contains the Ground-type tradables.
; Vague reference to the iconic wild Steelix.
CelesteHillCaveWildMons:
def_grass_wildmons 10 ; encounter rate
db 51, GRAVELER
db 52, MAROWAK
db 52, GRAVELER
db 51, MAROWAK
db 53, TOEDSCOOL
db 53, RHYDON
db 53, STEELIX
db 54, GOLEM
db 54, RHYPERIOR
db 55, RHYPERIOR
end_grass_wildmons
def_water_wildmons 0 ; encounter rate
end_water_wildmons