From be2e6796c86a6480dd891e3c76dc8c1118bd6974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Sun, 30 Jun 2024 12:34:04 +0200 Subject: [PATCH] Name Func_07c4 --- constants/misc_constants.asm | 1 + home/overworld.asm | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index a230b3d7a..4ab3bd412 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -19,3 +19,4 @@ DEF TEXT_DELAY_SLOW EQU %101 ; 5 ; wd732 flags DEF BIT_DEBUG_MODE EQU 1 +DEF BIT_JUMPED_INTO_HOLE EQU 4 diff --git a/home/overworld.asm b/home/overworld.asm index 819f1b72f..3650a3136 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -770,7 +770,7 @@ HandleFlyWarpOrDungeonWarp:: set 2, [hl] ; fly warp or dungeon warp res 5, [hl] ; forced to ride bike call LeaveMapAnim - call Func_07c4 + call StopBikeSurf ld a, BANK(PrepareForSpecialWarp) call BankswitchCommon call PrepareForSpecialWarp @@ -779,14 +779,14 @@ HandleFlyWarpOrDungeonWarp:: LeaveMapAnim:: farjp _LeaveMapAnim -Func_07c4:: +StopBikeSurf: ld a, [wWalkBikeSurfState] and a ret z xor a ld [wWalkBikeSurfState], a ld hl, wd732 - bit 4, [hl] + bit BIT_JUMPED_INTO_HOLE, [hl] ret z call PlayDefaultMusic ret