thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

yet more naming

Browse source
This commit is contained in:
YamaArashi 2015-07-25 19:26:54 -07:00
parent 7f6d0d49b6
commit 93255d6d17
33 changed files with 247 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engine/overworld/npc_movement.asm
View file

@ -178,7 +178,7 @@ PewterMovementScript_WalkToMuseum: ; 1a514 (6:6514)
dec a
ld [wSimulatedJoypadStatesIndex], a
xor a
ld [wd12f], a
ld [wWhichPewterGuy], a
predef PewterGuys
ld hl, wNPCMovementDirections2
ld de, RLEList_PewterMuseumGuy
@ -234,8 +234,8 @@ PewterMovementScript_WalkToGym: ; 1a581 (6:6581)
call DecodeRLEList
dec a
ld [wSimulatedJoypadStatesIndex], a
ld a, $1
ld [wd12f], a
ld a, 1
ld [wWhichPewterGuy], a
predef PewterGuys
ld hl, wNPCMovementDirections2
ld de, RLEList_PewterGymGuy

18
engine/overworld/pewter_guys.asm
View file

@ -9,7 +9,7 @@ PewterGuys: ; 37ca1 (d:7ca1)
ld d, h
ld e, l
ld hl, PointerTable_37ce6
ld a, [wd12f]
ld a, [wWhichPewterGuy]
add a
ld b, 0
ld c, a
@ -21,17 +21,17 @@ PewterGuys: ; 37ca1 (d:7ca1)
ld b, a
ld a, [W_XCOORD]
ld c, a
.asm_37cc7
.findMatchingCoordsLoop
ld a, [hli]
cp b
jr nz, .asm_37ce1
jr nz, .nextEntry1
ld a, [hli]
cp c
jr nz, .asm_37ce2
jr nz, .nextEntry2
ld a, [hli]
ld h, [hl]
ld l, a
.asm_37cd2
.copyMovementDataLoop
ld a, [hli]
cp $ff
ret z
@ -40,13 +40,13 @@ PewterGuys: ; 37ca1 (d:7ca1)
ld a, [wSimulatedJoypadStatesIndex]
inc a
ld [wSimulatedJoypadStatesIndex], a
jr .asm_37cd2
.asm_37ce1
jr .copyMovementDataLoop
.nextEntry1
inc hl
.asm_37ce2
.nextEntry2
inc hl
inc hl
jr .asm_37cc7
jr .findMatchingCoordsLoop
PointerTable_37ce6: ; 37ce6 (d:7ce6)
dw PewterMuseumGuyCoords

16
engine/overworld/trainers.asm
View file

@ -24,16 +24,16 @@ _GetSpritePosition2: ; 56819 (15:6819)
ld [H_SPRITEINDEX], a
call GetSpriteDataPointer
ld a, [hli] ; c1x4 (screen Y pos)
ld [wd130], a
ld [wSavedSpriteScreenY], a
inc hl
ld a, [hl] ; c1x6 (screen X pos)
ld [wd131], a
ld [wSavedSpriteScreenX], a
ld de, $104 - $6
add hl, de
ld a, [hli] ; c2x4 (map Y pos)
ld [wd132], a
ld [wSavedSpriteMapY], a
ld a, [hl] ; c2x5 (map X pos)
ld [wd133], a
ld [wSavedSpriteMapX], a
ret
_SetSpritePosition1: ; 5683d (15:683d)
@ -61,16 +61,16 @@ _SetSpritePosition2: ; 5685d (15:685d)
ld a, [wSpriteIndex]
ld [H_SPRITEINDEX], a
call GetSpriteDataPointer
ld a, [wd130]
ld a, [wSavedSpriteScreenY]
ld [hli], a
inc hl
ld a, [wd131]
ld a, [wSavedSpriteScreenX]
ld [hl], a
ld de, $00fe
add hl, de
ld a, [wd132]
ld a, [wSavedSpriteMapY]
ld [hli], a
ld a, [wd133]
ld a, [wSavedSpriteMapX]
ld [hl], a
ret