start anim objtemplates

This commit is contained in:
Evan
2019-12-01 20:23:36 -05:00
parent 9bc5170673
commit 2f3ad83711
32 changed files with 6396 additions and 720 deletions
+2 -2
View File
@@ -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
+4 -4
View File
@@ -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