khuxkm
/
pokered-rematch
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop using [$ff00+$xx] syntax. 

rgbasm treats $ffxx loads the same. This is more consistent and avoids confusion with $ff00+c,
This commit is contained in:
yenatch 2014-03-30 16:30:30 -07:00
parent 5e692b30db
commit ebce80653c
6 changed files with 1445 additions and 1445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio.asm
View File

@ -541,7 +541,7 @@ Music8_OverwriteChannelPointer: ; 2231d (8:631d)
SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
Func_7d13b:: ; 7d13b (1f:513b)
ld a, [$FF00+$dc]
ld a, [$ffdc]
ld c, $0
ld hl, OwnedMonValues
.getSfxPointer

76
audio/engine_1.asm
View File

@ -20,10 +20,10 @@ Func_9103:: ; 0x9103
set 7, a
ld [$c002], a
xor a
ld [$ff00+$25], a
ld [$ff00+$1a], a
ld [$ff25], a
ld [$ff1a], a
ld a, $80
ld [$ff00+$1a], a
ld [$ff1a], a
jr .nextChannel
.asm_912e
call Music2_ApplyMusicAffects
@ -183,9 +183,9 @@ Music2_endchannel: ; 0x91e6
cp CH6
jr nz, .notSfxChannel3
ld a, $0
ld [$ff00+$1a], a
ld [$ff1a], a
ld a, $80
ld [$ff00+$1a], a
ld [$ff1a], a
.notSfxChannel3
jr nz, .asm_9222
ld a, [$c003]
@ -219,9 +219,9 @@ Music2_endchannel: ; 0x91e6
.asm_923f
ld hl, Unknown_9b1f
add hl, bc
ld a, [$ff00+$25]
ld a, [$ff25]
and [hl]
ld [$ff00+$25], a
ld [$ff25], a
.asm_9248
ld a, [$c02a]
cp $14
@ -241,7 +241,7 @@ Music2_endchannel: ; 0x91e6
ret c
.asm_9265
ld a, [$c005]
ld [$ff00+$24], a
ld [$ff24], a
xor a
ld [$c005], a
.asm_926e
@ -534,7 +534,7 @@ Music2_stereopanning: ; 0x9444
cp $f0 ; is this command a stereopanning?
jr nz, Music2_executemusic ; no
call Music2_GetNextMusicByte ; yes
ld [$ff00+$24], a ; store stereopanning
ld [$ff24], a ; store stereopanning
jp Music2_endchannel
Music2_executemusic: ; 0x9450
@ -616,7 +616,7 @@ Music2_unknownsfx0x10:
bit 0, [hl]
jr nz, Music2_note ; no
call Music2_GetNextMusicByte ; yes
ld [$ff00+$10], a
ld [$ff10], a
jp Music2_endchannel
Music2_note:
@ -737,9 +737,9 @@ Music2_notepitch: ; 0x9568
ld b, $0
ld hl, Unknown_9b1f
add hl, bc
ld a, [$ff00+$25]
ld a, [$ff25]
and [hl]
ld [$ff00+$25], a
ld [$ff25], a
jr .done
.notSfxChannel3
ld b, $2
@ -810,7 +810,7 @@ Func_95f8: ; 0x95f8
ld b, $0
ld hl, Unknown_9b27
add hl, bc
ld a, [$ff00+$25]
ld a, [$ff25]
or [hl]
ld d, a
ld a, c
@ -829,7 +829,7 @@ Func_95f8: ; 0x95f8
add hl, bc
and [hl]
ld d, a
ld a, [$ff00+$25]
ld a, [$ff25]
ld hl, Unknown_9b1f
add hl, bc
and [hl]
@ -837,7 +837,7 @@ Func_95f8: ; 0x95f8
ld d, a
.skip
ld a, d
ld [$ff00+$25], a
ld [$ff25], a
ret
Func_9629: ; 0x9629
@ -890,7 +890,7 @@ Func_964b: ; 0x964b
ld hl, $ff30
ld b, $f
ld a, $0
ld [$ff00+$1a], a
ld [$ff1a], a
.loop
ld a, [de]
inc de
@ -900,7 +900,7 @@ Func_964b: ; 0x964b
and a
jr nz, .loop
ld a, $80
ld [$ff00+$1a], a
ld [$ff1a], a
pop de
.notSfxChannel3
ld a, d
@ -1343,17 +1343,17 @@ Func_9876:: ; 0x9876
ld a, $ff
ld [$c004], a
xor a
ld [$ff00+$24], a
ld [$ff24], a
ld a, $8
ld [$ff00+$10], a
ld [$ff10], a
ld a, $0
ld [$ff00+$25], a
ld [$ff25], a
xor a
ld [$ff00+$1a], a
ld [$ff1a], a
ld a, $80
ld [$ff00+$1a], a
ld [$ff1a], a
ld a, $77
ld [$ff00+$24], a
ld [$ff24], a
jp Func_9a8f
Func_994e: ; 0x994e
@ -1499,7 +1499,7 @@ Func_994e: ; 0x994e
cp $4
jr nz, .asm_9a2b
ld a, $8
ld [$ff00+$10], a
ld [$ff10], a
.asm_9a2b
ld a, c
and a
@ -1509,22 +1509,22 @@ Func_994e: ; 0x994e
Func_9a34: ; 0x9a34
ld a, $80
ld [$ff00+$26], a
ld [$ff00+$1a], a
ld [$ff26], a
ld [$ff1a], a
xor a
ld [$ff00+$25], a
ld [$ff00+$1c], a
ld [$ff25], a
ld [$ff1c], a
ld a, $8
ld [$ff00+$10], a
ld [$ff00+$12], a
ld [$ff00+$17], a
ld [$ff00+$21], a
ld [$ff10], a
ld [$ff12], a
ld [$ff17], a
ld [$ff21], a
ld a, $40
ld [$ff00+$14], a
ld [$ff00+$19], a
ld [$ff00+$23], a
ld [$ff14], a
ld [$ff19], a
ld [$ff23], a
ld a, $77
ld [$ff00+$24], a
ld [$ff24], a
xor a
ld [$c000], a
ld [$c003], a
@ -1643,10 +1643,10 @@ Func_9a8f: ; 0x9a8f
ld a, [$c005]
and a
jr nz, .asm_9b15
ld a, [$ff00+$24]
ld a, [$ff24]
ld [$c005], a
ld a, $77
ld [$ff00+$24], a
ld [$ff24], a
.asm_9b15
ret

