mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-06 15:45:24 +13:00
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>". Label overleads are still an issue.
This commit is contained in:
parent
52ba96f5f4
commit
40c17c906b
290 changed files with 8262 additions and 7759 deletions
|
|
@ -1,16 +1,16 @@
|
|||
Func_46981: ; 46981 (11:6981)
|
||||
xor a
|
||||
ld [$d71e], a
|
||||
ld a, [$d72d]
|
||||
ld [wd71e], a
|
||||
ld a, [wd72d]
|
||||
bit 4, a
|
||||
ret nz
|
||||
call ArePlayerCoordsInArray
|
||||
ret nc
|
||||
ld a, [wWhichTrade] ; $cd3d
|
||||
ld [$d71e], a
|
||||
ld hl, $d72d
|
||||
ld a, [wWhichTrade] ; wWhichTrade
|
||||
ld [wd71e], a
|
||||
ld hl, wd72d
|
||||
set 4, [hl]
|
||||
ld hl, $d732
|
||||
ld hl, wd732
|
||||
set 4, [hl]
|
||||
ret
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ Func_469a0: ; 469a0 (11:69a0)
|
|||
ld b, a
|
||||
cp $ff
|
||||
jr z, .asm_469fc
|
||||
ld a, [W_CURMAP] ; $d35e
|
||||
ld a, [W_CURMAP] ; W_CURMAP
|
||||
cp b
|
||||
jr z, .asm_469be
|
||||
inc de
|
||||
|
|
@ -41,7 +41,7 @@ Func_469a0: ; 469a0 (11:69a0)
|
|||
ld h, [hl]
|
||||
ld l, a
|
||||
push hl
|
||||
ld hl, wWhichTrade ; $cd3d
|
||||
ld hl, wWhichTrade ; wWhichTrade
|
||||
xor a
|
||||
ld [hli], a
|
||||
ld [hli], a
|
||||
|
|
@ -51,10 +51,10 @@ Func_469a0: ; 469a0 (11:69a0)
|
|||
ld a, [hli]
|
||||
cp $ff
|
||||
jr z, .asm_469fc
|
||||
ld [$cd40], a
|
||||
ld [wTrainerScreenY], a
|
||||
ld b, a
|
||||
ld a, [hli]
|
||||
ld [$cd41], a
|
||||
ld [wTrainerScreenX], a
|
||||
ld c, a
|
||||
call Func_46a01
|
||||
ld a, [$ffea]
|
||||
|
|
@ -65,15 +65,15 @@ Func_469a0: ; 469a0 (11:69a0)
|
|||
inc hl
|
||||
inc hl
|
||||
push hl
|
||||
ld hl, $cd3f
|
||||
ld hl, wTrainerFacingDirection
|
||||
inc [hl]
|
||||
pop hl
|
||||
jr .asm_469ce
|
||||
.asm_469f0
|
||||
ld a, [hli]
|
||||
ld [wWhichTrade], a ; $cd3d
|
||||
ld [wWhichTrade], a ; wWhichTrade
|
||||
ld a, [hli]
|
||||
ld [$cd3e], a
|
||||
ld [wTrainerEngageDistance], a
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
|
|
@ -84,37 +84,37 @@ Func_469a0: ; 469a0 (11:69a0)
|
|||
ret
|
||||
|
||||
Func_46a01: ; 46a01 (11:6a01)
|
||||
ld a, [$c109]
|
||||
ld a, [wSpriteStateData1 + 9]
|
||||
cp $4
|
||||
jr z, .asm_46a16
|
||||
cp $8
|
||||
jr z, .asm_46a25
|
||||
cp $c
|
||||
jr z, .asm_46a2b
|
||||
ld a, [W_YCOORD] ; $d361
|
||||
ld a, [W_YCOORD] ; wd361
|
||||
inc a
|
||||
jr .asm_46a1a
|
||||
.asm_46a16
|
||||
ld a, [W_YCOORD] ; $d361
|
||||
ld a, [W_YCOORD] ; wd361
|
||||
dec a
|
||||
.asm_46a1a
|
||||
cp b
|
||||
jr nz, .asm_46a3b
|
||||
ld a, [W_XCOORD] ; $d362
|
||||
ld a, [W_XCOORD] ; wd362
|
||||
cp c
|
||||
jr nz, .asm_46a3b
|
||||
jr .asm_46a38
|
||||
.asm_46a25
|
||||
ld a, [W_XCOORD] ; $d362
|
||||
ld a, [W_XCOORD] ; wd362
|
||||
dec a
|
||||
jr .asm_46a2f
|
||||
.asm_46a2b
|
||||
ld a, [W_XCOORD] ; $d362
|
||||
ld a, [W_XCOORD] ; wd362
|
||||
inc a
|
||||
.asm_46a2f
|
||||
cp c
|
||||
jr nz, .asm_46a3b
|
||||
ld a, [W_YCOORD] ; $d361
|
||||
ld a, [W_YCOORD] ; wd361
|
||||
cp b
|
||||
jr nz, .asm_46a3b
|
||||
.asm_46a38
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue