summaryrefslogtreecommitdiff
path: root/engine/main_menu.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2016-04-18 08:01:12 -0400
committeryenatch <yenatch@gmail.com>2016-04-18 08:01:12 -0400
commit7aef59841489ea449b9a34d424c681a4b48b88ab (patch)
tree72d46f1cc076564f62b11f5379960cd745a7fc9a /engine/main_menu.asm
parentc5fb2c947ffcdd0ddd80319a24a6acbe828d9598 (diff)
parent5d94fb22ed0e4c9edfca506b80f50ef71fd78664 (diff)
Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
Diffstat (limited to 'engine/main_menu.asm')
-rwxr-xr-xengine/main_menu.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/main_menu.asm b/engine/main_menu.asm
index 637253c12..bad1682c7 100755
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -54,7 +54,7 @@ MainMenu: ; 49cdc
db "MOBILE STUDIUM@"
.Jumptable: ; 0x49d60
-
+
dw MainMenu_Continue
dw MainMenu_NewGame
dw MainMenu_Options
@@ -202,7 +202,7 @@ MainMenuJoypadLoop: ; 49de4
ld a, [w2DMenuFlags1]
set 5, a
ld [w2DMenuFlags1], a
- call Function1f1a
+ call GetScrollingMenuJoypad
ld a, [wMenuJoypad]
cp B_BUTTON
jr z, .b_button
@@ -250,7 +250,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
call TextBox
ret
-.TimeFail
+.TimeFail:
call SpeechTextBox
ret
; 49e3d
@@ -291,11 +291,11 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
ret
; 49e7f
-.TimeNotSet ; 49e7f
+.TimeNotSet: ; 49e7f
db "TIME NOT SET@"
; 49e8c
-.UnusedText ; 49e8c
+.UnusedText: ; 49e8c
; Clock time unknown
text_jump UnknownText_0x1c5182
db "@"
@@ -317,7 +317,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
ret
; 49ea8
-.Days
+.Days:
db "SUN@"
db "MON@"
db "TUES@"
@@ -325,7 +325,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
db "THURS@"
db "FRI@"
db "SATUR@"
-.Day
+.Day:
db "DAY@"
; 49ed0