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:
yenatch 2014-05-26 14:04:56 -07:00
parent 52ba96f5f4
commit 40c17c906b
290 changed files with 8262 additions and 7759 deletions

View file

@ -1,37 +1,37 @@
PKMNLeaguePC: ; 0x7657e
ld hl, AccessedHoFPCText
call PrintText
ld hl, $D730
ld hl, wd730
set 6, [hl]
push hl
ld a, [$CFCB]
ld a, [wcfcb]
push af
ld a, [$ffD7]
push af
xor a
ld [$ffD7], a
ld [W_SPRITEFLIPPED], a
ld [$CFCB], a
ld [$CD41], a
ld [$CD42], a
ld a, [$D5A2]
ld [wcfcb], a
ld [wTrainerScreenX], a
ld [wcd42], a
ld a, [wd5a2]
ld b, a
cp a, $33
jr c, .first
ld b, $32
sub b
ld [$CD42], a
ld [wcd42], a
.first
ld hl, $CD42
ld hl, wcd42
inc [hl]
push bc
ld a, [$CD41]
ld [$CD3D], a
ld a, [wTrainerScreenX]
ld [wWhichTrade], a
callba Func_73b3f
call Func_765e5
pop bc
jr c, .second
ld hl, $CD41
ld hl, wTrainerScreenX
inc [hl]
ld a, [hl]
cp b
@ -40,7 +40,7 @@ PKMNLeaguePC: ; 0x7657e
pop af
ld [$ffD7], a
pop af
ld [$CFCB], a
ld [wcfcb], a
pop hl
res 6, [hl]
call GBPalWhiteOutWithDelay3
@ -57,12 +57,12 @@ Func_765e5: ; 765e5 (1d:65e5)
ld a, [hJoyHeld]
bit 1, a
jr nz, .fifth
ld hl, $CC6B
ld de, $CC5B
ld hl, wcc6b
ld de, wcc5b
ld bc, $0050
call CopyData
pop bc
ld a, [$CC5B]
ld a, [wcc5b]
cp a, $FF
jr z, .fourth
dec c
@ -78,38 +78,38 @@ Func_765e5: ; 765e5 (1d:65e5)
Func_76610: ; 76610 (1d:6610)
call GBPalWhiteOutWithDelay3
call ClearScreen
ld hl, $CC5B
ld hl, wcc5b
ld a, [hli]
ld [$CD3D], a
ld [$CF91], a
ld [$D0B5], a
ld [$CFD9], a
ld [$CF1D], a
ld [wWhichTrade], a
ld [wcf91], a
ld [wd0b5], a
ld [wcfd9], a
ld [wcf1d], a
ld a, [hli]
ld [$CD3F], a
ld de, $CD6D
ld [wTrainerFacingDirection], a
ld de, wcd6d
ld bc, $000B
call CopyData
ld b, $0B
ld c, 0
call GoPAL_SET
FuncCoord 12, 5 ; $c410
FuncCoord 12, 5
ld hl, Coord
call GetMonHeader
call LoadFrontSpriteByMonIndex
call GBPalNormal
FuncCoord 0, 13 ; $c4a4
FuncCoord 0, 13
ld hl, Coord
ld b, 2
ld c, $12
call TextBoxBorder
FuncCoord 1, 15 ; $c4cd
FuncCoord 1, 15
ld hl, Coord
ld de, HallOfFameNoText
call PlaceString
FuncCoord 16, 15 ; $c4dc
FuncCoord 16, 15
ld hl, Coord
ld de, $CD42
ld de, wcd42
ld bc, $0103
call PrintNumber
ld b, BANK(Func_702f0)