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

why do the goldeen and psyduck lines not learn water gun by level up what is wrong with the learnsets in this game

Browse source 
Also relocated the aforementioned items and made Celeste Hill look a bit nicer.
This commit is contained in:
Martha Schilling 2023-12-11 14:14:49 +00:00
parent c3d92fb62f
commit 62fb13c3b3
15 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/map_constants.asm
View file

@ -272,8 +272,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const MT_MOON_SQUARE, 13, 7 ; $FA map_const MT_MOON_SQUARE, 13, 7 ; $FA
map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB
map_const CELESTE_HILL_CAVE, 20, 18 ; $FC map_const CELESTE_HILL_CAVE, 20, 18 ; $FC
map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FD map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FD
map_const BRUNSWICK_GLADE, 19, 20 ; $FE map_const BRUNSWICK_GLADE, 19, 20 ; $FE
DEF NUM_MAPS EQU const_value DEF NUM_MAPS EQU const_value
; Indoor maps, such as houses, use this as the Map ID in their exit warps ; Indoor maps, such as houses, use this as the Map ID in their exit warps

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

@ -14,9 +14,9 @@ BrunswickGlade_Object:
object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1 object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1
object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2 object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2
object_event 9, 3, SPRITE_BIRD, STAY, UP, 3 object_event 9, 3, SPRITE_BIRD, STAY, UP, 3
object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1 object_event 33, 11, SPRITE_POKE_BALL, STAY, NONE, 4, TM_THUNDER ; itemball1
object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2 object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2
object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3 object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3
object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4 object_event 9, 33, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4
def_warps_to BRUNSWICK_GLADE def_warps_to BRUNSWICK_GLADE

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

@ -16,7 +16,7 @@ BrunswickTrail_Object:
object_event 54, 9, SPRITE_BIRD, STAY, UP, 6 ; person, GZap object_event 54, 9, SPRITE_BIRD, STAY, UP, 6 ; person, GZap
object_event 6, 16, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person, Lover1 object_event 6, 16, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person, Lover1
object_event 6, 15, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 8 ; person, Lover2 object_event 6, 15, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 8 ; person, Lover2
object_event 6, 15, SPRITE_POKE_BALL, STAY, NONE, 9, ULTRA_BALL ; itemball1 object_event 20, 21, SPRITE_POKE_BALL, STAY, NONE, 9, ULTRA_BALL ; itemball1
def_warps_to BRUNSWICK_TRAIL def_warps_to BRUNSWICK_TRAIL

18
data/maps/objects/CelesteHillOutside.asm
View file

@ -1,15 +1,15 @@
CelesteHillOutside_Object: CelesteHillOutside_Object:
db $2 ; border block db $3 ; border block
def_warp_events def_warp_events
warp_event 18, 35, CELESTE_HILL_GATE, 1 warp_event 20, 39, CELESTE_HILL_GATE, 1
warp_event 19, 35, CELESTE_HILL_GATE, 2 warp_event 21, 39, CELESTE_HILL_GATE, 2
warp_event 16, 23, CELESTE_HILL_CAVE, 1 warp_event 16, 27, CELESTE_HILL_CAVE, 1
warp_event 36, 11, CELESTE_HILL_CAVE, 5 warp_event 36, 15, CELESTE_HILL_CAVE, 5
warp_event 2, 9, CELESTE_HILL_CAVE, 6 warp_event 2, 13, CELESTE_HILL_CAVE, 6
warp_event 22, 3, CELESTE_HILL_CAVE, 7 warp_event 22, 7, CELESTE_HILL_CAVE, 7
warp_event 18, 0, CELESTE_HILL, 1 warp_event 18, 4, CELESTE_HILL, 1
warp_event 19, 0, CELESTE_HILL, 2 warp_event 19, 4, CELESTE_HILL, 2
def_bg_events def_bg_events

2
data/moves/names.asm
View file

@ -180,7 +180,7 @@ MoveNames:: ; 12chr limit
li "MIRROR SHOT" li "MIRROR SHOT"
li "SMART STRIKE" li "SMART STRIKE"
li "FAKE TEARS" li "FAKE TEARS"
li "FALSURRENDER" ; maybe we leave this out. maybe. li "FAKESURRENDR"
li "KOWTOWCLEAVE" li "KOWTOWCLEAVE"
li "DISARMVOICE" li "DISARMVOICE"
li "NASTY PLOT" li "NASTY PLOT"

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

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/goldeen.pic", 0, 1 ; sprite dimensions
dw GoldeenPicFront, GoldeenPicBack dw GoldeenPicFront, GoldeenPicBack
db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db PECK, TAIL_WHIP, WATER_GUN, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

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

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions
dw GolduckPicFront, GolduckPicBack dw GolduckPicFront, GolduckPicBack
db SCRATCH, TAIL_WHIP, AMNESIA, DISABLE ; level 1 learnset db SCRATCH, WATER_GUN, TAIL_WHIP, AMNESIA ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

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

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/orfry.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/orfry.pic", 0, 1 ; sprite dimensions
dw OrfryPicFront, OrfryPicBack dw OrfryPicFront, OrfryPicBack
db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db PECK, TAIL_WHIP, WATER_GUN, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

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

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/psyduck.pic", 0, 1 ; sprite dimensions
dw PsyduckPicFront, PsyduckPicBack dw PsyduckPicFront, PsyduckPicBack
db SCRATCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db SCRATCH, WATER_GUN, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

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

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/seaking.pic", 0, 1 ; sprite dimensions
dw SeakingPicFront, SeakingPicBack dw SeakingPicFront, SeakingPicBack
db PECK, TAIL_WHIP, SUPERSONIC, NO_MOVE ; level 1 learnset db PECK, TAIL_WHIP, WATER_GUN, SUPERSONIC ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

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

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/weirduck.pic", 0, 1 ; sprite dimensions INCBIN "gfx/pokemon/front/weirduck.pic", 0, 1 ; sprite dimensions
dw WeirduckPicFront, WeirduckPicBack dw WeirduckPicFront, WeirduckPicBack
db SCRATCH, TAIL_WHIP, AMNESIA, NO_MOVE ; level 1 learnset db SCRATCH, WATER_GUN, TAIL_WHIP, AMNESIA ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset ; tm/hm learnset

