summaryrefslogtreecommitdiff
path: root/engine/predefs12.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
committeryenatch <yenatch@gmail.com>2014-07-12 09:02:49 -0400
commitfb11ff7e55be56cef9234c8443614f04f2157a1e (patch)
treea6aa8d0745bd07d0b80090491b5e4b6652de4420 /engine/predefs12.asm
parent15427f532085846ab6b51719be687951a094cb6c (diff)
parent9f29f21d9d43baa7124991dcf3b093fc6c615706 (diff)
Merge pull request #48 from yenatch/master
Clean up post-split main.asm. Get rid of static wram addresses. Lay out a foundation for Yellow.
Diffstat (limited to 'engine/predefs12.asm')
-rwxr-xr-xengine/predefs12.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/predefs12.asm b/engine/predefs12.asm
index ac305c04..380cfc1c 100755
--- a/engine/predefs12.asm
+++ b/engine/predefs12.asm
@@ -1,5 +1,5 @@
Func_480eb: ; 480eb (12:40eb)
- call Load16BitRegisters
+ call GetPredefRegisters
ld a, [rBGP] ; $ff47
or b
ld [rBGP], a ; $ff47
@@ -11,9 +11,9 @@ Func_480eb: ; 480eb (12:40eb)
ret
Func_480ff: ; 480ff (12:40ff)
- call Load16BitRegisters
+ call GetPredefRegisters
ld a, $1
- ld [$d0a0], a
+ ld [wd0a0], a
xor a
.asm_48108
ld [H_NUMTOPRINT], a ; $ff96 (aliases: H_MULTIPLICAND)
@@ -23,7 +23,7 @@ Func_480ff: ; 480ff (12:40ff)
ld a, b
jr nz, .asm_48108
xor a
- ld [$d0a0], a
+ ld [wd0a0], a
ret
Func_48119: ; 48119 (12:4119)
@@ -35,7 +35,7 @@ Func_48119: ; 48119 (12:4119)
jp DelayFrames
Func_48125: ; 48125 (12:4125)
- call Load16BitRegisters
+ call GetPredefRegisters
xor a
.asm_48129
ld [$ff97], a