godzil/sd2snes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SNES menu: swap A and B buttons

Browse Source
This commit is contained in:
ikari 2012-01-14 02:23:43 +01:00
parent d139fdb40c
commit 2d89eb8000
5 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snes/const.a65
View File

@ -139,7 +139,7 @@ window_ev .byt 27
window_tl .byt 28 window_tl .byt 28
window_tr .byt 29 window_tr .byt 29
text_clkset .byt "Please set the clock.", 0 text_clkset .byt "Please set the clock.", 0
text_buttonB .byt "Dpad: sel/chg, B: OK", 0 text_buttonB .byt "Dpad: sel/chg, A: OK", 0
time_win_x .byt 18 time_win_x .byt 18
time_win_y .byt 15 time_win_y .byt 15
time_win_w .byt 27 time_win_w .byt 27
@ -161,4 +161,4 @@ text_mm_scic .byt "Enable SuperCIC", 0
text_mm_vmode_menu .byt "Menu video mode", 0 text_mm_vmode_menu .byt "Menu video mode", 0
text_mm_vmode_game .byt "Game video mode", 0 text_mm_vmode_game .byt "Game video mode", 0
text_mm_sysinfo .byt "System Information", 0 text_mm_sysinfo .byt "System Information", 0
text_statusbar_keys .byt "B:Select A:Back X:Menu", 0 text_statusbar_keys .byt "A:Select B:Back X:Menu", 0

1
snes/data.a65
View File

@ -78,6 +78,7 @@ time_y10 .byt 0
time_y100 .byt 0 time_y100 .byt 0
time_sel .byt 0 time_sel .byt 0
time_exit .byt 0 time_exit .byt 0
time_cancel .byt 0
time_ptr .byt 0 time_ptr .byt 0
time_tmp .byt 0 time_tmp .byt 0
;-- ;--

12
snes/mainmenu.a65
View File

@ -120,13 +120,13 @@ mm_menuloop
and pad1trig+1 and pad1trig+1
bne mmkey_b bne mmkey_b
bra mm_menuloop bra mm_menuloop
mmkey_a mmkey_b
jsr restore_screen jsr restore_screen
plp plp
rts rts
mmkey_b mmkey_a
jsr mmkey_b_2 jsr mmkey_a_2
jmp mm_redraw jmp mm_redraw
mmkey_down mmkey_down
@ -156,10 +156,10 @@ mmkey_up_2
+ +
rts rts
mmkey_b_2 mmkey_a_2
jsr restore_screen jsr restore_screen
phk ; push return bank for subroutine phk ; push return bank for subroutine
per mmkey_b_2_return-1 ; push return addr for subroutine per mmkey_a_2_return-1 ; push return addr for subroutine
xba xba
lda #$00 lda #$00
xba xba
@ -175,7 +175,7 @@ mmkey_b_2
pha ; push subroutine addr pha ; push subroutine addr
sep #$20 : .as sep #$20 : .as
rtl ; jump to subroutine rtl ; jump to subroutine
mmkey_b_2_return mmkey_a_2_return
rts rts
mm_do_refresh mm_do_refresh

8
snes/menu.a65
View File

@ -442,7 +442,7 @@ menu_key_right:
sep #$20 : .as sep #$20 : .as
rts rts
menu_key_b: menu_key_a:
jsr select_item jsr select_item
rts rts
@ -456,15 +456,15 @@ do_setup448
jsr setup_448 jsr setup_448
rts rts
menu_key_a: menu_key_b:
rep #$20 : .al rep #$20 : .al
lda dirstart_addr lda dirstart_addr
beq skip_key_a beq skip_key_b
sta dirptr_addr sta dirptr_addr
lda #$0000 lda #$0000
sta menu_sel sta menu_sel
bra select_item bra select_item
skip_key_a skip_key_b
sep #$20 : .as sep #$20 : .as
rts rts

17
snes/time.a65
View File

@ -2,7 +2,7 @@
#include "dma.i65" #include "dma.i65"
timebox_data timebox_data
; string offset, selection width, bcdtime offset, 1s limit, 10s limit ; string offset, selection width, bcdtime offset
.byt 0, 4, 9 .byt 0, 4, 9
.byt 5, 2, 8 .byt 5, 2, 8
.byt 8, 2, 6 .byt 8, 2, 6
@ -46,6 +46,7 @@ time_init:
jsr gettime jsr gettime
stz time_sel stz time_sel
stz time_exit stz time_exit
stz time_cancel
lda #^text_buttonB lda #^text_buttonB
sta print_bank sta print_bank
ldx #!text_buttonB ldx #!text_buttonB
@ -120,17 +121,29 @@ timeloop1
lda #$80 lda #$80
and pad1trig+1 and pad1trig+1
bne tkey_b bne tkey_b
lda #$80
and pad1trig
bne tkey_a
; do stuff ; do stuff
lda time_exit lda time_exit
beq timeloop1 bne timesave
; set clock ; set clock
lda time_cancel
bne timenosave
beq timeloop1
timesave
jsr settime jsr settime
timenosave
; restore text area ; restore text area
jsr restore_screen jsr restore_screen
plp plp
rtl rtl
tkey_b tkey_b
inc time_cancel
jmp time_update
tkey_a
inc time_exit inc time_exit
jmp time_update jmp time_update