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

Merge branch 'master' into master

Browse source
This commit is contained in:
May Evans 2022-08-31 03:05:37 +01:00 committed by GitHub
parent 7d80a09f58 f8ed54eb89
commit a022479e28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,11 +16,11 @@ RockTunnel1F_Object:
def_object_events
object_event 7, 5, SPRITE_HIKER, STAY, DOWN, 1, OPP_HIKER, 12
object_event 5, 16, SPRITE_HIKER, STAY, DOWN, 2, OPP_HIKER, 13
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 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, 24, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
object_event 32, 26, SPRITE_COOLTRAINER_F, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
def_warps_to ROCK_TUNNEL_1F

9
engine/movie/intro.asm
View file

@ -331,11 +331,10 @@ PlayShootingStar:
ld a, $67 ; starting tile ID
ld c, $06 ; number of tiles
.loop
ld [hli], a
inc a
dec c
jr nz, .loop
ld [hli], a
inc a
dec c
jr nz, .loop
ld c, 40
call DelayFrames
.next

2
maps/RockTunnel1F.blk
View file

@ -1 +1 @@
 " "(>( " " "( " " " "( " " " " "*>NQRMN
 " "(>(__N !!" " "^(mvvvvvvrvv " " "vvj[[o(vfvLHvvvvvvQr " " " " "TUMnnnL^*jko^p^^r>NQRMN