thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 10:23:34 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few updates

Browse source 
- Changes Bill's Garden to be a more fitting Overworld-tileset map

- Gives Cinnabar Volcano a unique palette, being a slightly less-bright version of the RedMon palette

- A few small changes/improvements to the Rival teams

- Reduced wild encounter levels in Silph Gauntlet a little

- Adds a 100% chance for a Magmar encounter when fishing in the Cinnabar Volcano lava

- Hides more 'secret' areas off the Pokedex area listing, namely Mt. Moon Crater and Faraway Island

- Improves Jabetta's sprite a little
This commit is contained in:
MementoMartha 2023-05-19 16:17:44 +01:00
parent 9a88543f19
commit b70e7b5fb5
29 changed files with 200 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
constants/map_constants.asm
View file

@ -57,6 +57,7 @@ DEF FIRST_ROUTE_MAP EQU const_value
map_const ROUTE_24, 10, 18 ; $24
map_const ROUTE_25, 37, 9 ; $25
map_const BRUNSWICK_TRAIL, 32, 14 ; $26 - was unused Cinnabar Mart copy, moved to $26
map_const BILLS_GARDEN, 12, 12 ; $27 - was UNUSED_MAP_F3, moved to $27
DEF FIRST_INDOOR_MAP EQU const_value
map_const REDS_HOUSE_1F, 4, 4 ; $27
map_const REDS_HOUSE_2F, 4, 4 ; $28
@ -252,7 +253,7 @@ 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 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 SILPH_CO_11F, 9, 9 ; $EC
@ -263,14 +264,13 @@ DEF FIRST_INDOOR_MAP EQU const_value
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 BILLS_GARDEN, 10, 10 ; $F4 - Was UNUSED_MAP_F3
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 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
DEF NUM_MAPS EQU const_value

3
constants/palette_constants.asm
View file

@ -72,7 +72,8 @@ DEF SET_PAL_DEFAULT EQU $ff
const PAL_BADGE ; $24
const PAL_CAVE ; $25
const PAL_GAMEFREAK ; $26
const PAL_CELESTE ; $27
const PAL_CELESTE ; $27
const PAL_GARNET ; $28
const PAL_BRUNSWICK ; $29
const PAL_VOLCANO ; $2A
DEF NUM_SGB_PALS EQU const_value

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

@ -1,2 +1,2 @@
map_header BillsGarden, BILLS_GARDEN, FOREST, 0
map_header BillsGarden, BILLS_GARDEN, OVERWORLD, 0
end_map_header

2
data/maps/hide_show_data.asm
View file

@ -44,6 +44,7 @@ MapHSPointers:
dw BrunswickTrailHS
dw NoHS
dw NoHS
dw NoHS
dw BluesHouseHS
dw OaksLabHS
dw NoHS
@ -251,7 +252,6 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw NoHS
dw GiovannisRoomHS
dw NoHS ; Battle Tent
dw NoHS ; Mt Moon Square

2
data/maps/map_header_banks.asm
View file

@ -40,6 +40,7 @@ MapHeaderBanks::
db BANK(Route24_h)
db BANK(Route25_h)
db BANK(BrunswickTrail_h) ; was cinnabar mart copy
db BANK(BillsGarden_h) ; UNUSED_MAP_F3, $11
db BANK(RedsHouse1F_h)
db BANK(RedsHouse2F_h)
db BANK(BluesHouse_h)
@ -245,7 +246,6 @@ MapHeaderBanks::
db BANK(Colosseum_h)
db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F1
db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F2
db BANK(BillsGarden_h) ; UNUSED_MAP_F3, $11
db BANK(LoreleisRoom_h)
db BANK(BrunosRoom_h)
db BANK(AgathasRoom_h)

2
data/maps/map_header_pointers.asm
View file

@ -40,6 +40,7 @@ MapHeaderPointers::
dw Route24_h
dw Route25_h
dw BrunswickTrail_h ; CINNABAR_MART_COPY
dw BillsGarden_h ; UNUSED_MAP_F3, used to use SilphCo2F_h
dw RedsHouse1F_h
dw RedsHouse2F_h
dw BluesHouse_h
@ -245,7 +246,6 @@ MapHeaderPointers::
dw Colosseum_h
dw CeladonUniversityInside_h ; UNUSED_MAP_F1
dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F2
dw BillsGarden_h ; UNUSED_MAP_F3, used to use SilphCo2F_h
dw LoreleisRoom_h
dw BrunosRoom_h
dw AgathasRoom_h

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

