aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menu/start_sub_menus.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-11 20:37:15 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-11 20:37:15 -0400
commitf5983c0f813d3d908b6016db3ed866e4ca9437dc (patch)
treed6888723f443557ce45c9a00d873caa5e7a8930e /engine/menu/start_sub_menus.asm
parentCharacter dict; surfing minigame; printer debug (diff)
parentMore syncing with pokered (diff)
downloadpokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz
pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz
pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/menu/start_sub_menus.asm')
-rwxr-xr-xengine/menu/start_sub_menus.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index e2491253..792903b7 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -163,7 +163,7 @@ StartMenu_Pokemon: ; 11c36 (4:5c36)
.surf ; 11d66 (4:5d66)
bit 4,a ; does the player have the Soul Badge?
jp z,.newBadgeRequired
- callba CheckForForcedBikeSurf
+ callba IsSurfingAllowed
ld hl,wd728
bit 1,[hl]
res 1,[hl]
@@ -618,12 +618,12 @@ DrawTrainerInfo: ; 1204c (4:604c)
ld c,$e3
call PrintBCDNumber
coord hl, 9, 6
- ld de,wPlayTimeHours + 1 ; hours
+ ld de,wPlayTimeHours ; hours
lb bc, LEFT_ALIGN | 1, 3
call PrintNumber
ld [hl],$d6 ; colon tile ID
inc hl
- ld de,wPlayTimeMinutes + 1 ; minutes
+ ld de,wPlayTimeMinutes ; minutes
lb bc, LEADING_ZEROES | 1, 2
jp PrintNumber