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

Remove most static wram addresses. Use labels instead.

Browse source 
For unknown addresses, use "w<address>".

Label overleads are still an issue.
This commit is contained in:
yenatch 2014-05-26 14:04:56 -07:00
parent 52ba96f5f4
commit 40c17c906b
290 changed files with 8262 additions and 7759 deletions
Download patch file Download diff file Expand all files Collapse all files

148
engine/overworld/npc_movement.asm
View file

@ -1,47 +1,47 @@
Func_1a3e0: ; 1a3e0 (6:63e0)
ld hl, $d730
ld hl, wd730
res 1, [hl]
call HandleDoors
jr nc, .asm_1a406
ld a, $fc
ld [wJoyIgnore], a
ld hl, $d736
ld hl, wd736
set 1, [hl]
ld a, $1
ld [$cd38], a
ld [wcd38], a
ld a, $80
ld [$ccd3], a
ld [wccd3], a
xor a
ld [$c102], a
ld [wSpriteStateData1 + 2], a
call Func_3486
ret
.asm_1a406
xor a
ld [$cd3a], a
ld [$cd38], a
ld [$ccd3], a
ld hl, $d736
ld [wcd3a], a
ld [wcd38], a
ld [wccd3], a
ld hl, wd736
res 0, [hl]
res 1, [hl]
ld hl, $d730
ld hl, wd730
res 7, [hl]
ret
Func_1a41d: ; 1a41d (6:641d)
ld hl, $d730
ld hl, wd730
res 7, [hl]
ld hl, $d72e
ld hl, wd72e
res 7, [hl]
ld hl, $d736
ld hl, wd736
res 0, [hl]
res 1, [hl]
xor a
ld [$cf17], a
ld [$cc57], a
ld [$cf10], a
ld [$cd3a], a
ld [$cd38], a
ld [$ccd3], a
ld [wcf17], a
ld [wcc57], a
ld [wcf10], a
ld [wcd3a], a
ld [wcd38], a
ld [wccd3], a
ret
PointerTable_1a442: ; 1a442 (6:6442)
@ -52,26 +52,26 @@ PointerTable_1a442: ; 1a442 (6:6442)
dw Func_1a4f4
Func_1a44c: ; 1a44c (6:644c)
ld a, [W_XCOORD] ; $d362
ld a, [W_XCOORD] ; wd362
sub $a
ld [$cca1], a
ld [wcca1], a
jr z, .asm_1a475
ld b, $0
ld c, a
ld hl, $cc97
ld hl, wcc97
ld a, $80
call FillMemory
ld [hl], $ff
ld a, [$cf13]
ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
ld de, $cc97
ld de, wcc97
call MoveSprite
ld a, $1
ld [$cf10], a
ld [wcf10], a
jr .asm_1a47a
.asm_1a475
ld a, $3
ld [$cf10], a
ld [wcf10], a
.asm_1a47a
ld hl, W_FLAGS_D733
set 1, [hl]
@ -80,46 +80,46 @@ Func_1a44c: ; 1a44c (6:644c)
ret
Func_1a485: ; 1a485 (6:6485)
ld a, [$d730]
ld a, [wd730]
bit 0, a
ret nz
ld a, [$cca1]
ld [$cd38], a
ld a, [wcca1]
ld [wcd38], a
ld [$ff95], a
ld a, $23
call Predef
call Func_3486
ld a, $2
ld [$cf10], a
ld [wcf10], a
ret
Func_1a4a1: ; 1a4a1 (6:64a1)
ld a, [$cd38]
ld a, [wcd38]
and a
ret nz
Func_1a4a6: ; 1a4a6 (6:64a6)
xor a
ld [$cd3b], a
ld a, [$cf13]
ld [wcd3b], a
ld a, [wcf13]
swap a
ld [$cf17], a
ld [wcf17], a
xor a
ld [$c206], a
ld hl, $ccd3
ld [wSpriteStateData2 + $06], a
ld hl, wccd3
ld de, RLEList_1a4e9
call DecodeRLEList
dec a
ld [$cd38], a
ld hl, $cc97
ld [wcd38], a
ld hl, wcc97
ld de, RLEList_1a4dc
call DecodeRLEList
ld hl, $d72e
ld hl, wd72e
res 7, [hl]
ld hl, $d730
ld hl, wd730
set 7, [hl]
ld a, $4
ld [$cf10], a
ld [wcf10], a
ret
RLEList_1a4dc: ; 1a4dc (6:64dc)
@ -140,16 +140,16 @@ RLEList_1a4e9: ; 1a4e9 (6:64e9)
db $FF
Func_1a4f4: ; 1a4f4 (6:64f4)
ld a, [$cd38]
ld a, [wcd38]
and a
ret nz
ld a, $0
ld [$cc4d], a
ld [wcc4d], a
ld a, $11
call Predef ; indirect jump to RemoveMissableObject (f1d7 (3:71d7))
ld hl, $d730
ld hl, wd730
res 7, [hl]
ld hl, $d72e
ld hl, wd72e
res 7, [hl]
jp Func_314e
@ -159,31 +159,31 @@ PointerTable_1a510: ; 1a510 (6:6510)
Func_1a514: ; 1a514 (6:6514)
ld a, Bank(Func_9876)
ld [$c0ef], a
ld [$c0f0], a
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY
ld [$c0ee], a
ld [wc0ee], a
call PlaySound
ld a, [$cf13]
ld a, [wcf13]
swap a
ld [$cf17], a
ld [wcf17], a
call Func_3486
ld hl, $ccd3
ld hl, wccd3
ld de, RLEList_PewterMuseumPlayer
call DecodeRLEList
dec a
ld [$cd38], a
ld [wcd38], a
xor a
ld [$d12f], a
ld [wd12f], a
ld a, $4f
call Predef
ld hl, $cc97
ld hl, wcc97
ld de, RLEList_PewterMuseumGuy
call DecodeRLEList
ld hl, $d72e
ld hl, wd72e
res 7, [hl]
ld a, $1
ld [$cf10], a
ld [wcf10], a
ret
RLEList_PewterMuseumPlayer: ; 1a559 (6:6559)
@ -201,12 +201,12 @@ RLEList_PewterMuseumGuy: ; 1a562 (6:6562)
db $FF
Func_1a56b: ; 1a56b (6:656b)
ld a, [$cd38]
ld a, [wcd38]
and a
ret nz
ld hl, $d730
ld hl, wd730
res 7, [hl]
ld hl, $d72e
ld hl, wd72e
res 7, [hl]
jp Func_314e
@ -216,34 +216,34 @@ PointerTable_1a57d: ; 1a57d (6:657d)
Func_1a581: ; 1a581 (6:6581)
ld a, Bank(Func_9876)
ld [$c0ef], a
ld [$c0f0], a
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY
ld [$c0ee], a
ld [wc0ee], a
call PlaySound
ld a, [$cf13]
ld a, [wcf13]
swap a
ld [$cf17], a
ld [wcf17], a
xor a
ld [$c206], a
ld hl, $ccd3
ld [wSpriteStateData2 + $06], a
ld hl, wccd3
ld de, RLEList_PewterGymPlayer
call DecodeRLEList
dec a
ld [$cd38], a
ld [wcd38], a
ld a, $1
ld [$d12f], a
ld [wd12f], a
ld a, $4f
call Predef
ld hl, $cc97
ld hl, wcc97
ld de, RLEList_PewterGymGuy
call DecodeRLEList
ld hl, $d72e
ld hl, wd72e
res 7, [hl]
ld hl, $d730
ld hl, wd730
set 7, [hl]
ld a, $1
ld [$cf10], a
ld [wcf10], a
ret
RLEList_PewterGymPlayer: ; 1a5cd (6:65cd)
@ -266,7 +266,7 @@ RLEList_PewterGymGuy: ; 1a5da (6:65da)
; XXX why would this function want to return on POKEMONTOWER_7?
Func_1a5e7: ; 1a5e7 (6:65e7)
ld a, [W_CURMAP] ; $d35e
ld a, [W_CURMAP] ; W_CURMAP
cp POKEMONTOWER_7
ret z
ld hl, RivalIDs ; $6605
@ -280,7 +280,7 @@ Func_1a5e7: ; 1a5e7 (6:65e7)
ret z
jr .loop
.notRival
ld a, [$cf13]
ld a, [wcf13]
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
jp SetSpriteMovementBytesToFF