From 908b12dcc7333cea149410772c6440b0e89dd476 Mon Sep 17 00:00:00 2001 From: luckytyphlosion Date: Mon, 11 May 2015 20:07:41 -0400 Subject: Update overworld.asm --- home/overworld.asm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/home/overworld.asm b/home/overworld.asm index c5c180c7..ca1b216d 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1,9 +1,9 @@ -HandleMidJump:: +; HandleMidJump:: ; Handle the player jumping down ; a ledge in the overworld. - ld b, BANK(_HandleMidJump) - ld hl, _HandleMidJump - jp Bankswitch +; ld b, BANK(_HandleMidJump) +; ld hl, _HandleMidJump +; jp Bankswitch EnterMap:: ; Load a new map. @@ -26,11 +26,18 @@ EnterMap:: ld a, [hl] and 1 << 4 | 1 << 3 ; fly warp or dungeon warp jr z, .didNotEnterUsingFlyWarpOrDungeonWarp - res 3, [hl] callba EnterMapAnim call UpdateSprites + ld hl, wd732 + res 3, [hl] + ld hl, wd72e + res 4, [hl] + call Func_342a .didNotEnterUsingFlyWarpOrDungeonWarp callba CheckForceBikeOrSurf ; handle currents in SF islands and forced bike riding in cycling road + ld hl, wd732 + bit 4, [hl] + res 4, [hl] ld hl, wd72d res 5, [hl] call UpdateSprites @@ -44,7 +51,8 @@ OverworldLoop:: call DelayFrame OverworldLoopLessDelay:: call DelayFrame - call LoadGBPal + call Func_342a + ; continue documenting here ld a,[wd736] bit 6,a ; jumping down a ledge? call nz, HandleMidJump -- cgit v1.2.3