thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45: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

3
data/wild/grass_water.asm
View file

@ -231,7 +231,7 @@ WildDataPointers:
dw CeruleanCave1FWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw CinnabarVolcanoWildMons
dw RockTunnelB1FWildMons
dw NothingWildMons
dw NothingWildMons
@ -321,3 +321,4 @@ INCLUDE "data/wild/maps/VictoryRoad2F.asm"
INCLUDE "data/wild/maps/VictoryRoad3F.asm"
INCLUDE "data/wild/maps/VictoryRoad1F.asm"
INCLUDE "data/wild/maps/DiglettsCave.asm"
INCLUDE "data/wild/maps/CinnabarVolcano.asm"

16
data/wild/maps/CinnabarVolcano.asm Normal file
View file

@ -0,0 +1,16 @@
CinnabarVolcanoWildMons:
def_grass_wildmons 10 ; encounter rate
db 37, VULPIX
db 38, PONYTA
db 37, GROWLITHE
db 37, PONYTA
db 38, GROWLITHE
db 41, RAPIDASH
db 33, CHARMANDER
db 38, MAGMAR
db 39, MAGMAR
db 40, CHARMELEON
end_grass_wildmons
def_water_wildmons 0 ; encounter rate
end_water_wildmons

20
data/wild/maps/PokemonMansion1F.asm
View file

@ -1,15 +1,15 @@
PokemonMansion1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 32, GRIMER
db 30, GRIMER
db 34, PONYTA
db 30, PONYTA
db 34, VULPIX
db 32, PONYTA
db 30, KOFFING
db 28, PONYTA
db 37, MUK
db 39, WEEZING
db 36, GRIMER
db 35, GRIMER
db 35, KOFFING
db 36, GASTLY
db 34, KOFFING
db 35, GASTLY
db 36, GASTLY
db 38, MUK
db 38, WEEZING
db 38, WEEZING
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

20
data/wild/maps/PokemonMansion2F.asm
View file

@ -1,15 +1,15 @@
PokemonMansion2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 32, GROWLITHE
db 34, KOFFING
db 34, KOFFING
db 30, PONYTA
db 30, KOFFING
db 32, PONYTA
db 30, GRIMER
db 28, PONYTA
db 39, WEEZING
db 37, MUK
db 34, GRIMER
db 35, KOFFING
db 36, KOFFING
db 35, GRIMER
db 35, GASTLY
db 34, GASTLY
db 36, DROWZEE
db 38, HYPNO
db 40, WEEZING
db 40, MUK
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

16
data/wild/maps/PokemonMansion3F.asm
View file

@ -1,15 +1,15 @@
PokemonMansion3FWildMons:
def_grass_wildmons 10 ; encounter rate
db 31, GRIMER
db 33, VULPIX
db 35, KOFFING
db 34, GRIMER
db 35, GRIMER
db 32, PONYTA
db 34, MAGMAR
db 40, MUK
db 34, KOFFING
db 38, MUK
db 36, PONYTA
db 42, WEEZING
db 34, DROWZEE
db 35, DROWZEE
db 36, GASTLY
db 37, GASTLY
db 38, HYPNO
db 40, HYPNO
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

16
data/wild/maps/PokemonMansionB1F.asm
View file

@ -1,15 +1,15 @@
PokemonMansionB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 33, GRIMER
db 31, GRIMER
db 35, VULPIX
db 32, PONYTA
db 31, GRIMER
db 40, MUK
db 34, PONYTA
db 35, GASTLY
db 35, KOFFING
db 38, MAGMAR
db 35, GRIMER
db 34, DITTO
db 36, GASTLY
db 36, DITTO
db 42, WEEZING
db 42, MUK
db 38, DITTO
db 42, HAUNTER
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

20
data/wild/maps/PowerPlant.asm
View file

@ -1,15 +1,15 @@
PowerPlantWildMons:
def_grass_wildmons 10 ; encounter rate
db 21, VOLTORB
db 21, MAGNEMITE
db 20, PIKACHU
db 24, PIKACHU
db 23, MAGNEMITE
db 23, VOLTORB
db 32, MAGNETON
db 35, MAGNETON
db 33, ELECTABUZZ
db 36, ELECTABUZZ
db 37, VOLTORB
db 38, MAGNETITE
db 37, GAOTORA
db 37, MAGNETITE
db 38, GAOTORA
db 41, MAGNETON
db 33, PIKACHU
db 38, ELECTABUZZ
db 39, ELECTABUZZ
db 40, RAICHU
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

2
data/wild/maps/Route10.asm
View file

@ -6,7 +6,7 @@ Route10WildMons:
db 11, EKANS
db 13, SPEAROW
db 15, EKANS
db 17, CACTUS
db 17, MAGNEMITE
db 20, FEAROW
db 13, SANDSHREW
db 17, SANDSHREW

20
data/wild/maps/SeafoamIslands1F.asm
View file

@ -1,15 +1,15 @@
SeafoamIslands1FWildMons:
def_grass_wildmons 15 ; encounter rate
db 30, SEEL
db 30, PSYDUCK
db 30, STARYU
db 30, KRABBY
db 28, KRABBY
db 21, ZUBAT
db 29, GOLBAT
db 28, SLOWPOKE
db 28, STARYU
db 38, SLOWBRO
db 35, SEEL
db 35, PSYDUCK
db 35, STARYU
db 35, KRABBY
db 36, WEIRDUCK
db 33, SEEL
db 34, SLOWPOKE
db 34, SLOWPOKE
db 38, JYNX
db 38, DEWGONG
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

20
data/wild/maps/SeafoamIslandsB1F.asm
View file

@ -1,15 +1,15 @@
SeafoamIslandsB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 30, STARYU
db 30, HORSEA
db 32, SHELLDER
db 32, HORSEA
db 28, SLOWPOKE
db 30, SEEL
db 30, SLOWPOKE
db 28, SEEL
db 38, DEWGONG
db 37, SEADRA
db 35, SHELLDER
db 35, BLASTYKE
db 36, SHELLDER
db 36, BLASTYKE
db 34, SLOWPOKE
db 35, SEEL
db 35, SLOWPOKE
db 35, SEEL
db 38, JYNX
db 39, SLOWBRO
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

20
data/wild/maps/SeafoamIslandsB2F.asm
View file

@ -1,15 +1,15 @@
SeafoamIslandsB2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 30, SEEL
db 30, SLOWPOKE
db 32, SEEL
db 32, SLOWPOKE
db 28, HORSEA
db 30, STARYU
db 30, HORSEA
db 28, SHELLDER
db 30, GOLBAT
db 37, SLOWBRO
db 35, SEEL
db 35, SLOWPOKE
db 36, SEEL
db 36, SLOWPOKE
db 34, WEIRDUCK
db 35, STARYU
db 35, WEIRDUCK
db 38, JYNX
db 36, STARYU
db 39, GOLDUCK
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

20
data/wild/maps/SeafoamIslandsB3F.asm
View file

@ -1,15 +1,15 @@
SeafoamIslandsB3FWildMons:
def_grass_wildmons 10 ; encounter rate
db 31, PSYDUCK
db 31, SEEL
db 33, PSYDUCK
db 33, SEEL
db 29, KRABBY
db 31, STARYU
db 31, KRABBY
db 29, STARYU
db 39, KINGLER
db 37, DEWGONG
db 36, BLASTYKE
db 36, SEEL
db 37, BLASTYKE
db 37, SEEL
db 35, KRABBY
db 36, STARYU
db 36, KRABBY
db 38, JYNX
db 39, JYNX
db 39, BLASTOISE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

20
data/wild/maps/SeafoamIslandsB4F.asm
View file

@ -1,15 +1,15 @@
SeafoamIslandsB4FWildMons:
def_grass_wildmons 10 ; encounter rate
db 31, KRABBY
db 31, STARYU
db 33, KRABBY
db 33, STARYU
db 29, PSYDUCK
db 31, SEEL
db 31, PSYDUCK
db 29, SEEL
db 39, GOLDUCK
db 32, GOLBAT
db 37, WEIRDUCK
db 38, STARYU
db 37, SHELLDER
db 37, STARYU
db 38, SHELLDER
db 41, GOLDUCK
db 33, SQUIRTLE
db 38, BUU
db 39, BUU
db 40, WARTORTLE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate