move things around

zohassadar · zohassadar · commit d999b6ddd366 · 2025-09-24T01:59:34.000Z
diff --git a/src/keyboard/buttonmap.asm b/src/keyboard/buttonmap.asm
@@ -0,0 +1,10 @@
+; see keymap.asm for full list of keys
+
+kbMappedUp     = keyK
+kbMappedDown   = keyJ
+kbMappedLeft   = keyH
+kbMappedRight  = keyL
+kbMappedB      = keyD
+kbMappedA      = keyF
+kbMappedSelect = keyShiftLeft
+kbMappedStart  = keyReturn
diff --git a/src/keyboard/map.asm b/src/keyboard/map.asm
diff --git a/src/keyboard/poll.asm b/src/keyboard/poll.asm
@@ -1,16 +1,3 @@
-.include "keyboardmap.asm"
-
-; for remapping, see above map file for full list
-kbMappedUp     = keyK
-kbMappedDown   = keyJ
-kbMappedLeft   = keyH
-kbMappedRight  = keyL
-kbMappedB      = keyD
-kbMappedA      = keyF
-kbMappedSelect = keyShiftLeft
-kbMappedStart  = keyReturn
-
-
 ; https://www.nesdev.org/wiki/Family_BASIC_Keyboard
 
 ; Input ($4016 write)
diff --git a/src/main.asm b/src/main.asm
@@ -36,7 +36,9 @@ mainLoop:
 .include "nmi/render.asm"
 .include "nmi/pollcontroller.asm"
 .if KEYBOARD
-.include "nmi/pollkeyboard.asm"
+.include "keyboard/map.asm"
+.include "keyboard/buttonmap.asm"
+.include "keyboard/poll.asm"
 .endif
 
 .include "gamemode/branch.asm"
