thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding temporary warps to Faraway

Browse source 
Note that Faraway is still broken, the inner forest can't be accessed for some reason
This commit is contained in:
MementoMartha 2022-10-18 00:16:31 +01:00
parent 86f111e5d7
commit 87fdb46ede
18 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -131,7 +131,8 @@ Known Bugs
====
- Only portions of spinner tiles animate.
- Occasionally, menu text sets itself to scroll.
- Some sprites in the Celadon University area spawn bugged out.
- Some sprites in the Celadon University area spawn bugged out on certain emulators.
- Battling multiple of the trainers in Celadon University causes a crash when attempting to go to Route 16
Credits
====

11
constants/event_constants.asm
View file

@ -552,10 +552,6 @@
; S.S. Anne events
const_next $5C0
const_skip 4
; const_skip
; const EVENT_ENCOUNTERED_MEW
; const EVENT_FOUND_MEW
; const_skip
const EVENT_BEAT_SS_ANNE_5_TRAINER_0
const EVENT_BEAT_SS_ANNE_5_TRAINER_1
const_skip 26
@ -588,7 +584,7 @@
const_skip
const EVENT_BEAT_CROCKY
const_skip 7
const EVENT_BEAT_CACTUS
const EVENT_BEAT_MEW
const_skip 7
const EVENT_BEAT_MOLTRES
const_skip 7
@ -604,11 +600,6 @@
const EVENT_BEAT_CELADON_UNIVERSITY_OUTSIDE_TRAINER_3
const EVENT_BOUGHT_CUBONE
const EVENT_BOUGHT_DITTO
; , Faraway Island
const_next $650
const_skip
const EVENT_BEAT_MEW
; Victory Road 3F events
const_next $660

9
constants/hide_show_constants.asm
View file

@ -238,9 +238,10 @@ DEF SHOW EQU $15
const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2
const HS_ARTICUNO ; E3 X
const HS_CROCKY ; E4 X
const HS_MEW ; E5 X ; I am 90% sure there may be a bug involving getting the Old Sea Chart from Vermillion Dock here. Does that need to be here? Is Moltres positioned poorly?
const HS_MEW ; E5 X
const HS_MOLTRES ; E6 X
; const HS_CACTUS ; E7 X
const HS_POKEMON_MANSION_B2F_ITEM_1 ; E8?
const HS_POKEMON_MANSION_B2F_ITEM_2 ; E9?
; const HS_OMEGA ; E7 X
const HS_OLD_SEA_CHART ; E8 X
const HS_POKEMON_MANSION_B2F_ITEM_1 ; E9
const HS_POKEMON_MANSION_B2F_ITEM_2 ; EA
DEF NUM_HS_OBJECTS EQU const_value

13
data/maps/hide_show_data.asm
View file

@ -97,8 +97,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw VermilionDockHS ; may not be necessary now? old sea chart tho.
; dw NoHS swap if you need to remove the vermillion dock bit
dw VermilionDockHS
dw NoHS
dw SSAnne2FHS
dw NoHS
@ -118,12 +117,12 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw NoHS
dw FarawayIslandInsideHS
dw PokemonMansionB2FHS
dw NoHS
dw NoHS
dw NoHS
dw NoHS
dw ChampionsRoomHS
dw NoHS
dw NoHS
@ -569,13 +568,13 @@ SeafoamIslandsB4FHS:
db SEAFOAM_ISLANDS_B4F, $01, HIDE
db SEAFOAM_ISLANDS_B4F, $02, HIDE
db SEAFOAM_ISLANDS_B4F, $03, SHOW
VermilionDockHS: ; unsure if necessary
VermilionDockHS:
db VERMILION_DOCK, $01, SHOW
;db $FF, $01, SHOW
FarawayIslandInsideHS:
db FARAWAY_ISLAND_INSIDE, $01, HIDE ; if mew is fucking up this is why
db FARAWAY_ISLAND_INSIDE, $01, SHOW
PokemonMansionB2FHS:
db POKEMON_MANSION_B2F, $03, SHOW
db POKEMON_MANSION_B2F, $04, SHOW ; end
db POKEMON_MANSION_B2F, $04, SHOW
db $FF, $01, SHOW ; end
assert_table_length NUM_HS_OBJECTS + 1

4
data/maps/map_header_pointers.asm
View file

@ -115,8 +115,8 @@ MapHeaderPointers::
dw SilphGauntlet6F_h
dw SilphGauntlet7F_h
dw LancesRoom_h
dw FarawayIslandInside_h ; UNUSED_MAP_72
dw FarawayIslandOutside_h ; UNUSED_MAP_73
dw FarawayIslandOutside_h ; UNUSED_MAP_72
dw FarawayIslandInside_h ; UNUSED_MAP_73
dw PokemonMansionB2F_h ; UNUSED_MAP_74
dw LancesRoom_h ; UNUSED_MAP_75
dw HallOfFame_h

3
data/maps/names.asm
View file

@ -44,7 +44,7 @@ PokemonLeagueName: db "#MON LEAGUE@"
UndergroundPathName: db "UNDERGROUND PATH@"
PokemonTowerName: db "#MON TOWER@"
SeafoamIslandsName: db "SEAFOAM ISLANDS@"
CinnabarVolcanoName: db "CINNABAR VOLCANO@"
CinnabarVolcanoName: db "CINNABAR VOLCANO@"
VictoryRoadName: db "VICTORY ROAD@"
DiglettsCaveName: db "DIGLETT's CAVE@"
RocketHQName: db "ROCKET HQ@"
@ -53,3 +53,4 @@ PokemonMansionName: db "<PKMN> MANSION@"
SafariZoneName: db "SAFARI ZONE@"
CeruleanCaveName: db "CERULEAN CAVE@"
PowerPlantName: db "POWER PLANT@"
FarawayIslandName: db "FARAWAY ISLAND@"