@ -1,9 +1,9 @@
BillsGarden_Object:
db $0 ; border block
db $2c ; border block
def_warp_events
warp_event 8, 19, BILLS_HOUSE, 1
warp_event 9, 19, BILLS_HOUSE, 1
warp_event 11, 17, BILLS_HOUSE, 3
warp_event 12, 17, BILLS_HOUSE, 3
def_bg_events

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

@ -8,9 +8,9 @@ CinnabarVolcanoFloors_Object:
warp_event 25, 3, CINNABAR_VOLCANO_FLOORS, 3
warp_event 27, 12, CINNABAR_VOLCANO_FLOORS, 6
warp_event 5, 13, CINNABAR_VOLCANO_FLOORS, 5
warp_event 3, 3, CINNABAR_VOLCANO_FLOORS, 8
warp_event 3, 25, CINNABAR_VOLCANO_FLOORS, 7
warp_event 15, 25, CINNABAR_VOLCANO, 1
warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8
warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7
warp_event 13, 25, CINNABAR_VOLCANO, 1
def_bg_events

2
data/maps/songs.asm
View file

@ -39,6 +39,7 @@ MapSongBanks::
db MUSIC_ROUTES2, 0 ; ROUTE_24
db MUSIC_ROUTES2, 0 ; ROUTE_25
db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY
db MUSIC_ROUTES2, 0 ; UNUSED_MAP_F3 / Bill's Garden
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F
db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE
@ -244,7 +245,6 @@ MapSongBanks::
db MUSIC_CELADON, 0 ; COLOSSEUM
db MUSIC_OAKS_LAB, 0 ; UNUSED_MAP_F1 / Celadon University Outside
db MUSIC_POKECENTER, 0 ; UNUSED_MAP_F2 / Celadon University Pokecenter
db MUSIC_ROUTES2, 0 ; UNUSED_MAP_F3 / Bill's Garden
db MUSIC_GYM, 0 ; LORELEIS_ROOM
db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM

1
data/maps/sprite_sets.asm
View file

@ -41,6 +41,7 @@ MapSpriteSets:
db SPRITESET_PEWTER_CERULEAN ; ROUTE_24
db SPRITESET_PEWTER_CERULEAN ; ROUTE_25
db SPRITESET_CITRINE ; BRUNSWICK_TRAIL
db SPRITESET_PEWTER_CERULEAN ; BILLS_GARDEN
assert_table_length FIRST_INDOOR_MAP
; Format:

22
data/maps/town_map_entries.asm
View file

@ -46,6 +46,7 @@ ExternalMapEntries:
external_map 10, 1, Route24Name
external_map 11, 0, Route25Name
external_map 7, 10, BrunswickTrailName
external_map 12, 0, SeaCottageName
assert_table_length FIRST_INDOOR_MAP
@ -66,10 +67,10 @@ InternalMapEntries:
internal_map MT_MOON_B2F, 6, 2, MountMoonName
internal_map CERULEAN_MART, 10, 2, CeruleanCityName
internal_map MT_MOON_POKECENTER, 5, 2, Route4Name
internal_map VIRIDIAN_PRE_GYM, 10, 2, ViridianCityName
internal_map VIRIDIAN_PRE_GYM, 10, 2, ViridianCityName
internal_map DAYCARE, 10, 4, Route5Name
internal_map UNDERGROUND_PATH_ROUTE_6, 10, 8, Route6Name
internal_map CELESTE_HILL, 6, 10, CelesteHillName
internal_map UNDERGROUND_PATH_ROUTE_6, 10, 8, Route6Name
internal_map CELESTE_HILL, 6, 10, CelesteHillName
internal_map UNDERGROUND_PATH_ROUTE_8, 11, 5, Route8Name
internal_map ROCK_TUNNEL_1F, 14, 3, RockTunnelName
internal_map POWER_PLANT, 15, 4, PowerPlantName
@ -81,9 +82,10 @@ 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, 15, 15, FarawayIslandName
internal_map POKEMON_MANSION_B2F, 2, 15, PokemonMansionName
internal_map LANCES_ROOM, 0, 2, PokemonLeagueName
internal_map FARAWAY_ISLAND_INSIDE, 15, 15, FarawayIslandName
internal_map POKEMON_MANSION_B2F, 2, 15, PokemonMansionName
internal_map MT_MOON_CRATER, 6, 1, MountMoonName
internal_map HALL_OF_FAME, 0, 2, PokemonLeagueName
internal_map UNDERGROUND_PATH_NORTH_SOUTH, 10, 5, UndergroundPathName
internal_map CHAMPIONS_ROOM, 0, 2, PokemonLeagueName
@ -97,7 +99,7 @@ InternalMapEntries:
internal_map FUCHSIA_MEETING_ROOM, 8, 13, FuchsiaCityName
internal_map SEAFOAM_ISLANDS_B4F, 5, 15, SeafoamIslandsName
internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName
internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName
internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name
@ -118,13 +120,13 @@ InternalMapEntries:
internal_map CERULEAN_CAVE_1F, 9, 1, CeruleanCaveName
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 CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName
internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName
internal_map BILLS_GARDEN, 12, 0, SeaCottageName
internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName
internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName
internal_map GIOVANNIS_ROOM, 2, 8, ViridianCityName
internal_map BATTLE_TENT, 7, 9, CitrineCityName
internal_map BATTLE_TENT, 7, 9, CitrineCityName
internal_map MT_MOON_SQUARE_HOUSE, 6, 1, MountMoonName
db -1 ; end

1
data/sgb/sgb_palettes.asm
View file

@ -43,4 +43,5 @@ SuperPalettes:
RGB 31,31,31, 01,30,31, 11,23,31, 03,03,03 ; PAL_CELESTE
RGB 31,31,31, 31,06,08, 18,04,06, 03,03,03 ; PAL_GARNET
RGB 31,31,31, 01,20,03, 11,23,31, 03,03,03 ; PAL_BRUNSWICK
RGB 31,31,31, 30,10,02, 28,00,00, 03,03,03 ; PAL_VOLCANO
assert_table_length NUM_SGB_PALS

35
data/trainers/rival_parties.asm
View file

@ -22,44 +22,43 @@ Green2Data:
db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, WARTORTLE, 0
db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, IVYSAUR, 0
db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, CHARMELEON, 0
db $FF, 19, SPEAROW, 16, RATTATA, 18, SANDSHREW, 20, UMBREON, 0
db $FF, 19, SPEAROW, 16, RATTATA, 18, SANDSHREW, 20, RAICHU, 0
db $FF, 19, SPEAROW, 16, RATICATE, 18, SANDSHREW, 20, EEVEE, 0
db $FF, 19, SPEAROW, 16, RATICATE, 18, SANDSHREW, 20, RAICHU, 0
; Pokémon Tower 2F
db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0
db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0
db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0
db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, MAGNETITE, 25, EEVEE, 0
db $FF, 25, FEAROW, 23, SANDSHREW, 22, SHELLDER, 20, MAGNETITE, 25, RAICHU, 0
db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, SHELLDER, 25, RAICHU, 0
; Silph Co. 7F
db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
db $FF, 38, SANDSLASH, 35, KADABRA, 37, NINETALES, 35, MAGNETON, 40, UMBREON, 0
db $FF, 38, SANDSLASH, 35, KADABRA, 37, CLOYSTER, 35, NINETALES, 40, GOROCHU, 0
db $FF, 37, MADAAMU, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
db $FF, 37, MADAAMU, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
db $FF, 37, MADAAMU, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES_A, 35, MAGNETON, 40, UMBREON, 0
db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES, 35, CLOYSTER, 40, GOROCHU, 0
; Route 22
db $FF, 47, MADAAMU, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
db $FF, 47, MADAAMU, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
db $FF, 47, MADAAMU, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, MAGNEZONE, 50, NINETALES, 53, UMBREON, 0
db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES_A, 50, MAGNEZONE, 53, UMBREON, 0
db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES, 50, CLOYSTER, 53, GOROCHU, 0
Green3Data:
db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, MAGNEZONE, 63, NINETALES, 65, UMBREON, 0 ; Ninetales-Alola once added.
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, GOROCHU, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES_A, 63, MAGNEZONE, 65, UMBREON, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, CLOYSTER, 65, GOROCHU, 0
; post-game rematch teams (currently unused)
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, GOROCHU, 81, ARCANINE, 83, SNORLAX, 85, TOTARTLE, 0
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, ARCANINE, 83, ELECTIVIRE, 85, TOTARTLE, 0
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, GYARADOS, 83, MAGMORTAR, 85, VENUSAUR, 0
; db $FF, 81, SCIZOR, 79, GOROCHU, 81, RHYPERIOR, 81, EXEGGUTOR, 83, CRYITHAN, 85, CHARIZARD, 0
;db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, MAGNEZONE, 63, NINETALES, 65, UMBREON, 0 ; Ninetales-Alola once added.
;db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, GOROCHU, 0
; db $FF, 81, SCIZOR, 79, ALAKAZAM, 81, RHYPERIOR, 81, EXEGGUTOR, 83, CRYITHAN, 85, CHARIZARD, 0
; db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES_A, 83, MAGNEZONE, 85, UMBREON, 0
; db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES, 83, CLOYSTER, 85, GOROCHU, 0
ProfOakData:
; Unused
db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 70, NIDOKING, 70, TOTARTLE, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 70, NIDOKING, 70, VENUSAUR, 0
db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 70, NIDOKING, 70, CHARIZARD, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 70, NIDOKING, 70, ESPEON, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 70, NIDOKING, 70, GOROCHU, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 68, GYARADOS, 70, NIDOKING, 70, ESPEON, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 68, GYARADOS, 70, NIDOKING, 70, GOROCHU, 0

2
data/wild/grass_water.asm
View file

@ -39,6 +39,7 @@ WildDataPointers:
dw Route24WildMons ; ROUTE_24
dw Route25WildMons ; ROUTE_25
dw BrunswickTrailMons ; BRUNSWICK_TRAIL
dw BillsGardenWildMons ; BILLS_GARDEN
dw NothingWildMons ; REDS_HOUSE_1F
dw NothingWildMons
dw NothingWildMons
@ -244,7 +245,6 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw BillsGardenWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons

4
data/wild/maps/BillsGarden.asm
View file

@ -9,9 +9,9 @@ BillsGardenWildMons:
db 50, EEVEE
db 50, CHARMANDER
db 50, BULBASAUR
db 50, HITMONTOP
db 50, HITMONCHAN
db 50, HITMONLEE
db 50, HITMONCHAN
db 50, HITMONTOP
db 50, ELECTRODE_H
db 50, ARCANINE_H
db 50, DECILLA

8
data/wild/maps/SilphGauntlet1F.asm
View file

@ -3,12 +3,12 @@ Gauntlet1FWildMons:
db 50, BUTTERFREE
db 50, BEEDRILL
db 51, VENOMOTH
db 51, PARASECT
db 51, TANGELA
db 51, BEEDRILL
db 52, VENOMOTH
db 52, TANGROWTH
db 53, GOROCHU
db 53, TANGROWTH
db 52, CARAPTHOR
db 53, RAICHU
db 53, CARAPTHOR
db 55, VENUSAUR
end_grass_wildmons

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

@ -1,15 +1,15 @@
Gauntlet2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 52, GOLEM
db 51, GRAVELER
db 51, SANDSLASH
db 52, MACHOKE
db 52, CROBAT
db 52, SANDSLASH
db 53, MACHAMP
db 53, CROBAT
db 53, SANDSLASH
db 54, MACHAMP
db 53, MACHOKE
db 53, STEELIX
db 54, CLEFABLE
db 54, STEELIX
db 55, CLEFABLE
db 55, STEELIX
db 57, CHARIZARD
db 56, CHARIZARD
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

22
data/wild/maps/SilphGauntlet3F.asm
View file

@ -1,15 +1,15 @@
Gauntlet3FWildMons:
def_grass_wildmons 15 ; encounter rate
db 54, TENTACRUEL
db 54, JABETTA
db 55, KINGLER
db 55, PENDRAKEN
db 55, JABETTA
db 56, KINGLER
db 56, GOLDUCK
db 57, GYARADOS
db 57, GOLDUCK
db 59, TOTARTLE
def_grass_wildmons 10 ; encounter rate
db 52, POLIWHIRL
db 52, JABETTA
db 53, KINGLER
db 53, SLOWBRO
db 53, JABETTA
db 54, KINGLER
db 54, GOLDUCK
db 55, BLASTOISE
db 55, GOLDUCK
db 57, TOTARTLE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

22
data/wild/maps/SilphGauntlet4F.asm
View file

@ -1,15 +1,15 @@
Gauntlet4FWildMons:
def_grass_wildmons 15 ; encounter rate
db 56, GENGAR
db 56, GUARDIA
db 57, NINETALES
db 57, BARUNDA
db 57, GUARDIA
db 58, NINETALES
db 58, HYPNO
db 59, ALAKAZAM
db 59, HYPNO
db 61, ALAKAZAM
def_grass_wildmons 10 ; encounter rate
db 53, HAUNTER
db 53, GUARDIA
db 54, NINETALES
db 54, BARUNDA
db 54, GUARDIA
db 55, NINETALES
db 55, HYPNO
db 56, KADABRA
db 56, HYPNO
db 58, ANNIHILAPE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

22
data/wild/maps/SilphGauntlet5F.asm
View file

@ -1,15 +1,15 @@
Gauntlet5FWildMons:
def_grass_wildmons 30 ; encounter rate
db 58, DODRIO
db 58, RHYDON
db 59, EXEGGUTOR
db 59, SCYTHER
db 59, PINSIR
db 60, KANGASKHAN
db 60, TAUROS
db 61, TRAMPEL
db 61, CHANSEY
db 63, DRAGONITE
def_grass_wildmons 20 ; encounter rate
db 54, DODRIO
db 54, RHYDON
db 55, EXEGGUTOR
db 55, SCYTHER
db 55, PINSIR
db 56, KANGASKHAN
db 56, TAUROS
db 57, TRAMPEL
db 57, CHANSEY
db 59, DRAGONITE
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

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

@ -1,15 +1,15 @@
Gauntlet6FWildMons:
def_grass_wildmons 10 ; encounter rate
db 60, MUK
db 60, WEEZING
db 61, ANIMON
db 61, PORYGON
db 61, WEEZING
db 62, ANIMON
db 62, MAGNEZONE
db 63, AERODACTYL
db 63, MAGNEZONE
db 65, GYAOON
db 55, MUK
db 55, WEEZING
db 56, ANIMON
db 56, ELECTRODE
db 56, WEEZING
db 57, ANIMON
db 57, MAGNEZONE
db 58, PORYGON
db 58, MAGNEZONE
db 60, OMEGA
end_grass_wildmons
def_water_wildmons 0 ; encounter rate

101
data/wild/super_rod.asm
View file

@ -1,48 +1,55 @@
; super rod encounters
SuperRodData:
; map, fishing group
dbw PALLET_TOWN, .Group1
dbw VIRIDIAN_CITY, .Group1
dbw CERULEAN_CITY, .Group2
dbw VERMILION_CITY, .Group3
dbw CELADON_CITY, .Group11
dbw FUCHSIA_CITY, .Group5
dbw CINNABAR_ISLAND, .Group8
dbw CITRINE_CITY, .Group9
dbw ROUTE_4, .Group2
dbw ROUTE_6, .Group2
dbw ROUTE_10, .Group4
dbw ROUTE_11, .Group3
dbw ROUTE_12, .Group4
dbw ROUTE_13, .Group5
dbw ROUTE_17, .Group5
dbw ROUTE_18, .Group5
dbw ROUTE_19, .Group8
dbw ROUTE_20, .Group8
dbw ROUTE_21, .Group8
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group8
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group3
dbw CERULEAN_GYM, .Group2
dbw VERMILION_DOCK, .Group3
dbw SEAFOAM_ISLANDS_B3F, .Group8
dbw SEAFOAM_ISLANDS_B4F, .Group8
dbw SAFARI_ZONE_EAST, .Group6
dbw SAFARI_ZONE_NORTH, .Group6
dbw SAFARI_ZONE_WEST, .Group6
dbw SAFARI_ZONE_CENTER, .Group6
dbw CERULEAN_CAVE_2F, .Group10
dbw CERULEAN_CAVE_B1F, .Group10
dbw CERULEAN_CAVE_1F, .Group10
dbw SILPH_GAUNTLET_5F, .Group6
dbw ROCK_TUNNEL_1F, .Group4
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
dbw FARAWAY_ISLAND_INSIDE, .Group10
dbw MT_MOON_CRATER, .Group10
dbw DIGLETTS_CAVE, .Group12
dbw BILLS_GARDEN, .Group7
dbw UNDERWATER_TUNNEL, .Group8
dbw PALLET_TOWN, .Group1
dbw VIRIDIAN_CITY, .Group1
dbw CERULEAN_CITY, .Group2
dbw VERMILION_CITY, .Group3
dbw CELADON_CITY, .Group11
dbw FUCHSIA_CITY, .Group5
dbw CINNABAR_ISLAND, .Group8
dbw CITRINE_CITY, .Group9
dbw ROUTE_4, .Group2
dbw ROUTE_6, .Group2
dbw ROUTE_10, .Group4
dbw ROUTE_11, .Group3
dbw ROUTE_12, .Group4
dbw ROUTE_13, .Group5
dbw ROUTE_17, .Group5
dbw ROUTE_18, .Group5
dbw ROUTE_19, .Group8
dbw ROUTE_20, .Group8
dbw ROUTE_21, .Group8
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group8
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group3
dbw BRUNSWICK_TRAIL, .Group9
dbw CERULEAN_GYM, .Group2
dbw VERMILION_DOCK, .Group3
dbw SEAFOAM_ISLANDS_B3F, .Group8
dbw SEAFOAM_ISLANDS_B4F, .Group8
dbw SAFARI_ZONE_EAST, .Group6
dbw SAFARI_ZONE_NORTH, .Group6
dbw SAFARI_ZONE_WEST, .Group6
dbw SAFARI_ZONE_CENTER, .Group6
dbw CERULEAN_CAVE_2F, .Group10
dbw CERULEAN_CAVE_B1F, .Group10
dbw CERULEAN_CAVE_1F, .Group10
dbw SILPH_GAUNTLET_5F, .Group6
dbw ROCK_TUNNEL_1F, .Group4
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
dbw FARAWAY_ISLAND_INSIDE, .Group5
dbw MT_MOON_CRATER, .Group10
dbw DIGLETTS_CAVE, .Group12
dbw BILLS_GARDEN, .Group7
dbw UNDERWATER_TUNNEL, .Group8
dbw LORELEIS_ROOM, .Group8
dbw GARNET_CAVERN_1F, .Group9
dbw GARNET_CAVERN_2F, .Group9
dbw GARNET_CAVERN_B1F, .Group9
dbw CINNABAR_VOLCANO_FLOORS, .Group13
dbw CINNABAR_VOLCANO, .Group13
db -1 ; end
; fishing groups
@ -118,7 +125,7 @@ SuperRodData:
db 30, BLASTYKE
db 30, GOLDEEN
.Group9: ; Citrine, Chartreuse, Crimson
.Group9: ; Citrine, Brunswick, Garnet
db 10
db 50, JAGG
db 50, SEAKING
@ -161,4 +168,10 @@ SuperRodData:
db 19, WIGLETT
db 21, WIGLETT
db 20, WIGLETT
db 28, WUGTRIO
db 28, WUGTRIO
.Group13: ; Cinnabar Volcano
db 3
db 35, MAGMAR
db 37, MAGMAR
db 40, MAGMAR

23
engine/gfx/palettes.asm
View file

@ -146,8 +146,6 @@ SetPal_Overworld:
jr z, .caveOrBruno
cp FOREST
jr z, .forest
cp SHIP
jr z, .ship
ld a, [wCurMap]
cp BRUNSWICK_TRAIL
jr z, .brunswick
@ -155,6 +153,8 @@ SetPal_Overworld:
jr c, .townOrRoute
cp POWER_PLANT
jr z, .powerPlant
cp SILPH_GAUNTLET_3F
jr z, .ship
cp CELESTE_HILL
jr z, .celeste
cp CERULEAN_CAVE_2F
@ -194,8 +194,10 @@ SetPal_Overworld:
jr c, .garnet
cp CERULEAN_CAVE_1F + 1
jr c, .mewtwo
cp GARNET_CAVERN_2F + 1
jr c, .garnet
cp CINNABAR_VOLCANO_FLOORS + 1
jr c, .volcano
cp GARNET_CAVERN_2F
jr z, .garnet
cp ROCK_TUNNEL_B1F + 1
jr c, .caveDefault
.caveDefault
@ -217,15 +219,12 @@ SetPal_Overworld:
jr c, .faraway
cp SAFARI_ZONE_CENTER + 1
jr c, .forestDefault
.forestDefault
ld a, PAL_FUCHSIA - 1
.brunswick
ld a, PAL_BRUNSWICK - 1
jr .town
.powerPlant
ld a, PAL_YELLOWMON - 1
jr .town
.brunswick
ld a, PAL_BRUNSWICK - 1
jr .town
.faraway
ld a, PAL_ROUTE - 1
jr .town
@ -238,6 +237,12 @@ SetPal_Overworld:
.mewtwo
ld a, PAL_MEWMON - 1
jr .town
.volcano
ld a, PAL_VOLCANO - 1
jr .town
.forestDefault
ld a, PAL_FUCHSIA - 1
jr .town
; used when a Pokemon is the only thing on the screen
; such as evolution, trading and the Hall of Fame

4
engine/items/town_map.asm
View file

@ -382,10 +382,14 @@ DisplayWildLocations:
call LoadTownMapEntry
pop hl
ld a, [de]
cp $16 ; Mt. Moon Crater's coordinates
jr z, .nextEntry ; skip
cp $19 ; Cerulean Cave's coordinates
jr z, .nextEntry ; skip Cerulean Cave
cp $5A ; Silph Gauntlet's coordinates
jr z, .nextEntry ; skip
cp $FF ; Faraway Island's coordinates
jr z, .nextEntry ; skip
call TownMapCoordsToOAMCoords
ld a, $4 ; nest icon tile no.
ld [hli], a

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 929 B

9
maps/BillsGarden.blk
View file

@ -1 +1,8 @@
AAAAAAAAAAAACEEEE?AAACF((((D?AAB\QR @AABZ-[@AAB( @AAB (@AAB( (@AAK=> @AAAABY<==JA
,,,+WWWW*,,,,,+%m
n$*,,,+%t $*,,).d (,,)eCd (,,)t
(,,)m
t
(,,,;o
o>,,,,,?;mn>?,,,,,,, ,,,,,,,,uqqv,,,,,,,,hi,,,,

8
maps/CinnabarVolcanoFloors.blk
View file

@ -1,4 +1,4 @@
,€€€€€€€+,€€€€€€€+< "bz+
 vvvvfvvvvvvvv-vvvvfvvvv-v|)yv L ,€€€€€€€+,€€€€€€€+|‚'€€€+ 
vvv)vvvvvvvvvvvv " vvvv-tfvvvv
^ ___$
,€€€€€€€+,€€€€€€€+|__b "+
 vvvfvvvvvvv-vvvvfvvv-v |fyvr
 _,€€€€€€€+,€€€€€€€+|‚'  r€+vvvvvv)vvvvvvvvvvv vvvvr-tfvvvv_
 " ___$

7
maps/FuchsiaCity.blk
View file

@ -1,11 +1,8 @@
 !zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz !znlllmz|szzzz7:~znVwwmmzooooyzzzVUVzzzzzzngmzzMUlllll11NkkkPRROUwVww11N_tnN>?????????;_t
nN$ !WWWW !%_89ttnN
 !zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz !znlllmz|szzzz7:~znVwwmmzooooyzzzVUVzzzzzzngmzzMUlllll11NkkkPRROUwVww11N_1nN>?????????;_1111nN$ !WWWW !%_89nN
|~0|r
1<=01nN111111111
_Vw1wnN
11
11nPRRRR>?;ttttRRRRRRn11111(,)1111>?;
111111nPRRRR>?;ttttRRRRRRn11111(,)1111>?;

9
text/CeladonCity.asm
View file

@ -50,11 +50,10 @@ _TM41ExplanationText::
text "TM41 teaches"
line "SOFTBOILED!"
para "Only one #MON"
line "can use it!"
para "That #MON is"
line "CHANSEY!"
para "Only two #MON"
line "can use it,"
cont "CHANSEY and"
cont "BLISSEY!"
done
_TM41NoRoomText::