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

Celeste Hill Gate & other things

Browse source 
- New Celeste Hill Gate location so the entrance into the location makes more sense. Also took the opportunity to include more lore. This replaces Pokemon Tower 4F.
- Fixed a bug that caused the Cat icon to not animate correctly.
- Made the infinite Nugget glitch work properly because I was stupid and didn't test it.
- Luxwan now uses the Small Bird icon to fit with the rest of the line.
- Nidoreign has a new Pokedex entry and classification, centred on the Nido's origins in the Moon Rabbit of Asian mythology.
This commit is contained in:
Llinos Evans 2023-09-20 17:02:09 +01:00
parent 953e8e295f
commit 63a28e410c
34 changed files with 118 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -0,0 +1,2 @@
map_header CelesteHillGate, CELESTE_HILL_GATE, GATE, 0
end_map_header

2
data/maps/headers/PokemonTower4F.asm
View file

@ -1,2 +0,0 @@
map_header PokemonTower4F, POKEMON_TOWER_4F, CEMETERY, 0
end_map_header

2
data/maps/map_header_banks.asm
View file

@ -149,7 +149,7 @@ MapHeaderBanks::
db BANK(PokemonTower1F_h)
db BANK(PokemonTower2F_h)
db BANK(BrunswickGrotto_h)
db BANK(PokemonTower4F_h)
db BANK(CelesteHillGate_h) ; was pokemon tower 4f
db BANK(PokemonTower5F_h)
db BANK(PokemonTower6F_h)
db BANK(PokemonTower7F_h)

2
data/maps/map_header_pointers.asm
View file

@ -149,7 +149,7 @@ MapHeaderPointers::
dw PokemonTower1F_h
dw PokemonTower2F_h
dw BrunswickGrotto_h
dw PokemonTower4F_h
dw CelesteHillGate_h ; was pokemon tower 4f
dw PokemonTower5F_h
dw PokemonTower6F_h
dw PokemonTower7F_h

17
data/maps/objects/CelesteHillGate.asm Normal file
View file

@ -0,0 +1,17 @@
CelesteHillGate_Object:
db $a ; border block
def_warp_events
warp_event 4, 0, CELESTE_HILL_OUTSIDE, 1
warp_event 5, 0, CELESTE_HILL_OUTSIDE, 2
warp_event 4, 7, CITRINE_CITY, 5
warp_event 5, 7, CITRINE_CITY, 5
def_bg_events
def_object_events
object_event 8, 4, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person
object_event 1, 4, SPRITE_YOUNGSTER, STAY, NONE, 2 ; person
object_event 1, 5, SPRITE_SMALL_BIRD, WALK, ANY_DIR, 3 ; person
def_warps_to CELESTE_HILL_GATE

4
data/maps/objects/CelesteHillOutside.asm
View file

@ -2,8 +2,8 @@ CelesteHillOutside_Object:
db $2 ; border block
def_warp_events
warp_event 18, 35, CITRINE_CITY, 5
warp_event 19, 35, CITRINE_CITY, 5
warp_event 18, 35, CELESTE_HILL_GATE, 1
warp_event 19, 35, CELESTE_HILL_GATE, 2
warp_event 16, 23, CELESTE_HILL_CAVE, 1
warp_event 36, 11, CELESTE_HILL_CAVE, 5
warp_event 2, 9, CELESTE_HILL_CAVE, 6

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

@ -6,7 +6,7 @@ CitrineCity_Object:
warp_event 9, 17, CITRINE_TRADEBACK_HOUSE, 1
warp_event 15, 17, CITRINE_POKECENTER, 1
warp_event 15, 27, CITRINE_MART, 1
warp_event 23, 5, CELESTE_HILL_OUTSIDE, 1
warp_event 23, 5, CELESTE_HILL_GATE, 4
warp_event 11, 7, BATTLE_TENT, 1
warp_event 26, 31, CITRINE_FERRY_DOCK, 1
warp_event 27, 31, CITRINE_FERRY_DOCK, 1

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

@ -3,7 +3,7 @@ PokemonTower3F_Object:
def_warp_events
warp_event 18, 9, POKEMON_TOWER_2F, 1
warp_event 3, 9, POKEMON_TOWER_4F, 2
;warp_event 3, 9, POKEMON_TOWER_4F, 2
def_bg_events

18
data/maps/objects/PokemonTower4F.asm
View file

@ -1,18 +0,0 @@
PokemonTower4F_Object:
db $1 ; border block
def_warp_events
warp_event 3, 9, POKEMON_TOWER_5F, 1
;warp_event 18, 9, POKEMON_TOWER_3F, 2
def_bg_events
def_object_events
object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9
object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10
object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 12
; object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, 4, ELIXER
; object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING
; object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, 6, HP_UP
def_warps_to POKEMON_TOWER_4F

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

@ -2,7 +2,7 @@ PokemonTower5F_Object:
db $1 ; border block
def_warp_events
warp_event 3, 9, POKEMON_TOWER_4F, 1
; warp_event 3, 9, POKEMON_TOWER_4F, 1
warp_event 18, 9, POKEMON_TOWER_6F, 1
def_bg_events

2
data/maps/songs.asm
View file

@ -149,7 +149,7 @@ MapSongBanks::
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F
db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO
;db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_4F
db MUSIC_FIELD06, 0 ; Celeste Hill Gate, was POKEMON_TOWER_4F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_7F