6
data/maps/objects/FarawayIslandInside.asm
View file

@ -2,12 +2,12 @@ FarawayIslandInside_Object:
db $02 ; border block
def_warp_events
warp_event 14, 21, 0, FARAWAY_ISLAND_OUTSIDE
warp_event 15, 21, 0, FARAWAY_ISLAND_OUTSIDE
warp_event 14, 21, FARAWAY_ISLAND_OUTSIDE, 3
warp_event 15, 21, FARAWAY_ISLAND_OUTSIDE, 4
def_bg_events
object_event 14, 10, SPRITE_MONSTER, STAY, DOWN, 1, MEW, 50 | OW_POKEMON
def_object_events
object_event 15, 10, SPRITE_MONSTER, STAY, DOWN, 1, MEW, 30 | OW_POKEMON
def_warps_to FARAWAY_ISLAND_INSIDE

8
data/maps/objects/FarawayIslandOutside.asm
View file

@ -2,11 +2,13 @@ FarawayIslandOutside_Object:
db $02 ; border block
def_warp_events
warp_event 14, 6, 0, FARAWAY_ISLAND_INSIDE
warp_event 15, 6, 0, FARAWAY_ISLAND_INSIDE
warp_event 2, 29, VERMILION_CITY, 11
warp_event 3, 29, VERMILION_CITY, 10
warp_event 14, 6, FARAWAY_ISLAND_INSIDE, 1
warp_event 15, 6, FARAWAY_ISLAND_INSIDE, 2
def_bg_events
bg_event 2, 22, 10 ; Sign
bg_event 2, 22, 1 ; Sign
def_object_events

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

@ -11,6 +11,8 @@ VermilionCity_Object:
warp_event 19, 31, VERMILION_DOCK, 1
warp_event 15, 13, VERMILION_TRADE_HOUSE, 1
warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1
warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 2
warp_event 11, 31, FARAWAY_ISLAND_OUTSIDE, 1
def_bg_events
bg_event 27, 3, 7 ; VermilionCityText7
@ -29,6 +31,5 @@ VermilionCity_Object:
object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 14 ; person
object_event 11, 30, SPRITE_SAILOR, STAY, UP, 15 ; person
def_warps_to VERMILION_CITY

1
data/maps/objects/VermilionDock.asm
View file

@ -9,6 +9,5 @@ VermilionDock_Object:
def_object_events
object_event 22, 0, SPRITE_POKE_BALL, STAY, NONE, 2, OLDSEACHART
; object_event 21, 0, SPRITE_MONSTER, STAY, DOWN, 2, MEW, 30 | OW_POKEMON
def_warps_to VERMILION_DOCK

3
data/maps/town_map_entries.asm
View file

@ -79,6 +79,9 @@ InternalMapEntries:
internal_map SILPH_GAUNTLET_3F, 10, 5, SilphCoName
internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName
internal_map SILPH_GAUNTLET_7F, 10, 5, SilphCoName
internal_map LANCES_ROOM, 0, 2, PokemonLeagueName
internal_map FARAWAY_ISLAND_INSIDE, 17, 16, FarawayIslandName
internal_map POKEMON_MANSION_B2F, 2, 15, PokemonMansionName
internal_map HALL_OF_FAME, 0, 2, PokemonLeagueName
internal_map UNDERGROUND_PATH_NORTH_SOUTH, 10, 5, UndergroundPathName
internal_map CHAMPIONS_ROOM, 0, 2, PokemonLeagueName

3
data/maps/town_map_order.asm
View file

@ -20,6 +20,7 @@ TownMapOrder:
db ROUTE_9
db ROCK_TUNNEL_POKECENTER
db ROUTE_10
db POWER_PLANT
db LAVENDER_TOWN
db POKEMON_TOWER_2F
db ROUTE_8
@ -46,5 +47,5 @@ TownMapOrder:
db ROUTE_23
db VICTORY_ROAD_3F
db INDIGO_PLATEAU
db POWER_PLANT
db FARAWAY_ISLAND_OUTSIDE
TownMapOrderEnd:

2
engine/gfx/palettes.asm
View file

@ -190,7 +190,7 @@ SetPal_Overworld:
xor a
jr .town
.seafoam
ld a, PAL_0F - 1
ld a, PAL_CYANMON - 1
jr .town
.volcano
ld a, PAL_REDMON - 1

BIN
gfx/pokemon/back/articunogb.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 543 B

BIN
gfx/town_map/town_map.rle
View file

Binary file not shown.

2
maps/FarawayIslandInside.blk
View file

@ -1 +1 @@
Z[  ((b (bb((b \R (% \RZ[((%b(Z[02 (((Z[((( 02Y
\QR ((((b bb(((b \R  \RZ[(b(Z[02 (((Z[(( 02Y

2
maps/UnderwaterTunnel.blk
View file

@ -1 +1 @@
,+'vvvvvvvv( !!!!!"
}v|_vvvv_}v_vvvv}vf+vvvvvMvvvfvvvt}v+,-vvvvvv+vvvvvvvvv|-vvvMv-vvvvQQvvvr

2
maps/VermilionCity.blk
View file

@ -1 +1 @@
CCC ! ! !1 !11111111Ckk|~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCCCCCTTTTTTTC-gCCCCCCCCTxxxxxxCCCkkkkkkkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTCCCCCCCCCC
CCC ! ! !1 !11111111Ckk|~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCTCCCTCCCCCCCCCC