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

Town Map and PC stuff

Browse source
This commit is contained in:
MementoMartha 2022-09-28 13:43:17 +01:00
parent 28b5d01e08
commit f9d86cdde9
11 changed files with 41 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/hide_show_constants.asm
View file

@ -240,5 +240,5 @@ DEF SHOW EQU $15
const HS_CROCKY ; E4 X
const HS_MEW ; E5 X
const HS_MOLTRES ; E6 X
const HS_CACTUS ; E7 X
; const HS_CACTUS ; E7 X
DEF NUM_HS_OBJECTS EQU const_value

1
data/events/bench_guys.asm
View file

@ -17,4 +17,5 @@ BenchGuyTextPointers:
bench_guy_text SAFFRON_POKECENTER, SPRITE_FACING_LEFT, SaffronCityPokecenterBenchGuyText
bench_guy_text MT_MOON_POKECENTER, SPRITE_FACING_LEFT, MtMoonPokecenterBenchGuyText
bench_guy_text ROCK_TUNNEL_POKECENTER, SPRITE_FACING_LEFT, RockTunnelPokecenterBenchGuyText
bench_guy_text CELADON_UNIVERSITY_POKECENTER, SPRITE_FACING_LEFT, CeladonUniversityPokecenterBenchGuyText
db -1 ; end

7
data/events/hidden_objects.asm
View file

@ -84,6 +84,7 @@ HiddenObjectMaps:
db VERMILION_CITY
db CERULEAN_CITY
db ROUTE_4
db CELADON_UNIVERSITY_POKECENTER
db -1 ; end
HiddenObjectPointers:
@ -173,6 +174,7 @@ HiddenObjectPointers:
dw VermilionCityHiddenObjects
dw CeruleanCityHiddenObjects
dw Route4HiddenObjects
dw CeladonUniversityPokecenterHiddenObjects
MACRO hidden_object
db \2 ; y coord
@ -666,3 +668,8 @@ CeruleanCityHiddenObjects:
Route4HiddenObjects:
hidden_object 40, 3, GREAT_BALL, HiddenItems
db -1 ; end
CeladonUniversityPokecenterHiddenObjects:
hidden_object 0, 4, SPRITE_FACING_UP, PrintBenchGuyText
hidden_object 13, 3, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1 ; end

2
data/maps/names.asm
View file

@ -9,6 +9,7 @@ FuchsiaCityName: db "FUCHSIA CITY@"
CinnabarIslandName: db "CINNABAR ISLAND@"
IndigoPlateauName: db "INDIGO PLATEAU@"
SaffronCityName: db "SAFFRON CITY@"
CitrineCityName: db "CITRINE CITY@"
Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@"
@ -43,6 +44,7 @@ PokemonLeagueName: db "#MON LEAGUE@"
UndergroundPathName: db "UNDERGROUND PATH@"
PokemonTowerName: db "#MON TOWER@"
SeafoamIslandsName: db "SEAFOAM ISLANDS@"
CinnabarVolcanoName: db "CINNABAR VOLCANO@"
VictoryRoadName: db "VICTORY ROAD@"
DiglettsCaveName: db "DIGLETT's CAVE@"
RocketHQName: db "ROCKET HQ@"

6
data/maps/town_map_entries.asm
View file

@ -18,7 +18,7 @@ ExternalMapEntries:
external_map 2, 15, CinnabarIslandName
external_map 0, 2, IndigoPlateauName
external_map 10, 5, SaffronCityName
external_map 0, 0, PalletTownName ; unused
external_map 7, 10, CitrineCityName
external_map 2, 10, Route1Name
external_map 2, 6, Route2Name
external_map 4, 3, Route3Name
@ -112,8 +112,12 @@ InternalMapEntries:
internal_map SAFARI_ZONE_NORTH_REST_HOUSE, 8, 12, SafariZoneName
internal_map CERULEAN_CAVE_1F, 9, 1, CeruleanCaveName
internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName
internal_map CINNABAR_VOLCANO, 3, 14, CinnabarVolcanoName
internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName
internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName
internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName
internal_map CELADON_UNIVERSITY_OUTSIDE, 7, 4, CeladonCityName
internal_map CELADON_UNIVERSITY_INSIDE, 7, 4, CeladonCityName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonCityName
internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName
db -1 ; end

1
data/maps/town_map_order.asm
View file

@ -40,6 +40,7 @@ TownMapOrder:
db SEAFOAM_ISLANDS_B1F
db ROUTE_20
db CINNABAR_ISLAND
db CINNABAR_VOLCANO
db ROUTE_21
db ROUTE_22
db ROUTE_23

2
data/pokemon/cries.asm
View file

@ -212,5 +212,5 @@ CryData::
mon_cry SFX_CRY_00, $00, $00 ; Steelix
mon_cry SFX_CRY_00, $00, $00 ; Blissey
mon_cry SFX_CRY_1D, $E3, $1A ; Hitmontop
mon_cry SFX_CRY_1D, $08, $B1 ; Crobat
mon_cry SFX_CRY_1D, $01, $B1 ; Crobat
assert_table_length NUM_POKEMON_INDEXES

2
data/text_predef_pointers.asm
View file

@ -30,7 +30,7 @@ TextPredefs::
add_tx_pre SaffronCityPokecenterBenchGuyText ; 18
add_tx_pre MtMoonPokecenterBenchGuyText ; 19
add_tx_pre RockTunnelPokecenterBenchGuyText ; 1A
add_tx_pre UnusedBenchGuyText1 ; 1B XXX unused
add_tx_pre CeladonUniversityPokecenterBenchGuyText1 ; 1B
add_tx_pre UnusedBenchGuyText2 ; 1C XXX unused
add_tx_pre UnusedBenchGuyText3 ; 1D XXX unused
add_tx_pre UnusedPredefText ; 1E XXX unused

28
data/trainers/parties.asm
View file

@ -535,11 +535,11 @@ ScientistData:
GiovanniData:
; Rocket Hideout B4F
db $FF, 25, ONIX, 24, RHYHORN, 29, KANGASKHAN, 0
db $FF, 27, RHYHORN, 26, DECILLA, 31, KANGASKHAN, 31, PERSIAN, 0
; Silph Co. 11F
db $FF, 37, NIDORINO, 35, KANGASKHAN, 37, RHYHORN, 41, NIDOQUEEN, 0
db $FF, 37, KANGASKHAN, 36, NIDORINO, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 0
; Viridian Gym
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYDON, 0
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, PERSIAN, 48, NIDOKING, 50, RHYPERIOR, 0
RocketData:
; Mt. Moon B2F
@ -638,28 +638,42 @@ CooltrainerFData:
db 43, PERSIAN, NINETALES, RAICHU, 0
BrunoData:
db $FF, 54, PRIMEAPE, 55, ONIX, 55, POLIWRATH, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0
db $FF, 54, PRIMEAPE, 55, STEELIX, 55, POLIWRATH, 56, HITMONTOP, 56, PURAKKUSU, 58, MACHAMP, 0
BrockData:
db $FF, 13, GEODUDE, 12, OMANYTE, 12, KABUTO, 12, DECILLA, 15, ONIX, 0
; post-game rematch team (currently unused)
; db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, KLEAVOR, 67, NIDOREIGN, 70, GYAOON, 0
MistyData:
db $FF, 19, HORSEA, 18, CHEEP, 18, BLOTTLE, 19, BLASTYKE, 21, STARMIE, 0
; post-game rematch team (currently unused)
; db $FF, 66, GOLDUCK, 67, PENDRAKEN, 67, JABETTA, 66, JAGG, 67, BLASTOISE, 70, STARMIE, 0
LtSurgeData:
db $FF, 22, VOLTORB, 21, GAOTORA, 22, MAGNEMITE, 23, ELECTABUZZ, 24, GOROCHU, 0
; post-game rematch team (currently unused)
; db $FF, 66, ELECTABUZZ, 67, GOROTORA, 67, ELECTRODE, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0
ErikaData:
db $FF, 28, WEEPINBELL, 29, TANGELA, 28, CACTUS, 28, PARASECT, 31, VILEPLUME, 0
db $FF, 28, WEEPINBELL, 28, GLOOM, 29, CACTUS, 28, PARASECT, 31, TANGROWTH, 0
; post-game rematch team (currently unused)
; db $FF, 66, CACTUS, 67, VILEPLUME, 67, VICTREEBEL, 66, DEER, 67, LEAFEON, 70, TANGROWTH, 0
KogaData:
db $FF, 38, GOLBAT, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 41, WEEZING, 0
db $FF, 39, VENOMOTH, 38, NIDOREIGN, 39, MUK, 39, WEEZING, 41, CROBAT, 0
; post-game rematch team (currently unused)
; db $FF, 66, TENTACRUEL, 67, MUK, 67, WEEZING, 66, VENOMOTH, 67, TSUBOMITTO, 70, CROBAT, 0
BlaineData:
db $FF, 45, MAGMAR, 44, NINETALES, 45, RAPIDASH, 44, FLAREON, 47, ARCANINE, 0
; post-game rematch team (currently unused)
; db $FF, 66, MAGMAR, 67, NINETALES, 67, RAPIDASH, 66, FLAREON, 67, ARCANINE, 70, MOLTRES, 0
SabrinaData:
db $FF, 39, HYPNO, 40, MR_MIME, 39, SLOWBRO, 40, JYNX, 43, ALAKAZAM, 0
; post-game rematch team (currently unused)
; db $FF, 66, MR_MIME, 67, HYPNO, 67, JYNX, 66, SLOWBRO, 67, EXEGGUTOR, 70, ALAKAZAM, 0
GentlemanData:
; SS Anne 1F Rooms
@ -738,7 +752,7 @@ ChannelerData:
db 33, GASTLY, GASTLY, HAUNTER, 0
AgathaData:
db $FF, 57, GENGAR, 56, GOLBAT, 56, HAUNTER, 58, CROAKOZUNA, 58, ARBOK, 60, GENGAR, 0
db $FF, 57, CROAKOZUNA, 56, CROBAT, 56, TSUBOMITTO, 58, UMBREON, 58, ARBOK, 60, GENGAR, 0
LanceData:
db $FF, 58, CROCKY, 57, GYARADOS, 57, AERODACTYL, 59, CRYITHAN, 59, CHARIZARD, 62, DRAGONITE, 0

2
engine/events/hidden_objects/bench_guys.asm
View file

@ -47,7 +47,7 @@ RockTunnelPokecenterBenchGuyText::
text_far _RockTunnelPokecenterGuyText
text_end
UnusedBenchGuyText1::
CeladonUniversityPokecenterBenchGuyText::
text_far _UnusedBenchGuyText1
text_end

BIN
gfx/town_map/town_map.rle
View file

Binary file not shown.