12
data/trainers/rival_parties.asm
View file

@ -28,8 +28,8 @@ Green2Data:
db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 23, EXEGGCUTE, 22, KADABRA, 25, WARTORTLE, 0 db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 23, EXEGGCUTE, 22, KADABRA, 25, WARTORTLE, 0
db $FF, 25, PIDGEOTTO, 23, GYARADOS, 23, GROWLITHE, 22, KADABRA, 25, IVYSAUR, 0 db $FF, 25, PIDGEOTTO, 23, GYARADOS, 23, GROWLITHE, 22, KADABRA, 25, IVYSAUR, 0
db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 23, GYARADOS, 22, KADABRA, 25, CHARMELEON, 0 db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 23, GYARADOS, 22, KADABRA, 25, CHARMELEON, 0
db $FF, 25, FEAROW, 23, VULPIX, 23, MAGNEMITE, 22, SANDSHREW, 25, UMBREON, 0 db $FF, 25, FEAROW, 23, MAGNETITE, 23, VULPIX, 22, SANDSHREW, 25, EEVEE, 0
db $FF, 25, FEAROW, 23, SHELLDER, 23, VULPIX, 22, SANDSHREW, 25, RAICHU, 0 db $FF, 25, FEAROW, 23, VULPIX, 23, SHELLDER, 22, SANDSHREW, 25, RAICHU, 0
; Silph Co. 7F ; Silph Co. 7F
db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GROWLITHE, 36, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0 db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GROWLITHE, 36, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GYARADOS, 36, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0 db $FF, 37, PIDGEOT, 35, RHYHORN, 36, GYARADOS, 36, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
@ -47,14 +47,14 @@ Green3Data:
db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0 db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNEZONE, 65, UMBREON, 0 db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, MAGNEZONE, 63, NINETALES, 65, UMBREON, 0
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, 63, CLOYSTER, 65, GOROCHU, 0
; post-game rematch teams, based on FRLG team ; post-game rematch teams, based on FRLG team
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0 db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0 db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0 db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, MAGNEZONE, 80, UMBREON, 0 db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, MAGNEZONE, 78, NINETALES, 80, UMBREON, 0
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, CLOYSTER, 78, NINETALES, 80, GOROCHU, 0 db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, CLOYSTER, 80, GOROCHU, 0
ProfOakData: ProfOakData:
db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 70, NIDOKING, 70, TOTARTLE, 0 db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 70, NIDOKING, 70, TOTARTLE, 0

2
data/trainers/scaled_parties.asm
View file

@ -127,7 +127,7 @@ BlackbeltData:
db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONLEE, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3 db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONLEE, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3
db $FF, 36, MACHOKE, 36, PRIMEAPE, 39, HITMONLEE, 39, HITMONCHAN, 39, HITMONTOP, 0 ; 4 db $FF, 36, MACHOKE, 36, PRIMEAPE, 39, HITMONLEE, 39, HITMONCHAN, 39, HITMONTOP, 0 ; 4
db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONLEE, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5 db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONLEE, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5
db $FF, 43, MACHAMP, 43, ANNIHILAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6 db $FF, 43, MACHAMP, 43, PRIMEAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6
db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7 db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONLEE, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8 db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONLEE, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8
db $FF, 66, MACHAMP, 66, ANNIHILAPE, 66, TAUROS_P, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame db $FF, 66, MACHAMP, 66, ANNIHILAPE, 66, TAUROS_P, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame

2
maps/CelesteHillOutside.blk
View file

@ -1 +1 @@
<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 ƒ20…ƒ20…ƒ2X0…†<E280A6><E280A0><EFBFBD>s,a`geaW/<2F><><EFBFBD><EFBFBD>‡ƒg…2sˆVVVVVj/ag…†<E280A6>‡2WV<57>‚gaWj<57>‡‹c‹s/<>†<><E280A0>€jV<6A>€<EFBFBD>/@ABƒg…DFg<>_DdF†€‡g„<67><E2809E><EFBFBD>‚DF%0ƒgg…AAA†‚g„<67><E2809E><EFBFBD><EFBFBD><EFBFBD>/sV,„‡AAABsV/‹‹‹‹‹‹sV<73>‡@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bgggggg@B@Bggg@BD?>g<CFD?=>g<CFD?A>g<CFDEFYDF

2
text/BrunswickTrail.asm
View file

@ -57,7 +57,7 @@ _BrunswickAfterBattleText1::
para "It's my prized" para "It's my prized"
line "#MON!" line "#MON!"
prompt done
_BrunswickBattleText2:: _BrunswickBattleText2::
text "My hubby brought" text "My hubby brought"