76
audio/engine_2.asm
View File

@ -20,10 +20,10 @@ Func_21879:: ; 21879 (8:5879)
set 7, a
ld [$c002], a
xor a
ld [$FF00+$25], a
ld [$FF00+$1a], a
ld [$ff25], a
ld [$ff1a], a
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
jr .nextChannel
.applyAffects
call Music8_ApplyMusicAffects
@ -190,9 +190,9 @@ Music8_endchannel: ; 21967 (8:5967)
cp CH6
jr nz, .notSfxChannel3
ld a, $0
ld [$FF00+$1a], a
ld [$ff1a], a
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
.notSfxChannel3
jr nz, .asm_219a3
ld a, [$c003]
@ -226,9 +226,9 @@ Music8_endchannel: ; 21967 (8:5967)
.asm_219c0
ld hl, Unknown_222de
add hl, bc
ld a, [$FF00+$25]
ld a, [$ff25]
and [hl]
ld [$FF00+$25], a
ld [$ff25], a
.asm_219c9
ld a, [$c02a]
cp $14
@ -248,7 +248,7 @@ Music8_endchannel: ; 21967 (8:5967)
ret c
.asm_219e6
ld a, [$c005]
ld [$FF00+$24], a
ld [$ff24], a
xor a
ld [$c005], a
.asm_219ef
@ -541,7 +541,7 @@ Music8_stereopanning: ; 21bc5 (8:5bc5)
cp $f0 ; is this command a stereopanning?
jr nz, Music8_executemusic ; no
call Music8_GetNextMusicByte ; yes
ld [$FF00+$24], a
ld [$ff24], a
jp Music8_endchannel
Music8_executemusic: ; 21bd1 (8:5bd1)
@ -623,7 +623,7 @@ Music8_unknownsfx0x10: ; 21c40 (8:5c40)
bit 0, [hl]
jr nz, Music8_note ; no
call Music8_GetNextMusicByte ; yes
ld [$FF00+$10], a
ld [$ff10], a
jp Music8_endchannel
Music8_note: ; 21c5c (8:5c5c)
@ -744,9 +744,9 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
ld b, $0
ld hl, Unknown_222de
add hl, bc
ld a, [$FF00+$25]
ld a, [$ff25]
and [hl]
ld [$FF00+$25], a
ld [$ff25], a
jr .done
.notSfxChannel3
ld b, $2
@ -817,7 +817,7 @@ Func_21d79: ; 21d79 (8:5d79)
ld b, $0
ld hl, Unknown_222e6
add hl, bc
ld a, [$FF00+$25]
ld a, [$ff25]
or [hl]
ld d, a
ld a, c
@ -836,7 +836,7 @@ Func_21d79: ; 21d79 (8:5d79)
add hl, bc
and [hl]
ld d, a
ld a, [$FF00+$25]
ld a, [$ff25]
ld hl, Unknown_222de
add hl, bc
and [hl]
@ -844,7 +844,7 @@ Func_21d79: ; 21d79 (8:5d79)
ld d, a
.skip
ld a, d
ld [$FF00+$25], a
ld [$ff25], a
ret
Func_21daa: ; 21daa (8:5daa)
@ -897,7 +897,7 @@ Func_21dcc: ; 21dcc (8:5dcc)
ld hl, $ff30
ld b, $f
ld a, $0
ld [$FF00+$1a], a
ld [$ff1a], a
.loop
ld a, [de]
inc de
@ -907,7 +907,7 @@ Func_21dcc: ; 21dcc (8:5dcc)
and a
jr nz, .loop
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
pop de
.notSfxChannel3
ld a, d
@ -1394,17 +1394,17 @@ Func_22035:: ; 22035 (8:6035)
ld a, $ff
ld [$c004], a
xor a
ld [$FF00+$24], a
ld [$ff24], a
ld a, $8
ld [$FF00+$10], a
ld [$ff10], a
ld a, $0
ld [$FF00+$25], a
ld [$ff25], a
xor a
ld [$FF00+$1a], a
ld [$ff1a], a
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
ld a, $77
ld [$FF00+$24], a
ld [$ff24], a
jp Func_2224e
Func_2210d: ; 2210d (8:610d)
@ -1550,7 +1550,7 @@ Func_2210d: ; 2210d (8:610d)
cp $4
jr nz, .asm_221ea
ld a, $8
ld [$FF00+$10], a
ld [$ff10], a
.asm_221ea
ld a, c
and a
@ -1560,22 +1560,22 @@ Func_2210d: ; 2210d (8:610d)
Func_221f3: ; 221f3 (8:61f3)
ld a, $80
ld [$FF00+$26], a
ld [$FF00+$1a], a
ld [$ff26], a
ld [$ff1a], a
xor a
ld [$FF00+$25], a
ld [$FF00+$1c], a
ld [$ff25], a
ld [$ff1c], a
ld a, $8
ld [$FF00+$10], a
ld [$FF00+$12], a
ld [$FF00+$17], a
ld [$FF00+$21], a
ld [$ff10], a
ld [$ff12], a
ld [$ff17], a
ld [$ff21], a
ld a, $40
ld [$FF00+$14], a
ld [$FF00+$19], a
ld [$FF00+$23], a
ld [$ff14], a
ld [$ff19], a
ld [$ff23], a
ld a, $77
ld [$FF00+$24], a
ld [$ff24], a
xor a
ld [$c000], a
ld [$c003], a
@ -1694,10 +1694,10 @@ Func_2224e: ; 2224e (8:624e)
ld a, [$c005]
and a
jr nz, .asm_222d4
ld a, [$FF00+$24]
ld a, [$ff24]
ld [$c005], a
ld a, $77
ld [$FF00+$24], a
ld [$ff24], a
.asm_222d4
ret

