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

Actually working postgame warps!

Browse source 
FINALLY managed to get this working. The bugged warps are now working and the jank ones are less jank. Also removed the cocoon's pre-evolved moves again.
This commit is contained in:
Martha Schilling 2023-12-08 17:37:41 +00:00
parent bed705ac0d
commit 2b2c95e52b
20 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.md
View file

@ -261,8 +261,6 @@ Comprehensive list can be found on Discord.
- Occasionally, menu text sets itself to scroll.
- The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1.
- Fake Tears and Nasty Plot don't quite look right when done from the opponent's side.
- Citrine Dock's warp doesn't work, meaning you have to leave Citrine using Fly
- LAST_MAP isn't updated properly when sailing from Vermilion to Citrine
- After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house.
- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle
@ -285,7 +283,7 @@ New Pokemon:
- Electabuzz -> Electivire | Use Thunder Stone
- Farfetch'd -> Luxwan | L24
- Gloom -> Bellossom | Use Leaf Stone
- Golbat -> Crobat | L44
- Golbat -> Crobat | L40
- Lickitung -> Lickilicky | L32
- Magmar -> Magmortar | Use Fire Stone
- Magneton -> Magnezone | Use Thunder Stone
@ -322,7 +320,7 @@ Kanto Prototype Pokemon:
- Psyduck -> Weirduck -> Golduck | L22, L33
- Raichu -> Gorochu | Trade
- Ribbito -> Croakozuna | L30
- Squeamata -> Ministare -> Iguanarch | L30, L50
- Squeamata -> Ministare -> Iguanarch | L30, L55
- Vulpiii -> Vulpix | L15
- Wartortle -> Totartle | L36, replaces Blastoise
@ -400,19 +398,19 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
* Dr. Lava - Translations of some content used in this hack, particularly the 1996 Pokedex book's entries for DYKG.
* Nob Ogasawara - Prototype Pokemon names, produced for DYKG.
Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking-G, Tangrowth, Toedscool, Toedscruel, Weezing-G, Wiglett, Zapdos-G
Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espeon (back), Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking (back), Slowking-G, Sylveon (back), Tangrowth, Tauros-P (all forms), Toedscool, Toedscruel, Umbreon (back), Weezing-G, Wiglett, Zapdos-G
Martha’s Against Humanity sprites: Bellignan (with help from PvK), Mimmeo, Sylveon (with help from Albatross)
Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Sylveon (front, with help from Albatross)
Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P, Wugtrio
Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio
RacieBeep sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge (front/back), Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck, Fossil Aerodactyl, Fossil Kabutops, Ghost, Articuno (back), Meowth (back)
Orchid: Ghost (back), Luxwan (back), Buu (back)
Orchid: Luxwan (back), Buu (back)
Zeta_Null: Porygon (front)
Official sprites: Crobat, Disturban, Espeon (edited by Martha’s Against Humanity), Slowking, Steelix, Tricules (edited by Martha’s Against Humanity), Umbreon (edited by Martha’s Against Humanity)
Official sprites: Crobat (front, edited by Martha’s Against Humanity), Disturban, Espeon (front, edited by Martha’s Against Humanity), Slowking (front), Steelix (front), Tricules, Umbreon (front, edited by Martha’s Against Humanity)
Original README.md proceeding;
# Pokémon Red and Blue [![Build Status][ci-badge]][ci]

2
constants/map_constants.asm
View file

@ -136,7 +136,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F
map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70
map_const LANCES_ROOM, 13, 13 ; $73
map_const FARAWAY_ISLAND_OUTSIDE, 15, 18 ; $74 - Was UNUSED_MAP_72
map_const FARAWAY_ISLAND_OUTSIDE, 15, 20 ; $74 - Was UNUSED_MAP_72
map_const FARAWAY_ISLAND_INSIDE, 15, 11 ; $75 - Was UNUSED_MAP_73
map_const POKEMON_MANSION_B2F, 15, 12 ; $76 - Was UNUSED_MAP_74
map_const MT_MOON_CRATER, 25, 25 ; $77 - Was UNUSED_MAP_75

2
data/pokemon/base_stats/kakuna.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/kakuna.pic", 0, 1 ; sprite dimensions
dw KakunaPicFront, KakunaPicBack
db POISON_STING, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/metapod.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/metapod.pic", 0, 1 ; sprite dimensions
dw MetapodPicFront, MetapodPicBack
db TACKLE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/perrserker.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions
dw PerrserkerPicFront, PerrserkerPicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/pokemon/base_stats/pupal.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/pupal.pic", 0, 1 ; sprite dimensions
dw PupalPicFront, PupalPicBack
db LEECH_LIFE, STRING_SHOT, HARDEN, NO_MOVE ; level 1 learnset
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

2
data/tilesets/collision_tile_ids.asm
View file

@ -75,7 +75,7 @@ Citrine_Coll::
coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
Celeste_Coll::
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
coll_tiles $20, $2e, $30, $37, $39, $40, $51, $53, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c
RocketHouse_Coll::
coll_tiles $13, $31, $01, $53

4
data/tilesets/door_tile_ids.asm
View file

@ -15,7 +15,6 @@ DoorTileIDPointers:
dbw INTERIOR, .InteriorDoorTileIDs ; fixes weirdness in silph co.
dbw CITRINE, .CitrineDoorTileIDs
dbw CELESTE, .CelesteDoorTileIDs
dbw SEAGALLOPPORT, .SeagallopPortDoorTileIDs
db -1 ; end
MACRO door_tiles
@ -66,6 +65,3 @@ ENDM
.CelesteDoorTileIDs:
door_tiles $0C, $1C
.SeagallopPortDoorTileIDs:
door_tiles $0E, $1E

3
data/tilesets/pair_collision_tile_ids.asm
View file

@ -6,6 +6,9 @@
TilePairCollisionsLand::
db CAVERN, $20, $05
db CAVERN, $41, $05
db CELESTE, $30, $2E
db CELESTE, $18, $2E
db CELESTE, $5E, $2E
db FOREST, $30, $2E
db CAVERN, $2A, $05
db CAVERN, $05, $21

4
data/tilesets/warp_carpet_tile_ids.asm
View file

@ -12,10 +12,10 @@ MACRO warp_carpet_tiles
ENDM
.FacingDownWarpTiles:
warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33
warp_carpet_tiles $01, $0B, $12, $16, $23, $17, $3D, $04, $18, $33, $51, $52
.FacingUpWarpTiles:
warp_carpet_tiles $01, $5C
warp_carpet_tiles $01, $34, $36, $5C, $5F,
.FacingLeftWarpTiles:
warp_carpet_tiles $1A, $4B

2
data/tilesets/warp_tile_ids.asm
View file

@ -107,7 +107,7 @@ ENDM
warp_tiles $1B, $1C, $0B, $0C, $58, $59
.CelesteWarpTileIDs:
warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better
warp_tiles $5A, $5C
.RocketHouseWarpTileIDs:
warp_tiles

BIN
gfx/blocksets/celeste.bst
View file

Binary file not shown.

BIN
gfx/tilesets/celeste.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
gfx/tilesets/ship_port.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

6
home/overworld.asm
View file

@ -773,6 +773,12 @@ ExtraWarpCheck::
jr z, .useFunction2
cp SHIP_PORT ; Vermilion Port tileset
jr z, .useFunction2
cp SEAGALLOPPORT ; Ferry Port tileset
jr z, .useFunction2
cp CITRINE ; Citrine tileset
jr z, .useFunction2
cp CELESTE ; Celeste/Faraway tileset
jr z, .useFunction2
cp PLATEAU ; Indigo Plateau tileset
jr z, .useFunction2
.useFunction1

2
maps/BrunswickGlade.blk
View file

@ -1,2 +1,2 @@
Xg;"Z7bbb
7 $g)g. 7779 g):7 )I( g,,_(gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY
7 $g)g. 7779 g):7 )I8 g_:gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY

2
maps/CelesteHill.blk
View file

@ -1 +1 @@
@ƒ…B@ƒ…B@ƒ…B@ƒ$.%…B@ƒ…B@ƒ…B@ƒaU_a…B@ƒiaai…B@ƒj<C692>jŠj<C5A0>ˆ…B@†<>s)†<>‡BDEFYDEF
@ƒ…B@ƒ…B@ƒ…B@ƒ$.%…B@ƒ…B@ƒ…B@ƒaU_a…B@ƒii…B@ƒjVV‰VVˆ…B@†<>‡)†<>‡BDEFYDEF

2
maps/CelesteHillOutside.blk
View file

@ -1 +1 @@
<EFBFBD>,<2C>X<02>,,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>a(,.gea<65><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>n<12><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>jsU<10><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>g.ggg)agg<67><67><EFBFBD><EFBFBD><EFBFBD>c<EFBFBD><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><>g.<2E><>s,(((g_<14>d<EFBFBD><64><EFBFBD><EFBFBD><EFBFBD>H9:g!)gggg%<12><>gg)g./<01><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><02><><EFBFBD><EFBFBD><EFBFBD>(((<28>AAAAB@C<><43>(<28><>EEE?B@B<02>dsggg@B@Bggggggg@B@Bggg@BD?>g<CFD?>g<=CFD?>g<ACFDFYDEF
<EFBFBD>2X0<02><><EFBFBD><EFBFBD><EFBFBD>s,a`geaW/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>g<EFBFBD>2s<>VVVVVj/ag<61><67><EFBFBD><EFBFBD>2WV<57><56>gg)aWj<57><6A><EFBFBD>c<EFBFBD>s/<><3E><><EFBFBD><EFBFBD>jV<6A><56><EFBFBD>/@AB<41>g<EFBFBD>DFg<>_DdF<64><46><EFBFBD>g<><67><EFBFBD><EFBFBD><EFBFBD>DFg%0<>gg<>AAA<41><41>g<EFBFBD><67><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/sV,<02><>AAABsV/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sV<73><56>@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bggggggg@B@Bggg@BD?>g<CFD?>g<=CFD?>g<ACFDFYDEF

4
maps/FarawayIslandInside.blk
View file

@ -1 +1,3 @@
b ((((((((b bb(((b (  bb(b(( ((((( Y
H )ggg)gggg ) ggg)g. .M
g
g))ggggg.Y

2
maps/FarawayIslandOutside.blk
View file

@ -1 +1 @@
@B…B@B…B@B…B@BZ…B@BUZX…B@BZ_…BDFUU…B<E280A6>(„<><E2809E>‡F†€‚U„<>‡bCF-@C<>_…bAAB--@B<>_‡ACEF--@B<>„Ť‚„<>AB----@B†‡A<E280A1>…DFEF-l--@BDE?†‡CF----<=@ANA@CGF-----@DEFADFAB--k--@-DEEEEGF-----@-pYk--k-DE
@B…B@B…B@B…B@Bn…B@B(nX…B@B'n((*…BDF*(((…B<E280A6>+„<><E2809E>‡F†€‚*+„<>‡bCF-@C<>''…bAAB--@B<>‡ACEF--@B<>„€‚„<>AB----@B†‡A<E280A1>…DFEF-l--@BDE?†‡CF----<=@ANA@CGF-----@DEFADFAB-----@-DEEEEGF-l---@--pŹŹŹŹk---l-DE--pŽmmm-----------Ž------k----