Blindly use wram labels for everything except mobile, part 2.

This commit is contained in:
yenatch
2015-02-10 14:16:31 -08:00
parent 8e03321069
commit 849595e537
12 changed files with 490 additions and 482 deletions

View File

@@ -69,21 +69,21 @@ Table8d7a: ; 8d7a
Function8db8: ; 8db8
ld hl, PalPacket_9c66 + 1
ld de, $d000
ld de, Unkn1Pals
ld c, $4
call Function9615
ld hl, PalPacket_9c66 + 1
ld de, $d020
ld de, Unkn1Pals + $20
ld c, $4
call Function9615
ld hl, PalPacket_9c66 + 1
ld de, MartPointer
ld de, Unkn2Pals
ld c, $2
call Function9615
jr Function8e23
Function8ddb: ; 8ddb
ld de, $d000
ld de, Unkn1Pals
call Function9729
push hl
call Function9643
@@ -108,7 +108,7 @@ Function8ddb: ; 8ddb
call Function9643
ld hl, Palettes_a8ca
call Function9643
ld de, MartPointer
ld de, Unkn2Pals
pop hl
call Function9643
pop hl
@@ -123,11 +123,11 @@ Function8e23: ; 8e23
ld bc, $0168
ld a, $2
call ByteFill
ld hl, $ce29
hlcoord 0, 4, AttrMap
ld bc, $080a
ld a, $0
call Function9663
ld hl, $cde3
hlcoord 10, 0, AttrMap
ld bc, $070a
ld a, $1
call Function9663
@@ -135,20 +135,20 @@ Function8e23: ; 8e23
ld bc, $040a
ld a, $2
call Function9663
ld hl, $ce6f
hlcoord 10, 7, AttrMap
ld bc, $050a
ld a, $3
call Function9663
ld hl, $cebf
hlcoord 10, 11, AttrMap
ld bc, $0109
ld a, $4
call Function9663
ld hl, $cec9
hlcoord 0, 12, AttrMap
ld bc, $0078
ld a, $7
call ByteFill
ld hl, Palettes_979c
ld de, $d050
ld de, Unkn2Pals + $10
ld bc, $0030
ld a, $5
call FarCopyWRAM
@@ -166,7 +166,7 @@ Function8e8b: ; 8e8b
ld hl, Palette_b309
.asm_8e93
ld de, $d038
ld de, wd038
ld bc, $0008
ld a, $5
call FarCopyWRAM
@@ -180,7 +180,7 @@ Function8e9f: ; 8e9f
ld hl, Palette_b309
.asm_8ead
ld de, $d000
ld de, Unkn1Pals
ld bc, $0008
ld a, $5
call FarCopyWRAM
@@ -198,7 +198,7 @@ Function8eb9: ; 8eb9
ld hl, Palettes_b729
.asm_8ec8
ld de, $d000
ld de, Unkn1Pals
ld bc, $0030
ld a, $5
call FarCopyWRAM
@@ -209,8 +209,8 @@ Function8eb9: ; 8eb9
; 8edb
Function8edb: ; 8edb
ld de, $d000
ld a, [$cda1]
ld de, Unkn1Pals
ld a, [wcda1]
ld l, a
ld h, $0
add hl, hl
@@ -225,7 +225,7 @@ Function8edb: ; 8edb
ld hl, Palettes_a8ca
call Function9643
ld hl, Palette8f52
ld de, $d018
ld de, wd018
ld bc, $0018
ld a, $5
call FarCopyWRAM
@@ -234,19 +234,19 @@ Function8edb: ; 8edb
ld bc, $0814
ld a, $1
call Function9663
ld hl, $cf23
hlcoord 10, 16, AttrMap
ld bc, $000a
ld a, $2
call ByteFill
ld hl, $ce4a
hlcoord 13, 5, AttrMap
ld bc, $0202
ld a, $3
call Function9663
ld hl, $ce4c
hlcoord 15, 5, AttrMap
ld bc, $0202
ld a, $4
call Function9663
ld hl, $ce4e
hlcoord 17, 5, AttrMap
ld bc, $0202
ld a, $5
call Function9663
@@ -300,13 +300,13 @@ Function8f70: ; 8f70
.asm_8f90
call Function9699
ld hl, $cdee
hlcoord 1, 1, AttrMap
ld bc, $0707
ld a, $1
call Function9663
call Function971a
ld hl, Palette8fc2
ld de, $d078
ld de, Unkn2Pals + $38
ld bc, $0008
ld a, $5
call FarCopyWRAM
@@ -349,7 +349,7 @@ Function8fca: ; 8fca
.asm_8fed
call Function9699
ld hl, $ce2a
hlcoord 1, 4, AttrMap
ld bc, $0707
ld a, $1
call Function9663
@@ -372,7 +372,7 @@ Function9009: ; 9009
.asm_901a
call Function9699
ld hl, $cdee
hlcoord 1, 1, AttrMap
ld bc, $0707
ld a, $1
call Function9663
@@ -400,7 +400,7 @@ Function903e: ; 903e
call Function9775
call Function9643
call Function9699
ld hl, $ce44
hlcoord 7, 5, AttrMap
ld bc, $0707
ld a, $1
call Function9663
@@ -419,43 +419,43 @@ Function906e: ; 906e
ld a, $5
call FarCopyWRAM
call Function9699
ld hl, $ce01
hlcoord 0, 2, AttrMap
ld bc, $0a03
ld a, $2
call Function9663
ld hl, $ce12
hlcoord 17, 2, AttrMap
ld bc, $0a03
ld a, $2
call Function9663
ld hl, $ce29
hlcoord 0, 4, AttrMap
ld bc, $0603
ld a, $3
call Function9663
ld hl, $ce3a
hlcoord 17, 4, AttrMap
ld bc, $0603
ld a, $3
call Function9663
ld hl, $ce51
hlcoord 0, 6, AttrMap
ld bc, $0203
ld a, $4
call Function9663
ld hl, $ce62
hlcoord 17, 6, AttrMap
ld bc, $0203
ld a, $4
call Function9663
ld hl, $ce05
hlcoord 4, 2, AttrMap
ld bc, $020c
ld a, $1
call Function9663
ld hl, $ce04
hlcoord 3, 2, AttrMap
ld bc, $0a01
ld a, $1
call Function9663
ld hl, $ce11
hlcoord 16, 2, AttrMap
ld bc, $0a01
ld a, $1
call Function9663
ld hl, $cec9
hlcoord 0, 12, AttrMap
ld bc, $0078
ld a, $7
call ByteFill
@@ -474,7 +474,7 @@ Function90f8: ; 90f8
ld a, $3c
call Function9625
call Function9630
ld hl, $ce51
hlcoord 0, 6, AttrMap
ld bc, $0c14
ld a, $1
call Function9663
@@ -620,7 +620,7 @@ Function91e4: ; 91e4
call Function974b
call Function9643
ld hl, Palettes_979c
ld de, $d050
ld de, Unkn2Pals + $10
ld bc, $0030
ld a, $5
call FarCopyWRAM
@@ -723,7 +723,7 @@ Function9289: ; 9289
.asm_92e3
call ByteFill
ld hl, $cdfb
hlcoord 14, 1, AttrMap
ld bc, $0705
ld a, [PlayerGender]
and a
@@ -733,33 +733,33 @@ Function9289: ; 9289
.asm_92f6
call Function9663
ld hl, $cdff
hlcoord 18, 1, AttrMap
ld [hl], $1
ld hl, $ceb7
hlcoord 2, 11, AttrMap
ld bc, $0204
ld a, $1
call Function9663
ld hl, $cebb
hlcoord 6, 11, AttrMap
ld bc, $0204
ld a, $2
call Function9663
ld hl, $cebf
hlcoord 10, 11, AttrMap
ld bc, $0204
ld a, $3
call Function9663
ld hl, $cec3
hlcoord 14, 11, AttrMap
ld bc, $0204
ld a, $4
call Function9663
ld hl, $cef3
hlcoord 2, 14, AttrMap
ld bc, $0204
ld a, $5
call Function9663
ld hl, $cef7
hlcoord 6, 14, AttrMap
ld bc, $0204
ld a, $6
call Function9663
ld hl, $cefb
hlcoord 10, 14, AttrMap
ld bc, $0204
ld a, $7
call Function9663
@@ -767,7 +767,7 @@ Function9289: ; 9289
and a
push af
jr z, .asm_935d
ld hl, $ceff
hlcoord 14, 14, AttrMap
ld bc, $0204
ld a, $1
call Function9663
@@ -780,7 +780,7 @@ Function9289: ; 9289
.asm_9363
ld a, c
ld hl, $cdff
hlcoord 18, 1, AttrMap
ld [hl], a
call Function96b3
call Function96a4
@@ -803,7 +803,7 @@ Function9373: ; 9373
add hl, bc
call Function9643
call Function9699
ld hl, $cdf8
hlcoord 11, 1, AttrMap
ld bc, $0209
ld a, $1
call Function9663
@@ -863,19 +863,19 @@ Function93d3: ; 93d3
ld bc, $010a
ld a, $1
call Function9663
ld hl, $cde3
hlcoord 10, 0, AttrMap
ld bc, $010a
ld a, $2
call Function9663
ld hl, $ce08
hlcoord 7, 2, AttrMap
ld bc, $0901
ld a, $3
call Function9663
ld hl, $ce65
hlcoord 0, 7, AttrMap
ld bc, $0305
ld a, $4
call Function9663
ld hl, $ce15
hlcoord 0, 3, AttrMap
ld bc, $0305
ld a, $5
call Function9663
@@ -944,7 +944,7 @@ Function9499: ; 9499
call Function91c8
ld de, $0014
ld hl, AttrMap
ld a, [$cf82]
ld a, [wcf82]
.asm_94a5
and a
jr z, .asm_94ac
@@ -953,19 +953,19 @@ Function9499: ; 9499
jr .asm_94a5
.asm_94ac
ld a, [$cf83]
ld a, [wcf83]
ld e, a
ld d, $0
add hl, de
ld a, [$cf82]
ld a, [wcf82]
ld b, a
ld a, [$cf84]
ld a, [wcf84]
inc a
sub b
ld b, a
ld a, [$cf83]
ld a, [wcf83]
ld c, a
ld a, [$cf85]
ld a, [wcf85]
sub c
inc a
ld c, a
@@ -979,11 +979,11 @@ Function94d0: ; 94d0
ld hl, PalPacket_9ba6 + 1
call Function9610
call Function9699
ld hl, $ce29
hlcoord 0, 4, AttrMap
ld bc, $0a14
ld a, $2
call Function9663
ld hl, $ce51
hlcoord 0, 6, AttrMap
ld bc, $0614
ld a, $1
call Function9663
@@ -1003,7 +1003,7 @@ Function94fa: ; 94fa
ld de, Unkn2Pals
call Function9630
ld hl, Palette_9521
ld de, $d048
ld de, Unkn2Pals + 8
call Function9630
call Function9699
call Function96b3
@@ -1048,7 +1048,7 @@ Function9555: ; 9555
ld bc, $0008
ld a, $5
call FarCopyWRAM
ld de, $d078
ld de, Unkn2Pals + $38
ld a, $1c
call Function9625
call Function9630
@@ -1076,15 +1076,15 @@ Function9591: ; 9591
call FarCopyWRAM
call Function96a4
call Function9699
ld hl, $ce68
hlcoord 3, 7, AttrMap
ld bc, $080e
ld a, $1
call Function9663
ld hl, $ce3e
hlcoord 1, 5, AttrMap
ld bc, $0112
ld a, $1
call Function9663
ld hl, $cf1a
hlcoord 1, 16, AttrMap
ld bc, $0112
ld a, $1
call Function9663
@@ -1092,7 +1092,7 @@ Function9591: ; 9591
ld bc, $1102
ld a, $1
call Function9663
ld hl, $ce4f
hlcoord 18, 5, AttrMap
ld bc, $0c01
ld a, $1
call Function9663

