thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding Cinnabar Volcano, editing a few encounters

Browse source
This commit is contained in:
MementoMartha 2022-09-27 12:09:22 +01:00
parent 0b65243c75
commit 4eaae2ab9d
35 changed files with 215 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/maps/dungeon_maps.asm
View file

@ -10,6 +10,7 @@ DungeonMaps1:
db ROCK_TUNNEL_1F
db SEAFOAM_ISLANDS_1F
db ROCK_TUNNEL_B1F
db CINNABAR_VOLCANO
db -1 ; end
; GetBattleTransitionID_IsDungeonMap checks if wCurMap

2
data/maps/headers/CinnabarVolcano.asm Normal file
View file

@ -0,0 +1,2 @@
map_header CinnabarVolcano, CINNABAR_VOLCANO, CAVERN, 0
end_map_header

4
data/maps/hide_show_data.asm
View file

@ -234,7 +234,7 @@ MapHSPointers:
dw CeruleanCaveHS
dw NoHS
dw NoHS
dw NoHS
dw CinnabarVolcanoHS
dw NoHS
dw SilphCo9FHS
dw SilphCo10FHS
@ -509,6 +509,8 @@ SilphCo11FHS:
db SILPH_CO_11F, $05, SHOW
UnusedMapF4HS:
db UNUSED_MAP_F4, $02, SHOW
CinnabarVolcanoHS:
db CINNABAR_VOLCANO, $01, SHOW
PokemonMansion2FHS:
db POKEMON_MANSION_2F, $02, SHOW
PokemonMansion3FHS:

2
data/maps/map_header_banks.asm
View file

@ -232,7 +232,7 @@ MapHeaderBanks::
db BANK(CeruleanCave1F_h)
db BANK(NameRatersHouse_h)
db BANK(CeruleanBadgeHouse_h)
db $01 ; UNUSED_MAP_E7
db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7
db BANK(RockTunnelB1F_h)
db BANK(SilphCo9F_h)
db BANK(SilphCo10F_h)

2
data/maps/map_header_pointers.asm
View file

@ -232,7 +232,7 @@ MapHeaderPointers::
dw CeruleanCave1F_h
dw NameRatersHouse_h
dw CeruleanBadgeHouse_h
dw Route16Gate1F_h ; UNUSED_MAP_E7
dw CinnabarVolcano_h ; UNUSED_MAP_E7
dw RockTunnelB1F_h
dw SilphCo9F_h
dw SilphCo10F_h

3
data/maps/objects/CinnabarIsland.asm
View file

@ -7,13 +7,14 @@ CinnabarIsland_Object:
warp_event 6, 21, CINNABAR_LAB, 1
warp_event 15, 17, CINNABAR_POKECENTER, 1
warp_event 21, 19, CINNABAR_MART, 1
warp_event 14, 11, CINNABAR_VOLCANO, 1
def_bg_events
bg_event 11, 15, 3 ; CinnabarIslandText3
bg_event 22, 19, 4 ; MartSignText
bg_event 16, 17, 5 ; PokeCenterSignText
bg_event 9, 23, 6 ; CinnabarIslandText6
bg_event 9, 9, 7 ; CinnabarIslandText7
bg_event 23, 13, 7 ; CinnabarIslandText7
def_object_events
object_event 11, 18, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person

13
data/maps/objects/CinnabarVolcano.asm Normal file
View file

@ -0,0 +1,13 @@
CinnabarVolcano_Object:
db $7d ; border block
def_warp_events
warp_event 2, 23, LAST_MAP, 6
warp_event 3, 23, LAST_MAP, 6
def_bg_events
def_object_events
object_event 14, 12, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
def_warps_to CINNABAR_VOLCANO

2
data/maps/objects/VictoryRoad2F.asm
View file

@ -18,7 +18,7 @@ VictoryRoad2F_Object:
object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6
object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5
object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50 | OW_POKEMON
object_event 11, 5, SPRITE_MONSTER, STAY, DOWN, 6, GYAOON, 50 | OW_POKEMON
object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION
object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL
object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK

2
data/maps/songs.asm
View file

@ -231,7 +231,7 @@ MapSongBanks::
db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_1F
db MUSIC_CITIES2, BANK(Music_Cities2) ; NAME_RATERS_HOUSE
db MUSIC_CITIES1, BANK(Music_Cities1) ; CERULEAN_BADGE_HOUSE
db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; UNUSED_MAP_E7
db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; UNUSED_MAP_E7 / Cinnabar Volcano
db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_B1F
db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_9F
db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_10F