76
audio/engine_3.asm
View File

@ -20,10 +20,10 @@ Func_7d177:: ; 7d177 (1f:5177)
set 7, a
ld [$c002], a
xor a
ld [$FF00+$25], a
ld [$FF00+$1a], a
ld [$ff25], a
ld [$ff1a], a
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
jr .nextChannel
.applyAffects
call Music1f_Music2_ApplyMusicAffects
@ -183,9 +183,9 @@ Music1f_endchannel: ; 7d25a (1f:525a)
cp CH6
jr nz, .notSfxChannel3
ld a, $0
ld [$FF00+$1a], a
ld [$ff1a], a
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
.notSfxChannel3
jr nz, .asm_7d296
ld a, [$c003]
@ -219,9 +219,9 @@ Music1f_endchannel: ; 7d25a (1f:525a)
.asm_7d2b3
ld hl, Unknown_7db93
add hl, bc
ld a, [$FF00+$25]
ld a, [$ff25]
and [hl]
ld [$FF00+$25], a
ld [$ff25], a
.asm_7d2bc
ld a, [$c02a]
cp $14
@ -241,7 +241,7 @@ Music1f_endchannel: ; 7d25a (1f:525a)
ret c
.asm_7d2d9
ld a, [$c005]
ld [$FF00+$24], a
ld [$ff24], a
xor a
ld [$c005], a
.asm_7d2e2
@ -534,7 +534,7 @@ Music1f_stereopanning: ; 7d4b8 (1f:54b8)
cp $f0 ; is this command a stereopanning?
jr nz, Music1f_executemusic ; no
call Music1f_GetNextMusicByte ; yes
ld [$FF00+$24], a ; store stereopanning
ld [$ff24], a ; store stereopanning
jp Music1f_endchannel
Music1f_executemusic: ; 7d4c4 (1f:54c4)
@ -616,7 +616,7 @@ Music1f_unknownsfx0x10 ; 7d533 (1f:5533)
bit 0, [hl]
jr nz, Music1f_note ; no
call Music1f_GetNextMusicByte ; yes
ld [$FF00+$10], a
ld [$ff10], a
jp Music1f_endchannel
Music1f_note: ; 7d54f (1f:554f)
@ -737,9 +737,9 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
ld b, $0
ld hl, Unknown_7db93
add hl, bc
ld a, [$FF00+$25]
ld a, [$ff25]
and [hl]
ld [$FF00+$25], a
ld [$ff25], a
jr .quit
.notSfxChannel3
ld b, $2
@ -810,7 +810,7 @@ Func_7d66c: ; 7d66c (1f:566c)
ld b, $0
ld hl, Unknown_7db9b
add hl, bc
ld a, [$FF00+$25]
ld a, [$ff25]
or [hl]
ld d, a
ld a, c
@ -829,7 +829,7 @@ Func_7d66c: ; 7d66c (1f:566c)
add hl, bc
and [hl]
ld d, a
ld a, [$FF00+$25]
ld a, [$ff25]
ld hl, Unknown_7db93
add hl, bc
and [hl]
@ -837,7 +837,7 @@ Func_7d66c: ; 7d66c (1f:566c)
ld d, a
.skip
ld a, d
ld [$FF00+$25], a
ld [$ff25], a
ret
Func_7d69d: ; 7d69d (1f:569d)
@ -890,7 +890,7 @@ Func_7d6bf: ; 7d6bf (1f:56bf)
ld hl, $ff30
ld b, $f
ld a, $0
ld [$FF00+$1a], a
ld [$ff1a], a
.loop
ld a, [de]
inc de
@ -900,7 +900,7 @@ Func_7d6bf: ; 7d6bf (1f:56bf)
and a
jr nz, .loop
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
pop de
.notSfxChannel3
ld a, d
@ -1343,17 +1343,17 @@ Func_7d8ea:: ; 7d8ea (1f:58ea)
ld a, $ff
ld [$c004], a
xor a
ld [$FF00+$24], a
ld [$ff24], a
ld a, $8
ld [$FF00+$10], a
ld [$ff10], a
ld a, $0
ld [$FF00+$25], a
ld [$ff25], a
xor a
ld [$FF00+$1a], a
ld [$ff1a], a
ld a, $80
ld [$FF00+$1a], a
ld [$ff1a], a
ld a, $77
ld [$FF00+$24], a
ld [$ff24], a
jp Func_7db03
Func_7d9c2: ; 7d9c2 (1f:59c2)
@ -1499,7 +1499,7 @@ Func_7d9c2: ; 7d9c2 (1f:59c2)
cp $4
jr nz, .asm_7da9f
ld a, $8
ld [$FF00+$10], a
ld [$ff10], a
.asm_7da9f
ld a, c
and a
@ -1509,22 +1509,22 @@ Func_7d9c2: ; 7d9c2 (1f:59c2)
Func_7daa8: ; 7daa8 (1f:5aa8)
ld a, $80
ld [$FF00+$26], a
ld [$FF00+$1a], a
ld [$ff26], a
ld [$ff1a], a
xor a
ld [$FF00+$25], a
ld [$FF00+$1c], a
ld [$ff25], a
ld [$ff1c], a
ld a, $8
ld [$FF00+$10], a
ld [$FF00+$12], a
ld [$FF00+$17], a
ld [$FF00+$21], a
ld [$ff10], a
ld [$ff12], a
ld [$ff17], a
ld [$ff21], a
ld a, $40
ld [$FF00+$14], a
ld [$FF00+$19], a
ld [$FF00+$23], a
ld [$ff14], a
ld [$ff19], a
ld [$ff23], a
ld a, $77
ld [$FF00+$24], a
ld [$ff24], a
xor a
ld [$c000], a
ld [$c003], a
@ -1643,10 +1643,10 @@ Func_7db03: ; 7db03 (1f:5b03)
ld a, [$c005]
and a
jr nz, .asm_7db89
ld a, [$FF00+$24]
ld a, [$ff24]
ld [$c005], a
ld a, $77
ld [$FF00+$24], a
ld [$ff24], a
.asm_7db89
ret

