Reverted ld_hl_pointer macro

This commit is contained in:
PikalaxALT
2015-07-20 22:18:18 -04:00
parent d1e11f77e5
commit 471492b775
60 changed files with 1538 additions and 1079 deletions

View File

@@ -552,16 +552,16 @@ Function17aa22: ; 17aa22 (5e:6a22)
push de
ld a, $3
call Function17aae0
rept 3
add a
add a
add a
endr
add $0
push af
ld a, $4
call Function17aae0
rept 3
add a
add a
add a
endr
add $8
ld c, a
pop af
@@ -658,13 +658,15 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
Function17aac3: ; 17aac3 (5e:6ac3)
ld a, $b
push hl
rept 2
ld [hli], a
ld [hli], a
endr
pop hl
ld de, $14
add hl, de
rept 2
ld [hli], a
ld [hli], a
endr
ret
Function17aad0: ; 17aad0 (5e:6ad0)

View File

@@ -114,8 +114,9 @@ Function1000ba: ; 1000ba
ld a, [wcd25]
ld e, a
ld d, $0
rept 2
add hl, de
add hl, de
endr
ld a, [CreditsTimer]
call GetFarHalfword
ld a, [CreditsTimer]
@@ -1157,9 +1158,9 @@ Function1006fd: ; 1006fd
ld hl, $a800
call GetSRAMBank
xor a
rept 3
ld [hli], a
ld [hli], a
ld [hli], a
endr
call CloseSRAM
ret
; 10070d
@@ -1892,8 +1893,9 @@ Function100bc2: ; 100bc2
ld a, [wcfa9]
ld b, a
ld a, [wd0eb]
rept 2
inc a
inc a
endr
cp b
jp nz, .asm_100bcb
ld a, $1
@@ -2513,8 +2515,9 @@ Unknown_10102c: ; 10102c
Function101050: ; 101050
call Function10107d
ld a, [OTPartyCount]
rept 2
ld hl, $c608
ld hl, $c608
endr
ld bc, $01b3
call Function1010de
ld hl, wc7bb
@@ -4696,8 +4699,9 @@ Function101ee2: ; 101ee2
Function101ee4: ; 101ee4
ld d, 0
ld hl, Unknown_101ef5
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld d, [hl]
ld e, a
@@ -7143,9 +7147,9 @@ Function1030cd: ; 1030cd
ld a, [wcf44]
ld l, a
ld h, 0
rept 3
add hl, hl
add hl, hl
add hl, hl
endr
ld bc, Unknown_103112
add hl, bc
ld b, $30
@@ -7164,8 +7168,9 @@ Function1030cd: ; 1030cd
inc hl
push hl
rept 2
add a
add a
endr
add Unknown_10327a % $100
ld l, a
@@ -7628,8 +7633,9 @@ Function1035c6: ; 1035c6
callba Function10138b
ld b, 0
ld hl, Unknown_1035d7
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -8030,8 +8036,9 @@ Function10383c: ; 10383c
ld [wdc60], a
xor a
ld hl, wdc5c
rept 2
ld [hli], a
ld [hli], a
endr
ld [hl], a
ld hl, UnknownText_0x103876
call PrintText

View File

@@ -339,8 +339,9 @@ Function10827b: ; 10827b
ld e, a
ld d, 0
ld hl, Jumptable_10828a
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -920,8 +921,9 @@ Function108763: ; 108763
ld a, [hSCX]
cp $e0
jr z, .asm_108791
rept 2
dec a
dec a
endr
ld [hSCX], a
cp $f8
jr nz, .asm_10878a
@@ -938,8 +940,9 @@ Function108763: ; 108763
ld a, [hSCY]
cp $f8
jr z, .asm_1087cb
rept 2
dec a
dec a
endr
ld [hSCY], a
cp $40
jr z, .asm_1087a9
@@ -1089,8 +1092,9 @@ Function108894: ; 108894
ld a, [hSCY]
cp $78
jr z, .asm_1088ee
rept 2
inc a
inc a
endr
ld [hSCY], a
cp $30
jr z, .asm_1088c5
@@ -1129,8 +1133,9 @@ Function108894: ; 108894
ld a, [hSCX]
cp $c
jr z, .asm_108906
rept 2
inc a
inc a
endr
ld [hSCX], a
cp $f8
jr nz, .asm_1088e7

