thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-05 05:00:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

progress is progress

Browse source 
Bug fixes and new sprites mostly, just trying to do what I can, when I can.
This commit is contained in:
Martha Schilling 2023-11-28 12:33:01 +00:00
parent 6504863b28
commit f6b1c94c0c
28 changed files with 70 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
constants/map_constants.asm
View file

@ -131,7 +131,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const SILPH_GAUNTLET_2F, 13, 10 ; $6C - Was UNUSED_MAP_6A
map_const SILPH_GAUNTLET_3F, 17, 13 ; $6D - Was UNUSED_MAP_6B
map_const VICTORY_ROAD_1F, 10, 9 ; $6E
map_const SILPH_GAUNTLET_4F, 10, 9 ; $6F - Was UNUSED_MAP_6D
map_const BRUNSWICK_GROTTO, 15, 12 ; $6F - Was UNUSED_MAP_6D
map_const SILPH_GAUNTLET_5F, 10, 9 ; $70 - Was UNUSED_MAP_6E
map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F
map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70
@ -166,9 +166,9 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const LAVENDER_POKECENTER, 7, 4 ; $8F
map_const POKEMON_TOWER_1F, 10, 9 ; $90
map_const POKEMON_TOWER_2F, 10, 9 ; $91
map_const BRUNSWICK_GROTTO, 15, 12 ; $92 - Was Pokemon Tower 3F
map_const SILPH_GAUNTLET_4F, 10, 9 ; $92 - Was Pokemon Tower 3F
map_const CELESTE_HILL_GATE, 5, 4 ; $93 - Was Pokemon Tower 4F
map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused
map_const POKEMON_TOWER_5F, 10, 9 ; $94
map_const POKEMON_TOWER_6F, 10, 9 ; $95
map_const POKEMON_TOWER_7F, 10, 9 ; $96
map_const MR_FUJIS_HOUSE, 4, 4 ; $97
@ -252,28 +252,28 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const NAME_RATERS_HOUSE, 4, 4 ; $E6
map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7
map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7
map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $F8 - Switched with ROCK_TUNNEL_B1F
map_const SILPH_CO_9F, 13, 9 ; $EA
map_const SILPH_CO_10F, 8, 9 ; $EB
map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $E9 - Switched with ROCK_TUNNEL_B1F
map_const SILPH_CO_9F, 13, 9 ; $EA (now goes unused)
map_const SILPH_CO_10F, 8, 9 ; $EB (now goes unused)
map_const SILPH_CO_11F, 9, 9 ; $EC
map_const SILPH_CO_ELEVATOR, 2, 2 ; $ED
map_const FARAWAY_FERRY_DOCK, 14, 6 ; $ED - was SILPH_CO_ELEVATOR
map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED
map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE
map_const TRADE_CENTER, 5, 4 ; $F0
map_const COLOSSEUM, 5, 4 ; $F1
map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F2 - Was UNUSED_MAP_F1
map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F3 - Was UNUSED_MAP_F2
map_const LORELEIS_ROOM, 5, 6 ; $F5
map_const BRUNOS_ROOM, 5, 6 ; $F6
map_const AGATHAS_ROOM, 5, 6 ; $F7
map_const ROCK_TUNNEL_B1F, 20, 18 ; $F8 - Switched with CINNABAR_VOLCANO_FLOORS
map_const GIOVANNIS_ROOM, 11, 14 ; $F9
map_const BATTLE_TENT, 5, 10 ; $FA
map_const MT_MOON_SQUARE, 13, 7 ; $FB
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FC
map_const CELESTE_HILL_CAVE, 20, 18 ; $FD
map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FE
map_const BRUNSWICK_GLADE, 19, 20 ; $FE should be this, i cut silph 8f before this but never updated the $s.
map_const LORELEIS_ROOM, 5, 6 ; $F4
map_const BRUNOS_ROOM, 5, 6 ; $F5
map_const AGATHAS_ROOM, 5, 6 ; $F6
map_const ROCK_TUNNEL_B1F, 20, 18 ; $F7 - Switched with CINNABAR_VOLCANO_FLOORS
map_const GIOVANNIS_ROOM, 11, 14 ; $F8
map_const BATTLE_TENT, 5, 10 ; $F9
map_const MT_MOON_SQUARE, 13, 7 ; $FA
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB
map_const CELESTE_HILL_CAVE, 20, 18 ; $FC
map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FD
map_const BRUNSWICK_GLADE, 19, 20 ; $FE
DEF NUM_MAPS EQU const_value
; Indoor maps, such as houses, use this as the Map ID in their exit warps

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

@ -1,2 +1,2 @@
map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SHIP_PORT, 0
map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SEAGALLOPPORT, 0
end_map_header

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

@ -0,0 +1,2 @@
map_header FarawayFerryDock, FARAWAY_FERRY_DOCK, SEAGALLOPPORT, 0
end_map_header

4
data/maps/hide_show_data.asm
View file

@ -115,7 +115,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw VictoryRoad1FHS
dw NoHS
dw BrunswickGrottoHS
dw NoHS
dw NoHS
dw NoHS
@ -150,7 +150,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw PokemonTower2FHS
dw BrunswickGrottoHS
dw NoHS
dw NoHS
dw PokemonTower5FHS
dw PokemonTower6FHS

6
data/maps/map_header_banks.asm
View file

@ -113,7 +113,7 @@ MapHeaderBanks::
db BANK(SilphGauntlet2F_h)
db BANK(SilphGauntlet3F_h)
db BANK(VictoryRoad1F_h)
db BANK(SilphGauntlet4F_h)
db BANK(BrunswickGrotto_h)
db BANK(SilphGauntlet5F_h)
db BANK(SilphGauntlet6F_h)
db BANK(SilphGauntlet7F_h)
@ -148,7 +148,7 @@ MapHeaderBanks::
db BANK(LavenderPokecenter_h)
db BANK(PokemonTower1F_h)
db BANK(PokemonTower2F_h)
db BANK(BrunswickGrotto_h)
db BANK(SilphGauntlet4F_h)
db BANK(CelesteHillGate_h) ; was pokemon tower 4f
db BANK(PokemonTower5F_h)
db BANK(PokemonTower6F_h)
@ -238,7 +238,7 @@ MapHeaderBanks::
db BANK(SilphCo9F_h)
db BANK(SilphCo10F_h)
db BANK(SilphCo11F_h)
db BANK(SilphCoElevator_h)
db BANK(FarawayFerryDock_h)
db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED
db BANK(UnderwaterTunnel_h) ; UNUSED_MAP_EE
db BANK(TradeCenter_h)

6
data/maps/map_header_pointers.asm
View file

@ -113,7 +113,7 @@ MapHeaderPointers::
dw SilphGauntlet2F_h
dw SilphGauntlet3F_h
dw VictoryRoad1F_h
dw SilphGauntlet4F_h
dw BrunswickGrotto_h
dw SilphGauntlet5F_h
dw SilphGauntlet6F_h
dw SilphGauntlet7F_h
@ -148,7 +148,7 @@ MapHeaderPointers::
dw LavenderPokecenter_h
dw PokemonTower1F_h
dw PokemonTower2F_h
dw BrunswickGrotto_h
dw SilphGauntlet4F_h
dw CelesteHillGate_h ; was pokemon tower 4f
dw PokemonTower5F_h
dw PokemonTower6F_h
@ -238,7 +238,7 @@ MapHeaderPointers::
dw SilphCo9F_h
dw SilphCo10F_h
dw SilphCo11F_h
dw SilphCoElevator_h
dw FarawayFerryDock_h
dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f
dw UnderwaterTunnel_h ; UNUSED_MAP_EE
dw TradeCenter_h

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

@ -1,9 +1,9 @@
CitrineFerryDock_Object:
db $f ; border block
db $15 ; border block
def_warp_events
warp_event 14, 0, CITRINE_CITY, 7
warp_event 14, 2, SEAGALLOP_FERRY, 1
warp_event 14, 5, SEAGALLOP_FERRY, 1
def_bg_events

12
data/maps/objects/FarawayFerryDock.asm Normal file
View file

@ -0,0 +1,12 @@
FarawayFerryDock_Object:
db $15 ; border block
def_warp_events
warp_event 14, 0, FARAWAY_ISLAND_OUTSIDE, 1
warp_event 14, 5, SEAGALLOP_FERRY, 1
def_bg_events
def_object_events
def_warps_to FARAWAY_FERRY_DOCK

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

@ -2,8 +2,8 @@ FarawayIslandOutside_Object:
db $2d ; border block
def_warp_events
warp_event 6, 35, SEAGALLOP_FERRY, 1
warp_event 7, 35, SEAGALLOP_FERRY, 1
warp_event 6, 35, FARAWAY_FERRY_DOCK, 1
warp_event 7, 35, FARAWAY_FERRY_DOCK, 1
warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1
warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2

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

@ -1,5 +1,5 @@
VermilionFerryDock_Object:
db $13 ; border block
db $15 ; border block
def_warp_events
warp_event 14, 0, LAST_MAP, 9

6
data/maps/songs.asm
View file

@ -112,7 +112,7 @@ MapSongBanks::
db MUSIC_DUNGEON3, 0 ; SILPH_GAUNTLET_2F
db MUSIC_SS_ANNE, 0 ; SILPH_GAUNTLET_3F
db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F
db MUSIC_POKEMON_TOWER, 0 ; SILPH_GAUNTLET_4F
db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO
db MUSIC_SAFARI_ZONE, 0 ; SILPH_GAUNTLET_5F
db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_6F
db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_7F
@ -147,7 +147,7 @@ MapSongBanks::
db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F
db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO
db MUSIC_POKEMON_TOWER, 0 ; BRUNSWICK_GROTTO
db MUSIC_FIELD06, 0 ; CELESTE_HILL_GATE
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F
@ -237,7 +237,7 @@ MapSongBanks::
db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR
db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F
db MUSIC_DUNGEON2, 0 ; UNDERWATER_TUNNEL
db MUSIC_CITRINE, 0 ; TRADE_CENTER

7
data/maps/town_map_entries.asm
View file

@ -83,6 +83,7 @@ InternalMapEntries:
internal_map SS_ANNE_B1F_ROOMS, 9, 10, SSAnneName
internal_map SILPH_GAUNTLET_3F, 10, 5, SilphCoName
internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName
internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName
internal_map SILPH_GAUNTLET_7F, 10, 5, SilphCoName
internal_map LANCES_ROOM, 0, 2, PokemonLeagueName
internal_map FARAWAY_ISLAND_INSIDE, 15, 15, FarawayIslandName
@ -95,7 +96,8 @@ InternalMapEntries:
internal_map CELADON_HOTEL, 7, 5, CeladonCityName
internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName
internal_map POKEMON_TOWER_2F, 15, 5, PokemonTowerName
internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName
internal_map SILPH_GAUNTLET_4F, 10, 5, SilphCoName
internal_map CELESTE_HILL_GATE, 7, 9, CelesteHillName
internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName
internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName
internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName
@ -133,7 +135,8 @@ InternalMapEntries:
internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName
internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName
internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName
internal_map SILPH_CO_11F, 10, 5, SilphCoName
internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName
internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName
internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName

4
data/wild/grass_water.asm
View file

@ -112,7 +112,7 @@ WildDataPointers:
dw Gauntlet2FWildMons
dw Gauntlet3FWildMons
dw VictoryRoad1FWildMons
dw Gauntlet4FWildMons
dw BrunswickGrottoWildMons
dw Gauntlet5FWildMons
dw Gauntlet6FWildMons
dw NothingWildMons
@ -147,7 +147,7 @@ WildDataPointers:
dw NothingWildMons
dw PokemonTower1FWildMons
dw PokemonTower2FWildMons
dw BrunswickGrottoWildMons
dw Gauntlet4FWildMons
dw NothingWildMons
dw PokemonTower5FWildMons
dw PokemonTower6FWildMons

2
engine/gfx/palettes.asm
View file

@ -178,6 +178,8 @@ SetPal_Overworld:
jp z, .faraway
cp FARAWAY_ISLAND_INSIDE
jp z, .faraway
cp FARAWAY_FERRY_DOCK
jp z, .faraway
cp SILPH_GAUNTLET_1F
jp z, .faraway
cp CELESTE_HILL_OUTSIDE

4
engine/overworld/ferry_script.asm
View file

@ -143,8 +143,8 @@ DoIslandMenu:
jr .islandSelected
.choseFarawayIsland
ld b, 0
ld c, FARAWAY_ISLAND_OUTSIDE
ld b, 1
ld c, FARAWAY_FERRY_DOCK
jr .islandSelected
.choseCitrineCity

BIN
gfx/blocksets/seagallop_port.bst
View file

Binary file not shown.

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 637 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 477 B

After

Width:  |  Height:  |  Size: 613 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 462 B

After

Width:  |  Height:  |  Size: 604 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 537 B

After

Width:  |  Height:  |  Size: 582 B

BIN
gfx/pokemon/front/mew.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 758 B

BIN
gfx/pokemon/front/porygon.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 746 B

BIN
gfx/pokemon/front/slowpoke.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 313 B

After

Width:  |  Height:  |  Size: 680 B

8
maps.asm
View file

@ -313,10 +313,10 @@ INCLUDE "scripts/RocketHideoutElevator.asm"
INCLUDE "data/maps/objects/RocketHideoutElevator.asm"
RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk"
INCLUDE "data/maps/headers/SilphCoElevator.asm"
INCLUDE "scripts/SilphCoElevator.asm"
INCLUDE "data/maps/objects/SilphCoElevator.asm"
SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk"
INCLUDE "data/maps/headers/FarawayFerryDock.asm"
INCLUDE "scripts/FarawayFerryDock.asm"
INCLUDE "data/maps/objects/FarawayFerryDock.asm"
FarawayFerryDock_Blocks: INCBIN "maps/FarawayFerryDock.blk"
INCLUDE "data/maps/headers/SafariZoneEast.asm"
INCLUDE "scripts/SafariZoneEast.asm"

BIN
maps/CitrineFerryDock.blk
View file

Binary file not shown.

BIN
maps/FarawayFerryDock.blk Normal file
View file

Binary file not shown.

BIN
maps/VermilionFerryDock.blk
View file

Binary file not shown.

6
scripts/FarawayFerryDock.asm Normal file
View file

@ -0,0 +1,6 @@
FarawayFerryDock_Script:
jp EnableAutoTextBoxDrawing
FarawayFerryDock_TextPointers:
text_end