View File

@@ -68,7 +68,7 @@ Function86b4: ; 86b4
ld hl, BlkPacket_9aa6
call Function9809
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld a, [PlayerHPPal]
@@ -79,13 +79,13 @@ Function86b4: ; 86b4
ld de, Palettes_a8be
add hl, de
ld a, [hli]
ld [$cdac], a
ld [wcda9 + 3], a
ld a, [hli]
ld [$cdad], a
ld [wcda9 + 4], a
ld a, [hli]
ld [$cdae], a
ld [wcda9 + 5], a
ld a, [hl]
ld [$cdaf], a
ld [wcda9 + 6], a
ld a, [EnemyHPPal]
ld l, a
ld h, $0
@@ -94,37 +94,37 @@ Function86b4: ; 86b4
ld de, Palettes_a8be
add hl, de
ld a, [hli]
ld [$cdb2], a
ld [wcda9 + 9], a
ld a, [hli]
ld [$cdb3], a
ld [wcda9 + 10], a
ld a, [hli]
ld [$cdb4], a
ld [wcda9 + 11], a
ld a, [hl]
ld [$cdb5], a
ld [wcda9 + 12], a
ld hl, PalPacket_9cf6
ld de, $cdb9
ld de, wcda9 + $10
ld bc, $0010
call CopyBytes
call Function9729
ld a, [hli]
ld [$cdbc], a
ld [wcda9 + $13], a
ld a, [hli]
ld [$cdbd], a
ld [wcda9 + $14], a
ld a, [hli]
ld [$cdbe], a
ld [wcda9 + $15], a
ld a, [hl]
ld [$cdbf], a
ld [wcda9 + $16], a
call Function973a
ld a, [hli]
ld [$cdc2], a
ld [wcda9 + $19], a
ld a, [hli]
ld [$cdc3], a
ld [wcda9 + $1a], a
ld a, [hli]
ld [$cdc4], a
ld [wcda9 + $1b], a
ld a, [hl]
ld [$cdc5], a
ld hl, $cda9
ld de, $cdb9
ld [wcda9 + $1c], a
ld hl, wcda9
ld de, wcda9 + $10
ld a, $1
ld [SGBPredef], a
ret
@@ -132,17 +132,17 @@ Function86b4: ; 86b4
Function873c: ; 873c
ld hl, PalPacket_9bd6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld hl, $cdaa
ld hl, wcda9 + 1
ld [hl], $10
inc hl
inc hl
ld a, [PlayerHPPal]
add $2f
ld [hl], a
ld hl, $cda9
ld hl, wcda9
ld de, BlkPacket_9ad6
ret
; 875c
@@ -155,10 +155,10 @@ Function875c: ; 875c
Function8763: ; 8763
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld a, [$cda1]
ld a, [wcda1]
ld l, a
ld h, $0
add hl, hl
@@ -166,41 +166,41 @@ Function8763: ; 8763
ld de, Palettes_a8be
add hl, de
ld a, [hli]
ld [$cdac], a
ld [wcda9 + 3], a
ld a, [hli]
ld [$cdad], a
ld [wcda9 + 4], a
ld a, [hli]
ld [$cdae], a
ld [wcda9 + 5], a
ld a, [hl]
ld [$cdaf], a
ld [wcda9 + 6], a
ld a, [CurPartySpecies]
ld bc, TempMonDVs
ld bc, wd10e + 21
call Function974b
ld a, [hli]
ld [$cdb2], a
ld [wcda9 + 9], a
ld a, [hli]
ld [$cdb3], a
ld [wcda9 + 10], a
ld a, [hli]
ld [$cdb4], a
ld [wcda9 + 11], a
ld a, [hl]
ld [$cdb5], a
ld hl, $cda9
ld [wcda9 + 12], a
ld hl, wcda9
ld de, BlkPacket_9ac6
ret
; 87ab
Function87ab: ; 87ab
ld hl, PalPacket_9c56
ld de, $cdaa
ld de, wcda9 + 1
ret
; 87b2
Function87b2: ; 87b2
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld hl, $cdac
ld hl, wcda9 + 3
ld [hl], $9f
inc hl
ld [hl], $2a
@@ -211,24 +211,24 @@ Function87b2: ; 87b2
ld a, [CurPartySpecies]
call Function9775
ld a, [hli]
ld [$cdb2], a
ld [wcda9 + 9], a
ld a, [hli]
ld [$cdb3], a
ld [wcda9 + 10], a
ld a, [hli]
ld [$cdb4], a
ld [wcda9 + 11], a
ld a, [hl]
ld [$cdb5], a
ld hl, $cda9
ld [wcda9 + 12], a
ld hl, wcda9
ld de, BlkPacket_9ae6
ret
; 87e9
Function87e9: ; 87e9
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld hl, $cdac
ld hl, wcda9 + 3
ld [hl], $9f
inc hl
ld [hl], $2a
@@ -237,17 +237,17 @@ Function87e9: ; 87e9
inc hl
ld [hl], $19
ld a, [CurPartySpecies]
ld bc, TempMonDVs
ld bc, wd10e + 21
call Function974b
ld a, [hli]
ld [$cdb2], a
ld [wcda9 + 9], a
ld a, [hli]
ld [$cdb3], a
ld [wcda9 + 10], a
ld a, [hli]
ld [$cdb4], a
ld [wcda9 + 11], a
ld a, [hl]
ld [$cdb5], a
ld hl, $cda9
ld [wcda9 + 12], a
ld hl, wcda9
ld de, BlkPacket_9ae6
ret
; 8823
@@ -260,10 +260,10 @@ Function8823: ; 8823
Function882a: ; 882a
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld hl, $cdac
ld hl, wcda9 + 3
ld [hl], $9f
inc hl
ld [hl], $2a
@@ -271,7 +271,7 @@ Function882a: ; 882a
ld [hl], $5a
inc hl
ld [hl], $19
ld hl, $cda9
ld hl, wcda9
ld de, BlkPacket_9a86
ret
; 884b
@@ -355,11 +355,11 @@ Function889e: ; 889e
Function88b1: ; 88b1
ld hl, PalPacket_9bd6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
call Function8a0c
ld hl, $cdaa
ld hl, wcda9 + 1
ld [hld], a
ld de, BlkPacket_9a86
ld a, $9
@@ -370,14 +370,14 @@ Function88b1: ; 88b1
Function88cd: ; 88cd
push bc
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
pop bc
ld a, c
and a
jr z, .asm_88ef
ld hl, $cdac
ld hl, wcda9 + 3
ld [hl], $e7
inc hl
ld [hl], $1c
@@ -397,16 +397,16 @@ Function88cd: ; 88cd
ld a, [PlayerHPPal]
call Function974b
ld a, [hli]
ld [$cdac], a
ld [wcda9 + 3], a
ld a, [hli]
ld [$cdad], a
ld [wcda9 + 4], a
ld a, [hli]
ld [$cdae], a
ld [wcda9 + 5], a
ld a, [hl]
ld [$cdaf], a
ld [wcda9 + 6], a
.asm_8913
ld hl, $cda9
ld hl, wcda9
ld de, BlkPacket_9a86
ret
; 891a
@@ -425,37 +425,37 @@ Function8921: ; 8921
Function8928: ; 8928
ld hl, PalPacket_9bd6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld hl, BlkPacket_9a86
ld de, $cdb9
ld de, wcda9 + $10
ld bc, $0010
call CopyBytes
call Function8a0c
ld hl, $cdaa
ld hl, wcda9 + 1
ld [hl], a
ld hl, $cdac
ld hl, wcda9 + 3
ld [hl], $2e
ld hl, $cdbc
ld hl, wcda9 + $13
ld a, $5
ld [hli], a
ld a, [$cf83]
ld a, [wcf83]
ld [hli], a
ld a, [$cf82]
ld a, [wcf82]
ld [hli], a
ld a, [$cf85]
ld a, [wcf85]
ld [hli], a
ld a, [$cf84]
ld a, [wcf84]
ld [hl], a
ld hl, $cda9
ld de, $cdb9
ld hl, wcda9
ld de, wcda9 + $10
ret
; 8969
Function8969: ; 8969
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld a, [CurPartySpecies]
@@ -466,7 +466,7 @@ Function8969: ; 8969
add hl, hl
ld de, PokemonPalettes
add hl, de
ld a, [$cf65]
ld a, [wcf65]
and 3
sla a
sla a
@@ -474,14 +474,14 @@ Function8969: ; 8969
ld b, 0
add hl, bc
ld a, [hli]
ld [$cdac], a
ld [wcda9 + 3], a
ld a, [hli]
ld [$cdad], a
ld [wcda9 + 4], a
ld a, [hli]
ld [$cdae], a
ld [wcda9 + 5], a
ld a, [hl]
ld [$cdaf], a
ld hl, $cda9
ld [wcda9 + 6], a
ld hl, wcda9
ld de, BlkPacket_9a86
ret
; 89a6
@@ -494,21 +494,21 @@ Function89a6: ; 89a6
Function89ad: ; 89ad
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld a, [CurPartySpecies]
ld bc, TempMonDVs
ld bc, wd10e + 21
call Function974b
ld a, [hli]
ld [$cdac], a
ld [wcda9 + 3], a
ld a, [hli]
ld [$cdad], a
ld [wcda9 + 4], a
ld a, [hli]
ld [$cdae], a
ld [wcda9 + 5], a
ld a, [hl]
ld [$cdaf], a
ld hl, $cda9
ld [wcda9 + 6], a
ld hl, wcda9
ld de, BlkPacket_9a86
ret
; 89d9
@@ -521,21 +521,21 @@ Function89d9: ; 89d9
Function89e0: ; 89e0
ld hl, PalPacket_9ce6
ld de, $cda9
ld de, wcda9
ld bc, $0010
call CopyBytes
ld a, [CurPartySpecies]
ld bc, TempMonDVs
ld bc, wd10e + 21
call Function9764
ld a, [hli]
ld [$cdac], a
ld [wcda9 + 3], a
ld a, [hli]
ld [$cdad], a
ld [wcda9 + 4], a
ld a, [hli]
ld [$cdae], a
ld [wcda9 + 5], a
ld a, [hl]
ld [$cdaf], a
ld hl, $cda9
ld [wcda9 + 6], a
ld hl, wcda9
ld de, BlkPacket_9a86
ret
; 8a0c
@@ -548,7 +548,7 @@ Function8a0c: ; 8a0c
ret
.asm_8a16
ld a, [$d19a]
ld a, [wd19a]
cp $2
jr z, .asm_8a39
cp $4