File diff suppressed because it is too large Load Diff

View File

@@ -723,8 +723,9 @@ Function17d474: ; 17d474
ld e, a
ld d, 0
ld hl, Jumptable_17d483
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -905,14 +906,16 @@ Function17d48d: ; 17d48d
ld a, [wcd42]
ld c, a
ld b, $0
rept 2
add hl, bc
add hl, bc
endr
ld a, l
ld [wcd4b], a
ld a, h
ld [wcd4c], a
rept 2
add hl, bc
add hl, bc
endr
ld a, l
ld [wcd4d], a
ld a, h
@@ -938,8 +941,9 @@ Function17d5c4:
.asm_17d5ce
srl a
jr c, .asm_17d5d6
rept 2
inc c
inc c
endr
jr .asm_17d5ce
.asm_17d5d6
@@ -1026,10 +1030,12 @@ Function17d60b: ; 17d60b
ld [wcd4c], a
pop de
pop hl
rept 2
inc b
inc b
dec c
endr
rept 2
dec c
endr
jr z, .asm_17d684
push bc
push de
@@ -1075,15 +1081,17 @@ Function17d6a1: ; 17d6a1
ld a, $5
call GetSRAMBank
ld hl, $b1d3
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld [wcd47], a
ld a, [hl]
ld [BGMapPalBuffer], a
ld hl, $b1b3
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld c, a
ld a, [hl]
@@ -1099,8 +1107,9 @@ Function17d6a1: ; 17d6a1
ld de, wcd60
ld bc, $0004
call CopyBytes
rept 2
inc hl
inc hl
endr
ld de, wcd64
ld bc, $0004
call CopyBytes
@@ -1136,8 +1145,9 @@ Function17d711:
ld e, a
ld d, 0
ld hl, Jumptable_17d72a
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1991,8 +2001,9 @@ Function17dccf: ; 17dccf
ld a, [wcd2e]
ld c, a
ld b, $0
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld c, a
ld a, [hl]
@@ -2407,8 +2418,9 @@ Function17ded9: ; 17ded9
jr .asm_17df7b
.asm_17df79
rept 2
inc hl
inc hl
endr
.asm_17df7b
bit 4, b
@@ -2461,8 +2473,9 @@ Function17ded9: ; 17ded9
jr .asm_17dfd2
.asm_17dfd0
rept 2
inc hl
inc hl
endr
.asm_17dfd2
bit 5, b
@@ -2587,8 +2600,9 @@ Function17e026: ; 17e026
jr .asm_17e0a4
.asm_17e0a2
rept 2
inc hl
inc hl
endr
.asm_17e0a4
bit 4, b
@@ -2604,8 +2618,9 @@ Function17e026: ; 17e026
jr .asm_17e0b6
.asm_17e0b4
rept 2
inc hl
inc hl
endr
.asm_17e0b6
bit 5, b
@@ -2627,8 +2642,9 @@ Function17e026: ; 17e026
call CloseSRAM
pop hl
pop bc
rept 2
inc hl
inc hl
endr
jr asm_17e0ee
.asm_17e0e1
@@ -2673,8 +2689,9 @@ Function17e0fd: ; 17e0fd
call ReceiveItem
pop hl
jr c, .asm_17e127
rept 2
inc hl
inc hl
endr
.asm_17e127
ld a, [hli]
@@ -2704,8 +2721,9 @@ Function17e133: ; 17e133
callba MobileCheckOwnMonAnywhere
pop hl
jr c, .asm_17e159
rept 2
inc hl
inc hl
endr
.asm_17e159
ld a, [hli]
@@ -2741,8 +2759,9 @@ Function17e165: ; 17e165
call CheckItem
pop hl
jr c, .asm_17e195
rept 2
inc hl
inc hl
endr
.asm_17e195
ld a, [hli]
@@ -3207,8 +3226,9 @@ Function17e451: ; 17e451
ld [wcd2e], a
ld c, a
ld b, $0
rept 2
add hl, bc
add hl, bc
endr
push hl
ld hl, TileMap
ld bc, $0014
@@ -3433,8 +3453,9 @@ Function17e5af: ; 17e5af
ld l, a
ld a, [wcd4e]
ld h, a
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld e, a
ld a, [hli]
@@ -3499,8 +3520,9 @@ Function17e613: ; 17e613
ld [hli], a
ld a, [de]
inc de
rept 2
dec a
dec a
endr
jr z, .asm_17e63f
ld c, a
ld a, [wcd53]
@@ -3519,8 +3541,9 @@ Function17e613: ; 17e613
add hl, bc
ld a, [de]
dec de
rept 2
dec a
dec a
endr
jr z, .asm_17e674
ld b, a
.asm_17e651
@@ -3529,8 +3552,9 @@ Function17e613: ; 17e613
add $3
ld [hli], a
ld a, [de]
rept 2
dec a
dec a
endr
jr z, .asm_17e664
ld c, a
ld a, $7f
@@ -3556,8 +3580,9 @@ Function17e613: ; 17e613
add $5
ld [hli], a
ld a, [de]
rept 2
dec a
dec a
endr
jr z, .asm_17e689
ld c, a
ld a, [wcd53]
@@ -3583,8 +3608,9 @@ Function17e691: ; 17e691
inc de
push af
ld a, [de]
rept 2
inc de
inc de
endr
and a
.asm_17e69f
jr z, .asm_17e6a5
@@ -3736,8 +3762,9 @@ Function17f047: ; 17f047
ld e, a
ld d, 0
ld hl, Jumptable_17f061
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -3774,8 +3801,9 @@ Function17f081: ; 17f081
ld de, $0004
add hl, de
ld a, [hli]
rept 2
inc hl
inc hl
endr
ld e, l
ld d, h
ld l, c
@@ -3918,8 +3946,9 @@ Function17f154: ; 17f154
pop hl
call Function17f524
jr c, .asm_17f167
rept 2
inc hl
inc hl
endr
ld e, l
ld d, h
ld a, [de]
@@ -4107,8 +4136,9 @@ Function17f220: ; 17f220
ld e, a
ld d, 0
ld hl, .Genders
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld e, a
ld a, [hl]
@@ -4370,8 +4400,9 @@ Function17f3f0: ; 17f3f0
ld a, [de]
ld c, a
ld b, $0
rept 2
add hl, bc
add hl, bc
endr
ld a, [hli]
ld e, a
ld a, [hli]
@@ -4386,11 +4417,12 @@ Function17f3f0: ; 17f3f0
ld e, a
ld d, $0
pop hl
rept 2
add hl, de
add hl, de
inc hl
inc hl
endr
rept 3
inc hl
endr
ld e, l
ld d, h
ld l, c
@@ -4451,8 +4483,9 @@ Function17f44f: ; 17f44f
ld de, $0005
add hl, de
ld a, [hli]
rept 2
inc hl
inc hl
endr
ld e, l
ld d, h
ld l, c
@@ -4695,8 +4728,9 @@ Function17f5ae: ; 17f5ae
ld e, a
ld d, 0
ld hl, Table17f5bd
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -4770,8 +4804,9 @@ Function17f5e4: ; 17f5e4
ld e, a
ld d, $0
ld hl, Table_17f706
rept 2
add hl, de
add hl, de
endr
ld a, [wc301]
ld e, a
ld a, [wc302]
@@ -4809,8 +4844,9 @@ Function17f5e4: ; 17f5e4
jr .asm_17f67d
.asm_17f674
rept 2
inc hl
inc hl
endr
dec c
jr nz, .asm_17f65d
@@ -4828,8 +4864,9 @@ Function17f5e4: ; 17f5e4
ld e, a
ld d, 0
ld hl, Table_17f699
rept 2
add hl, de
add hl, de
endr
ld a, [hli]
ld e, a
ld a, [hl]

View File

@@ -10,9 +10,9 @@ UnusedTitleScreen: ; 10c000
ld [hBGMapMode], a
ld hl, wcf63
rept 3
ld [hli], a
ld [hli], a
ld [hli], a
endr
ld [hl], a
ld hl, UnusedTitleBG_GFX