2650
main.asm
View File

File diff suppressed because it is too large Load Diff

10
menu/pc.asm
View File

@ -1,7 +1,7 @@
Func_213c8:: ; 213c8 (8:53c8)
xor a
ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call SaveScreenTilesToBuffer2
ld a, [$d5a2]
and a
@ -94,7 +94,7 @@ Func_213c8:: ; 213c8 (8:53c8)
ld [wCurrentMenuItem], a ; $cc26
ld [wLastMenuItem], a ; $cc2a
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ret
SomeonesPCText: ; 2148b (8:548b)
@ -196,7 +196,7 @@ BillsPCMenu:
ld de, BoxNoPCText ; $5713
call PlaceString
ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $FF00+$ba
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
call Delay3
call HandleMenuInput
bit 1, a
@ -537,7 +537,7 @@ MonWasReleasedText: ; 0x21820
db "@"
Func_21825:: ; 5824 (8:5825)
ld a, [$ff00+$aa]
ld a, [$ffaa]
cp $1
ret z
ld a, [$c109]
@ -555,7 +555,7 @@ Func_21825:: ; 5824 (8:5825)
jp Func_3ef5
Func_21845:: ; 5845 (8:5845)
ld a, [$ff00+$aa]
ld a, [$ffaa]
cp $2
ret z
ld a, [$c109]