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

Merge branch 'PlagueVonKarma:master' into master

Browse source
This commit is contained in:
thornAvery 2023-09-25 01:43:58 +00:00 committed by GitHub
parent 0adce2c33e f23b59d7b7
commit 5269bdd369
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
3DS Border/KEPBorder.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

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

@ -18,7 +18,7 @@ RockTunnel1F_Object:
object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
object_event 5, 10, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
object_event 17, 15, SPRITE_HIKER, STAY, LEFT, 3, OPP_HIKER, 14
object_event 23, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
object_event 27, 8, SPRITE_SUPER_NERD, STAY, LEFT, 4, OPP_POKEMANIAC, 7
object_event 37, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17
object_event 22, 24, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18
object_event 32, 26, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19

2
data/pokemon/new_dex_text.asm
View file

@ -314,7 +314,7 @@ _GavillainDexEntry::
next "its surroundings."
page "Those who gaze at"
next "it for too long"
next "them for too long"
next "become immobile"
dex

2
data/wild/maps/RockTunnel1F.asm
View file

@ -8,7 +8,7 @@ RockTunnel1FWildMons:
db 18, SLOWPOKE
db 17, SLOWPOKE
db 17, MACHOP
db 13, ONIX
db 15, ONIX
db 15, GAVILLAIN
end_grass_wildmons

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

@ -8,8 +8,8 @@ RockTunnelB1FWildMons:
db 18, ZUBAT
db 17, MACHOP
db 17, ONIX
db 13, GAVILLAIN
db 18, GAVILLAIN
db 16, GAVILLAIN
db 17, GAVILLAIN
end_grass_wildmons
def_water_wildmons 0 ; encounter rate