summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmain.asm2
-rwxr-xr-xwram.asm21
2 files changed, 21 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index 9484124..15127cc 100755
--- a/main.asm
+++ b/main.asm
@@ -4001,7 +4001,7 @@ Func_82a8: ; 0x82a8
call Func_54f
.asm_82de
ld hl, $a244
- ld de, $d948
+ ld de, wKeyConfigs
ld bc, $000e
call Func_f0c
jr c, .asm_82f6
diff --git a/wram.asm b/wram.asm
index 4d30045..9ab0b77 100755
--- a/wram.asm
+++ b/wram.asm
@@ -20,7 +20,26 @@ wSoundTestCurrentBackgroundMusic:: ; d91a
wSoundTextCurrentSoundEffect:: ; 0xd91b
ds 1
- ds 70
+ ds 44
+
+wKeyConfigs:: ; 0xd948
+; each function map to two joypad buttons (see joy_constants.asm)
+wKeyConfigBallStart:: ; 0xd948
+ ds 2
+wKeyConfigLeftFlipper:: ; 0xd94a
+ ds 2
+wKeyConfigRightFlipper:: ; 0xd94c
+ ds 2
+wKeyConfigLeftTilt:: ; 0xd94e
+ ds 2
+wKeyConfigRightTilt:: ; 0xd950
+ ds 2
+wKeyConfigUpperTilt:: ; 0xd952
+ ds 2
+wKeyConfigMenu:: ; 0xd954
+ ds 2
+
+ ds 12
wPokedexFlags:: ; 0xd962
; Each pokemon is represented by one byte in the normal Pokedex order