From bba84059925c25e04fdcef5e4f3e2192176faf2d Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 25 May 2014 11:21:48 -0700 Subject: Rename GetJoypadState -> Joypad. --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index da4109c0..183d62cc 100755 --- a/main.asm +++ b/main.asm @@ -3075,7 +3075,7 @@ Func_7c18: ; 7c18 (1:7c18) SECTION "bank3",ROMX,BANK[$3] -_GetJoypadState:: +_Joypad:: ld a, [hJoyInput] cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset jp z, TrySoftReset @@ -3125,7 +3125,7 @@ TrySoftReset: ld hl, hSoftReset dec [hl] jp z, SoftReset - jp GetJoypadState + jp Joypad INCLUDE "data/map_songs.asm" -- cgit v1.3.1-sl0p