diff options
| author | Evan <eroelke@gmail.com> | 2019-12-01 20:23:36 -0500 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 14:54:52 -0700 |
| commit | 2f3ad837110bf47aeb1b3cf4f34531878d55e720 (patch) | |
| tree | 62b5ec9a5cd1735479eff0badb3b9aab394db56a /asm | |
| parent | 9bc5170673883795cc4397aa010a1dd08cad9d85 (diff) | |
start anim objtemplates
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_anim_effects_1.s | 4 | ||||
| -rw-r--r-- | asm/battle_bg.s | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asm/battle_anim_effects_1.s b/asm/battle_anim_effects_1.s index 42b3517f2..8e0721e04 100644 --- a/asm/battle_anim_effects_1.s +++ b/asm/battle_anim_effects_1.s @@ -303,7 +303,7 @@ sub_80A2500: @ 80A2500 movs r0, 0x50 strh r0, [r1, 0x4] strh r2, [r1, 0x6] - ldr r4, _080A2578 @ =gUnknown_83E2A88 + ldr r4, _080A2578 @ =gSolarbeamSmallOrbSpriteTemplate ldr r0, _080A257C @ =gBattleAnimTarget ldrb r0, [r0] bl GetBattlerSpriteSubpriority @@ -329,7 +329,7 @@ _080A2568: .align 2, 0 _080A2570: .4byte gTasks _080A2574: .4byte gBattleAnimArgs -_080A2578: .4byte gUnknown_83E2A88 +_080A2578: .4byte gSolarbeamSmallOrbSpriteTemplate _080A257C: .4byte gBattleAnimTarget thumb_func_end sub_80A2500 diff --git a/asm/battle_bg.s b/asm/battle_bg.s index 79479a49c..96f33cb3c 100644 --- a/asm/battle_bg.s +++ b/asm/battle_bg.s @@ -280,8 +280,8 @@ _0800F404: .4byte gBattleTypeFlags _0800F408: .4byte 0x00010010 thumb_func_end LoadBattleMenuWindowGfx - thumb_func_start sub_800F40C -sub_800F40C: @ 800F40C + thumb_func_start DrawMainBattleBackground +DrawMainBattleBackground: @ 800F40C push {lr} bl sub_800FC2C lsls r0, 24 @@ -289,7 +289,7 @@ sub_800F40C: @ 800F40C bl sub_800F260 pop {r0} bx r0 - thumb_func_end sub_800F40C + thumb_func_end DrawMainBattleBackground thumb_func_start LoadBattleTextboxAndBackground LoadBattleTextboxAndBackground: @ 800F420 @@ -310,7 +310,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r2, 0x40 bl LoadCompressedPalette bl LoadBattleMenuWindowGfx - bl sub_800F40C + bl DrawMainBattleBackground pop {r0} bx r0 .align 2, 0 |