summaryrefslogtreecommitdiff
path: root/home.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-16 16:25:24 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-16 16:25:24 -0400
commitdba4875d294fc215e968a06d4d623c69da111c1f (patch)
tree7532f2ab1a05899fc87849d695d6273b5b7d5b1d /home.asm
parentb58942a7bc6867d07f8ed94f1177a096be63b148 (diff)
More WRAM label backports
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm18
1 files changed, 11 insertions, 7 deletions
diff --git a/home.asm b/home.asm
index 6d9c080b..2883af15 100644
--- a/home.asm
+++ b/home.asm
@@ -18,12 +18,10 @@ INCLUDE "home/lcd.asm"
INCLUDE "home/time.asm"
INCLUDE "home/init.asm"
INCLUDE "home/serial.asm"
+INCLUDE "home/joypad.asm"
-JoypadInt::
- dr $8df, $8e6
-
-Joypad::
- dr $8e6, $bdf
+Functionaf0:: ; af0
+ dr $af0, $bdf
UpdatePalsIfCGB::
ld a, [hCGB]
@@ -87,10 +85,16 @@ BackUpTilesToBuffer::
dr $3158, $3164
ReloadTilesFromBuffer::
- dr $3164, $3564
+ dr $3164, $344c
+
+Function344c::
+ dr $344c, $3564
Function3564::
dr $3564, $3d4f
DisableAudio::
- dr $3d4f, $3fee
+ dr $3d4f, $3e24
+
+Function3e24::
+ dr $3e24, $3fee