From 15f6a0af437436200a944f81dee0a5f477b2e8eb Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 22 Oct 2020 12:55:46 -0400 Subject: [PATCH] Identify a few more labels and data --- engine/debug/color_picker.asm | 8 ++++---- engine/gfx/sprite_anims.asm | 4 ++-- mobile/mobile_42.asm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index d07cc97b6..ae611c9e7 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -235,7 +235,7 @@ DebugColorMain: call JoyTextDelay ld a, [wJumptableIndex] cp 4 - jr nc, .asm_81a8b + jr nc, .no_start_select ld hl, hJoyLast ld a, [hl] and SELECT @@ -244,7 +244,7 @@ DebugColorMain: and START jr nz, .PreviousMon -.asm_81a8b +.no_start_select jumptable Jumptable_81acf, wJumptableIndex .NextMon @@ -998,14 +998,14 @@ DebugColor_PlaceCursor: jr nz, .clearsprites ld a, [wcf64] and a - jr z, .asm_81f8d + jr z, .place_cursor dec a hlcoord 1, 11 ld bc, 2 * SCREEN_WIDTH call AddNTimes ld [hl], "▶" -.asm_81f8d +.place_cursor ld a, [wcf65] and a jr z, .lightcolor diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index 23c1cde4b..53fe6b882 100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -738,11 +738,11 @@ AnimSeq_FlyTo: ret AnimSeq_MobileTradeSentPulse: - farcall Function108bc7 + farcall MobileTradeAnim_AnimateSentPulse ret AnimSeq_MobileTradeOTPulse: - farcall Function108be0 + farcall MobileTradeAnim_AnimateOTPulse ret AnimSeq_IntroSuicune: diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index b6c5a3e3d..f609cb74d 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1509,7 +1509,7 @@ MobileTradeAnim_DeleteSprites: call ClearSprites ret -Function108bc7: +MobileTradeAnim_AnimateSentPulse: ld a, [wcf64] and a ret z @@ -1526,7 +1526,7 @@ Function108bc7: farcall DeinitializeSprite ret -Function108be0: +MobileTradeAnim_AnimateOTPulse: ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld a, [hl]