fix controller input display positioning

Author: kirjavascript

README.md

@@ -392,7 +392,7 @@ Dictate if the NTSC or PAL gameplay mechanics should be used. Should automatical
 
 ## Development
 
-To build, you need a copy of `node` and `ca65` installed on your system.
+To build, you need a copy of `node` and `cc65` installed on your system. There are no other dependencies.
 
 Provide a `clean.nes` file of the unpatched ROM and run `sh build.sh` in a shell or `build.bat` on Windows.
 

src/constants.asm

@@ -83,6 +83,7 @@ MENU_MAX_Y_SCROLL := $70
 MENU_TOP_MARGIN_SCROLL := 7 ; in blocks
 
 ; menuConfigSizeLookup
+; menu ram is defined at menuRAM in ./ram.asm
 .define MENUSIZES $0, $0, $0, $0, $F, $7, $8, $C, $20, $10, $1F, $8, $4, $12, $10, $0, $0, $0, $0, $4, $1, $1, $1, $1, $1, $1, $1, $1, $1, $1
 
 .macro MODENAMES

src/gamemodestate/initbackground.asm

@@ -36,10 +36,10 @@ gameModeState_initGameBackground:
         sta PPUADDR
         lda #$9C
         sta PPUADDR
-        lda tmpZ
-        sta PPUDATA
         lda #$2C
         sta PPUDATA
+        lda tmpZ
+        sta PPUDATA
 @heartEnd:
 
 

src/main.asm

@@ -31,6 +31,12 @@ mainLoop:
 .include "nmi/render.asm"
 .include "nmi/pollcontroller.asm"
 
+.include "gamemode/branch.asm"
+    ; -> playAndEnding
+.include "gamemodestate/branch.asm"
+    ; -> updatePlayer1
+.include "playstate/branch.asm"
+
 .include "highscores/data.asm"
 .include "highscores/util.asm"
 .include "highscores/render_menu.asm"
@@ -48,12 +54,6 @@ mainLoop:
 .include "sprites/drawrect.asm"
 .include "sprites/piece.asm"
 
-.include "gamemode/branch.asm"
-    ; -> playAndEnding
-.include "gamemodestate/branch.asm"
-    ; -> updatePlayer1
-.include "playstate/branch.asm"
-
 .include "data/bytebcd.asm"
 .include "data/orientation.asm"
 .include "data/mult.asm"

src/modes/controllerinput.asm

@@ -3,10 +3,10 @@ controllerInputTiles:
         .byte $D0, $D1, $D2, $D3
         .byte $D4, $D4, $D5, $D5
 controllerInputX:
-        .byte $8, $0, $5, $4
-        .byte $1D, $14, $27, $30
+        .byte $9, $0, $5, $5
+        .byte $1D, $14, $28, $31
 controllerInputY:
-        .byte $FF, $0, $5, $FB
+        .byte $0, $0, $5, $FB
         .byte $0, $0, $FF, $FF
 
 controllerInputDisplay: ; called in events, speedtest
@@ -21,6 +21,7 @@ controllerInputDisplayX:
         and #1
         beq @inputContinue
         ldx oamStagingLength
+        clc
         lda controllerInputY, y
         adc #$4C
         sta oamStaging, x
@@ -32,6 +33,7 @@ controllerInputDisplayX:
         sta oamStaging, x
         inx
         lda controllerInputX, y
+        clc
         adc #$13
         adc tmp3
         sta oamStaging, x

src/playstate/gameover_rocket.asm

@@ -139,7 +139,7 @@ CNROM_CHR_ROCKET:
         sta renderMode
         lda #$1
         sta endingSleepCounter
-        lda #$80 ; timed in bizhawk tasstudio to be 1 frame longer than usual
+        lda #$80 ; timed in bizhawk tasstudio to be 1 frame longer than usual (probably a lag frame)
         sta endingSleepCounter+1
 
 endingLoop: