Merge branch 'master' into trade

.gitignore

@@ -39,6 +39,7 @@ cmake-build-*
 ld_script_ruby.txt
 ld_script_sapphire.txt
 sound/**/*.bin
+sound/songs/midi/*.s
 src/*.s
 src/data/items.h
 tags

Makefile

@@ -197,6 +197,7 @@ $(C_BUILDDIR)/isagbprn.o: CC1 := tools/agbcc/bin/old_agbcc
 $(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
 
 #$(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
+$(C_BUILDDIR)/flying.o: CFLAGS += -ffreestanding
 
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=

asm/battle_2.s

@@ -99,10 +99,10 @@ sub_800FE24: @ 800FE24
 	movs r0, 0x4A
 	movs r1, 0
 	bl SetGpuReg
-	ldr r1, _0800FF30 @ =gUnknown_2022984
+	ldr r1, _0800FF30 @ =gBattle_WIN0H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r0, _0800FF34 @ =gUnknown_2022986
+	ldr r0, _0800FF34 @ =gBattle_WIN0V
 	strh r4, [r0]
 	bl ScanlineEffect_Clear
 	ldr r0, _0800FF38 @ =gScanlineEffectRegBuffers
@@ -184,8 +184,8 @@ _0800FEA6:
 	.align 2, 0
 _0800FF28: .4byte 0x05006000
 _0800FF2C: .4byte 0x00005051
-_0800FF30: .4byte gUnknown_2022984
-_0800FF34: .4byte gUnknown_2022986
+_0800FF30: .4byte gBattle_WIN0H
+_0800FF34: .4byte gBattle_WIN0V
 _0800FF38: .4byte gScanlineEffectRegBuffers
 _0800FF3C: .4byte gUnknown_824EFE4
 _0800FF40: .4byte 0x0000ff10
@@ -3157,11 +3157,11 @@ VBlankCB_Battle: @ 80116F4
 	ldrh r1, [r0]
 	movs r0, 0x1E
 	bl SetGpuReg
-	ldr r0, _080117A8 @ =gUnknown_2022984
+	ldr r0, _080117A8 @ =gBattle_WIN0H
 	ldrh r1, [r0]
 	movs r0, 0x40
 	bl SetGpuReg
-	ldr r0, _080117AC @ =gUnknown_2022986
+	ldr r0, _080117AC @ =gBattle_WIN0V
 	ldrh r1, [r0]
 	movs r0, 0x44
 	bl SetGpuReg
@@ -3188,8 +3188,8 @@ _08011798: .4byte gBattle_BG2_X
 _0801179C: .4byte gBattle_BG2_Y
 _080117A0: .4byte gBattle_BG3_X
 _080117A4: .4byte gBattle_BG3_Y
-_080117A8: .4byte gUnknown_2022984
-_080117AC: .4byte gUnknown_2022986
+_080117A8: .4byte gBattle_WIN0H
+_080117AC: .4byte gBattle_WIN0V
 _080117B0: .4byte gUnknown_2022988
 _080117B4: .4byte gUnknown_202298A
 	thumb_func_end VBlankCB_Battle
@@ -3543,10 +3543,10 @@ sub_8011A1C: @ 8011A1C
 	movs r0, 0x4A
 	movs r1, 0
 	bl SetGpuReg
-	ldr r1, _08011B48 @ =gUnknown_2022984
+	ldr r1, _08011B48 @ =gBattle_WIN0H
 	movs r0, 0xF0
 	strh r0, [r1]
-	ldr r0, _08011B4C @ =gUnknown_2022986
+	ldr r0, _08011B4C @ =gBattle_WIN0V
 	strh r4, [r0]
 	bl ScanlineEffect_Clear
 	ldr r0, _08011B50 @ =gScanlineEffectRegBuffers
@@ -3643,8 +3643,8 @@ _08011A9C:
 	.align 2, 0
 _08011B40: .4byte 0x05006000
 _08011B44: .4byte 0x00005051
-_08011B48: .4byte gUnknown_2022984
-_08011B4C: .4byte gUnknown_2022986
+_08011B48: .4byte gBattle_WIN0H
+_08011B4C: .4byte gBattle_WIN0V
 _08011B50: .4byte gScanlineEffectRegBuffers
 _08011B54: .4byte 0x0000ff10
 _08011B58: .4byte gBattle_BG0_X
@@ -4145,16 +4145,16 @@ _08011F3C:
 	lsls r0, 16
 	lsrs r0, 16
 _08011F46:
-	ldr r1, _08011F4C @ =gUnknown_82349CC
+	ldr r1, _08011F4C @ =gMonFrontPicCoords
 	lsls r0, 2
 	b _08011F88
 	.align 2, 0
-_08011F4C: .4byte gUnknown_82349CC
+_08011F4C: .4byte gMonFrontPicCoords
 _08011F50:
-	ldr r0, _08011F68 @ =0x00000181
+	ldr r0, _08011F68 @ =0x00000181 @ SPECIES_CASTFORM
 	cmp r4, r0
 	bne _08011F74
-	ldr r0, _08011F6C @ =gUnknown_83AE03C
+	ldr r0, _08011F6C @ =gCastformFrontSpriteCoords
 	ldr r1, _08011F70 @ =gBattleMonForms
 	adds r1, r6, r1
 	ldrb r1, [r1]
@@ -4164,19 +4164,19 @@ _08011F50:
 	b _08011F8C
 	.align 2, 0
 _08011F68: .4byte 0x00000181
-_08011F6C: .4byte gUnknown_83AE03C
+_08011F6C: .4byte gCastformFrontSpriteCoords
 _08011F70: .4byte gBattleMonForms
 _08011F74:
 	movs r0, 0xCE
 	lsls r0, 1
 	cmp r4, r0
 	bls _08011F84
-	ldr r0, _08011F80 @ =gUnknown_82349CC
+	ldr r0, _08011F80 @ =gMonFrontPicCoords
 	b _08011F8A
 	.align 2, 0
-_08011F80: .4byte gUnknown_82349CC
+_08011F80: .4byte gMonFrontPicCoords
 _08011F84:
-	ldr r1, _08011FAC @ =gUnknown_82349CC
+	ldr r1, _08011FAC @ =gMonFrontPicCoords
 	lsls r0, r4, 2
 _08011F88:
 	adds r0, r1
@@ -4199,7 +4199,7 @@ _08011F8C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08011FAC: .4byte gUnknown_82349CC
+_08011FAC: .4byte gMonFrontPicCoords
 _08011FB0: .4byte sub_8011FB4
 	thumb_func_end SpriteCB_FaintOpponentMon
 

asm/battle_anim.s

@@ -16,7 +16,7 @@ ClearBattleAnimationVars: @ 80724C0
 	strb r1, [r0]
 	ldr r0, _08072558 @ =gAnimScriptActive
 	strb r1, [r0]
-	ldr r0, _0807255C @ =gUnknown_2037EE2
+	ldr r0, _0807255C @ =gAnimVisualTaskCount
 	strb r1, [r0]
 	ldr r0, _08072560 @ =gUnknown_2037EE3
 	strb r1, [r0]
@@ -86,7 +86,7 @@ _08072520:
 	.align 2, 0
 _08072554: .4byte gUnknown_2037EE0
 _08072558: .4byte gAnimScriptActive
-_0807255C: .4byte gUnknown_2037EE2
+_0807255C: .4byte gAnimVisualTaskCount
 _08072560: .4byte gUnknown_2037EE3
 _08072564: .4byte gAnimDisableStructPtr
 _08072568: .4byte gAnimMoveDmg
@@ -152,7 +152,7 @@ LaunchBattleAnimation: @ 80725D4
 	movs r4, 0
 	ldr r6, _08072618 @ =gBattlerPartyIndexes
 	movs r7, 0x64
-	ldr r5, _0807261C @ =gUnknown_2037F1C
+	ldr r5, _0807261C @ =gAnimBattlerSpecies
 _08072600:
 	lsls r0, r4, 24
 	lsrs r0, 24
@@ -166,7 +166,7 @@ _08072600:
 	b _0807262A
 	.align 2, 0
 _08072618: .4byte gBattlerPartyIndexes
-_0807261C: .4byte gUnknown_2037F1C
+_0807261C: .4byte gAnimBattlerSpecies
 _08072620: .4byte gEnemyParty
 _08072624:
 	ldrh r0, [r6]
@@ -276,10 +276,10 @@ _080726EE:
 	movs r2, 0x80
 	bl m4aMPlayVolumeControl
 _08072706:
-	ldr r0, _08072730 @ =gUnknown_2022984
+	ldr r0, _08072730 @ =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, _08072734 @ =gUnknown_2022986
+	ldr r0, _08072734 @ =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r0, _08072738 @ =gUnknown_2022988
 	strh r1, [r0]
@@ -296,8 +296,8 @@ _08072706:
 	.align 2, 0
 _08072728: .4byte 0x0000ffff
 _0807272C: .4byte gMPlayInfo_BGM
-_08072730: .4byte gUnknown_2022984
-_08072734: .4byte gUnknown_2022986
+_08072730: .4byte gBattle_WIN0H
+_08072734: .4byte gBattle_WIN0V
 _08072738: .4byte gUnknown_2022988
 _0807273C: .4byte gUnknown_202298A
 	thumb_func_end LaunchBattleAnimation
@@ -309,7 +309,7 @@ DestroyAnimSprite: @ 8072740
 	bl FreeSpriteOamMatrix
 	adds r0, r4, 0
 	bl DestroySprite
-	ldr r1, _0807275C @ =gUnknown_2037EE2
+	ldr r1, _0807275C @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	subs r0, 0x1
 	strb r0, [r1]
@@ -317,7 +317,7 @@ DestroyAnimSprite: @ 8072740
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0807275C: .4byte gUnknown_2037EE2
+_0807275C: .4byte gAnimVisualTaskCount
 	thumb_func_end DestroyAnimSprite
 
 	thumb_func_start DestroyAnimVisualTask
@@ -326,14 +326,14 @@ DestroyAnimVisualTask: @ 8072760
 	lsls r0, 24
 	lsrs r0, 24
 	bl DestroyTask
-	ldr r1, _08072778 @ =gUnknown_2037EE2
+	ldr r1, _08072778 @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	subs r0, 0x1
 	strb r0, [r1]
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08072778: .4byte gUnknown_2037EE2
+_08072778: .4byte gAnimVisualTaskCount
 	thumb_func_end DestroyAnimVisualTask
 
 	thumb_func_start DestroyAnimSoundTask
@@ -666,7 +666,7 @@ _080729CC:
 	adds r0, r7, 0
 	adds r1, r4, 0
 	bl CreateSpriteAndAnimate
-	ldr r1, _08072A0C @ =gUnknown_2037EE2
+	ldr r1, _08072A0C @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
@@ -676,7 +676,7 @@ _080729CC:
 	.align 2, 0
 _08072A04: .4byte gBattleAnimAttacker
 _08072A08: .4byte gBattleAnimTarget
-_08072A0C: .4byte gUnknown_2037EE2
+_08072A0C: .4byte gAnimVisualTaskCount
 	thumb_func_end ScriptCmd_createsprite
 
 	thumb_func_start ScriptCmd_createvisualtask
@@ -729,7 +729,7 @@ _08072A60:
 	lsls r0, 24
 	lsrs r0, 24
 	bl _call_via_r6
-	ldr r1, _08072A88 @ =gUnknown_2037EE2
+	ldr r1, _08072A88 @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
@@ -739,7 +739,7 @@ _08072A60:
 	.align 2, 0
 _08072A80: .4byte gUnknown_2037ED4
 _08072A84: .4byte gBattleAnimArgs
-_08072A88: .4byte gUnknown_2037EE2
+_08072A88: .4byte gAnimVisualTaskCount
 	thumb_func_end ScriptCmd_createvisualtask
 
 	thumb_func_start ScriptCmd_delay
@@ -778,7 +778,7 @@ _08072AC8: .4byte WaitAnimFrameCount
 	thumb_func_start sub_8072ACC
 sub_8072ACC: @ 8072ACC
 	push {lr}
-	ldr r0, _08072AE4 @ =gUnknown_2037EE2
+	ldr r0, _08072AE4 @ =gAnimVisualTaskCount
 	ldrb r2, [r0]
 	cmp r2, 0
 	bne _08072AF0
@@ -790,7 +790,7 @@ sub_8072ACC: @ 8072ACC
 	strb r2, [r0]
 	b _08072AF6
 	.align 2, 0
-_08072AE4: .4byte gUnknown_2037EE2
+_08072AE4: .4byte gAnimVisualTaskCount
 _08072AE8: .4byte gUnknown_2037ED4
 _08072AEC: .4byte gUnknown_2037EE0
 _08072AF0:
@@ -821,7 +821,7 @@ sub_8072B08: @ 8072B08
 	push {r7}
 	movs r0, 0
 	mov r8, r0
-	ldr r0, _08072B38 @ =gUnknown_2037EE2
+	ldr r0, _08072B38 @ =gAnimVisualTaskCount
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08072B30
@@ -842,7 +842,7 @@ _08072B30:
 	strh r0, [r1]
 	b _08072B62
 	.align 2, 0
-_08072B38: .4byte gUnknown_2037EE2
+_08072B38: .4byte gAnimVisualTaskCount
 _08072B3C: .4byte gUnknown_2037EE3
 _08072B40: .4byte gUnknown_2037F14
 _08072B44: .4byte gUnknown_2037F12
@@ -1007,7 +1007,7 @@ _08072C62:
 _08072C88:
 	adds r0, r5, 0
 	adds r1, r7, 0
-	bl sub_8072E48
+	bl MoveBattlerSpriteToBG
 	ldr r0, _08072CDC @ =gBattlerSpriteIds
 	adds r0, r5, r0
 	ldrb r4, [r0]
@@ -1091,7 +1091,7 @@ _08072D12:
 _08072D3E:
 	adds r0, r5, 0
 	adds r1, r7, 0
-	bl sub_8072E48
+	bl MoveBattlerSpriteToBG
 	ldr r0, _08072D9C @ =gBattlerSpriteIds
 	adds r0, r5, r0
 	ldrb r4, [r0]
@@ -1217,8 +1217,8 @@ _08072E42:
 	bx r1
 	thumb_func_end IsBattlerSpriteVisible
 
-	thumb_func_start sub_8072E48
-sub_8072E48: @ 8072E48
+	thumb_func_start MoveBattlerSpriteToBG
+MoveBattlerSpriteToBG: @ 8072E48
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -1490,7 +1490,7 @@ _080730B0: .4byte gBattle_BG2_Y
 _080730B4: .4byte gPlttBufferUnfaded + 0x200
 _080730B8: .4byte 0x05000120
 _080730BC: .4byte 0x04000008
-	thumb_func_end sub_8072E48
+	thumb_func_end MoveBattlerSpriteToBG
 
 	thumb_func_start sub_80730C0
 sub_80730C0: @ 80730C0
@@ -1914,7 +1914,7 @@ _080733CE:
 	movs r1, 0
 _080733F4:
 	adds r0, r4, 0
-	bl sub_8072E48
+	bl MoveBattlerSpriteToBG
 	ldr r2, _08073478 @ =gSprites
 	ldr r0, _0807347C @ =gBattlerSpriteIds
 	adds r0, r4, r0
@@ -1952,7 +1952,7 @@ _08073416:
 	movs r1, 0
 _08073442:
 	adds r0, r4, 0
-	bl sub_8072E48
+	bl MoveBattlerSpriteToBG
 	ldr r2, _08073478 @ =gSprites
 	ldr r0, _0807347C @ =gBattlerSpriteIds
 	adds r0, r4, r0
@@ -2767,8 +2767,8 @@ ScriptCmd_changebg: @ 8073A24
 _08073A40: .4byte gUnknown_2037ED4
 	thumb_func_end ScriptCmd_changebg
 
-	thumb_func_start sub_8073A44
-sub_8073A44: @ 8073A44
+	thumb_func_start BattleAnimAdjustPanning
+BattleAnimAdjustPanning: @ 8073A44
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2867,10 +2867,10 @@ _08073AFC:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8073A44
+	thumb_func_end BattleAnimAdjustPanning
 
-	thumb_func_start sub_8073B08
-sub_8073B08: @ 8073B08
+	thumb_func_start BattleAnimAdjustPanning2
+BattleAnimAdjustPanning2: @ 8073B08
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -2914,10 +2914,10 @@ _08073B56:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8073B08
+	thumb_func_end BattleAnimAdjustPanning2
 
-	thumb_func_start sub_8073B60
-sub_8073B60: @ 8073B60
+	thumb_func_start KeepPanInRange
+KeepPanInRange: @ 8073B60
 	push {lr}
 	lsls r0, 16
 	lsrs r1, r0, 16
@@ -2939,7 +2939,7 @@ _08073B7A:
 	bx r1
 	.align 2, 0
 _08073B84: .4byte 0x0000ffc0
-	thumb_func_end sub_8073B60
+	thumb_func_end KeepPanInRange
 
 	thumb_func_start CalculatePanIncrement
 CalculatePanIncrement: @ 8073B88
@@ -2994,7 +2994,7 @@ ScriptCmd_playsewithpan: @ 8073BC8
 	orrs r4, r0
 	movs r0, 0x2
 	ldrsb r0, [r1, r0]
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	adds r1, r0, 0
 	lsls r1, 24
 	asrs r1, 24
@@ -3019,7 +3019,7 @@ ScriptCmd_setpan: @ 8073C00
 	str r0, [r4]
 	movs r0, 0x1
 	ldrsb r0, [r1, r0]
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	lsls r0, 24
 	asrs r0, 24
 	bl SE12PanpotControl
@@ -3058,14 +3058,14 @@ ScriptCmd_panse_1B: @ 8073C2C
 	ldrb r7, [r1, 0x5]
 	movs r0, 0x2
 	ldrsb r0, [r1, r0]
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
 	lsls r4, 24
 	asrs r4, 24
 	adds r0, r4, 0
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	mov r8, r0
 	lsls r5, 24
 	asrs r5, 24
@@ -3301,14 +3301,14 @@ ScriptCmd_panse_27: @ 8073E10
 	ldrb r7, [r1, 0x5]
 	movs r0, 0x2
 	ldrsb r0, [r1, r0]
-	bl sub_8073B08
+	bl BattleAnimAdjustPanning2
 	adds r6, r0, 0
 	lsls r6, 24
 	lsrs r6, 24
 	lsls r4, 24
 	asrs r4, 24
 	adds r0, r4, 0
-	bl sub_8073B08
+	bl BattleAnimAdjustPanning2
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
@@ -3317,7 +3317,7 @@ ScriptCmd_panse_27: @ 8073E10
 	asrs r1, 24
 	mov r8, r1
 	mov r0, r8
-	bl sub_8073B08
+	bl BattleAnimAdjustPanning2
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -3387,7 +3387,7 @@ ScriptCmd_loopsewithpan: @ 8073ED0
 	mov r9, r2
 	movs r0, 0x2
 	ldrsb r0, [r1, r0]
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -3498,7 +3498,7 @@ ScriptCmd_waitplaysewithpan: @ 8073FB4
 	mov r8, r0
 	movs r0, 0x2
 	ldrsb r0, [r1, r0]
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -3873,7 +3873,7 @@ ScriptCmd_invisible: @ 80742A4
 	ldr r4, _080742D8 @ =gUnknown_2037ED4
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x1]
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0xFF
@@ -3906,7 +3906,7 @@ ScriptCmd_visible: @ 80742E0
 	ldr r4, _08074318 @ =gUnknown_2037ED4
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x1]
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0xFF
@@ -3960,7 +3960,7 @@ sub_8074320: @ 8074320
 	cmp r7, 0
 	bne _08074370
 	ldrb r0, [r6]
-	bl sub_80768B0
+	bl GetBattlerSpriteBGPriorityRank
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0
@@ -3971,12 +3971,12 @@ _08074368: .4byte gBattleAnimAttacker
 _0807436C: .4byte gBattleAnimTarget
 _08074370:
 	ldrb r0, [r5]
-	bl sub_80768B0
+	bl GetBattlerSpriteBGPriorityRank
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0x1
 _0807437C:
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0xFF
@@ -4042,7 +4042,7 @@ sub_80743C8: @ 80743C8
 	cmp r7, 0
 	bne _08074418
 	ldrb r0, [r6]
-	bl sub_80768B0
+	bl GetBattlerSpriteBGPriorityRank
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0
@@ -4053,12 +4053,12 @@ _08074410: .4byte gBattleAnimAttacker
 _08074414: .4byte gBattleAnimTarget
 _08074418:
 	ldrb r0, [r5]
-	bl sub_80768B0
+	bl GetBattlerSpriteBGPriorityRank
 	lsls r0, 24
 	lsrs r4, r0, 24
 	movs r0, 0x1
 _08074424:
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0xFF

asm/battle_anim_effects_2.s

@@ -9,12 +9,12 @@
 sub_80A6E48: @ 80A6E48
 	push {r4,r5,lr}
 	adds r4, r0, 0
-	bl sub_8074FCC
+	bl SetSpriteCoordsToAnimAttackerCoords
 	ldr r5, _080A6E8C @ =gBattleAnimArgs
 	movs r0, 0
 	ldrsh r1, [r5, r0]
 	adds r0, r4, 0
-	bl sub_8074FF8
+	bl SetAnimSpriteInitialXOffset
 	ldrh r0, [r5, 0x2]
 	ldrh r1, [r4, 0x22]
 	adds r0, r1
@@ -27,10 +27,10 @@ sub_80A6E48: @ 80A6E48
 	strh r0, [r4, 0x34]
 	ldrh r0, [r5, 0x6]
 	strh r0, [r4, 0x36]
-	ldr r1, _080A6E90 @ =move_anim_8074EE0
+	ldr r1, _080A6E90 @ =DestroySpriteAndMatrix
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r1, _080A6E94 @ =sub_8074BE4
+	ldr r1, _080A6E94 @ =TranslateSpriteInEllipseOverDuration
 	str r1, [r4, 0x1C]
 	adds r0, r4, 0
 	bl _call_via_r1
@@ -39,8 +39,8 @@ sub_80A6E48: @ 80A6E48
 	bx r0
 	.align 2, 0
 _080A6E8C: .4byte gBattleAnimArgs
-_080A6E90: .4byte move_anim_8074EE0
-_080A6E94: .4byte sub_8074BE4
+_080A6E90: .4byte DestroySpriteAndMatrix
+_080A6E94: .4byte TranslateSpriteInEllipseOverDuration
 	thumb_func_end sub_80A6E48
 
 	thumb_func_start sub_80A6E98
@@ -166,7 +166,7 @@ sub_80A6F3C: @ 80A6F3C
 	adds r0, r3
 	strh r2, [r0, 0x24]
 	adds r0, r4, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _080A6F7A:
 	ldrh r0, [r4, 0x2E]
 	subs r0, 0x1
@@ -254,7 +254,7 @@ sub_80A7020: @ 80A7020
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r1, _080A704C @ =gBattleAnimArgs
 	ldrh r0, [r1, 0x4]
 	strh r0, [r4, 0x2E]
@@ -262,7 +262,7 @@ sub_80A7020: @ 80A7020
 	strh r0, [r4, 0x30]
 	ldrh r0, [r1, 0x8]
 	strh r0, [r4, 0x38]
-	ldr r0, _080A7050 @ =sub_8074C44
+	ldr r0, _080A7050 @ =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	ldr r1, _080A7054 @ =sub_80A7058
 	adds r0, r4, 0
@@ -272,7 +272,7 @@ sub_80A7020: @ 80A7020
 	bx r0
 	.align 2, 0
 _080A704C: .4byte gBattleAnimArgs
-_080A7050: .4byte sub_8074C44
+_080A7050: .4byte WaitAnimForDuration
 _080A7054: .4byte sub_80A7058
 	thumb_func_end sub_80A7020
 
@@ -438,7 +438,7 @@ _080A7176:
 _080A718A:
 	strh r1, [r0, 0x26]
 	adds r0, r4, 0
-	bl sub_80759DC
+	bl SetBattlerSpriteYOffsetFromRotation
 	ldr r0, _080A71C8 @ =gTasks
 	adds r1, r6, r5
 	lsls r1, 3
@@ -479,7 +479,7 @@ _080A71D0:
 sub_80A71D8: @ 80A71D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
-	bl sub_8074FCC
+	bl SetSpriteCoordsToAnimAttackerCoords
 	ldr r0, _080A71FC @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -544,7 +544,7 @@ _080A724C:
 	orrs r0, r1
 	strb r0, [r2]
 _080A7260:
-	ldr r0, _080A7274 @ =sub_8074F6C
+	ldr r0, _080A7274 @ =RunStoredCallbackWhenAnimEnds
 	str r0, [r4, 0x1C]
 	ldr r1, _080A7278 @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -553,7 +553,7 @@ _080A7260:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080A7274: .4byte sub_8074F6C
+_080A7274: .4byte RunStoredCallbackWhenAnimEnds
 _080A7278: .4byte DestroyAnimSprite
 	thumb_func_end sub_80A71D8
 
@@ -562,8 +562,8 @@ sub_80A727C: @ 80A727C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_8075160
-	ldr r0, _080A7298 @ =sub_8074F50
+	bl InitSpritePosToAnimAttacker
+	ldr r0, _080A7298 @ =RunStoredCallbackWhenAffineAnimEnds
 	str r0, [r4, 0x1C]
 	ldr r1, _080A729C @ =sub_80A72A0
 	adds r0, r4, 0
@@ -572,7 +572,7 @@ sub_80A727C: @ 80A727C
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080A7298: .4byte sub_8074F50
+_080A7298: .4byte RunStoredCallbackWhenAffineAnimEnds
 _080A729C: .4byte sub_80A72A0
 	thumb_func_end sub_80A727C
 
@@ -635,7 +635,7 @@ _080A72EC:
 _080A730E:
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r4, _080A73BC @ =gBattleAnimTarget
 	ldrb r0, [r4]
 	movs r1, 0x2
@@ -671,7 +671,7 @@ _080A730E:
 	subs r1, r2
 	lsls r1, 16
 	asrs r1, 16
-	bl sub_8075B30
+	bl ArcTan2Neg
 	lsls r0, 16
 	movs r1, 0xF0
 	lsls r1, 24
@@ -692,7 +692,7 @@ _080A7380:
 	adds r0, r5, 0
 	movs r1, 0
 	adds r2, r3, 0
-	bl sub_8075A1C
+	bl TrySetSpriteRotScale
 	ldrh r0, [r6, 0x8]
 	strh r0, [r5, 0x2E]
 	mov r0, r8
@@ -1118,7 +1118,7 @@ _080A7690:
 	strh r0, [r4, 0xA]
 	movs r0, 0x3F
 	negs r0, r0
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	adds r1, r0, 0
 	lsls r1, 24
 	asrs r1, 24
@@ -1276,7 +1276,7 @@ _080A77B6:
 	movs r1, 0
 	mov r2, sp
 	mov r3, r10
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	b _080A7842
 	.align 2, 0
 _080A7810: .4byte gBattleAnimAttacker
@@ -1506,7 +1506,7 @@ sub_80A79E8: @ 80A79E8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080A7A10 @ =gUnknown_83E3D18
 	ldrh r0, [r0, 0x2]
 	bl IndexOfSpritePaletteTag
@@ -1592,7 +1592,7 @@ sub_80A7A88: @ 80A7A88
 	sub sp, 0x4
 	adds r5, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r4, _080A7B28 @ =gBattleAnimTarget
 	ldrb r0, [r4]
 	movs r1, 0x2
@@ -1636,7 +1636,7 @@ _080A7ACC:
 	subs r1, r2
 	lsls r1, 16
 	asrs r1, 16
-	bl sub_8075B30
+	bl ArcTan2Neg
 	lsls r0, 16
 	movs r1, 0xC0
 	lsls r1, 24
@@ -1648,7 +1648,7 @@ _080A7ACC:
 	adds r0, r5, 0
 	movs r1, 0
 	adds r2, r3, 0
-	bl sub_8075A1C
+	bl TrySetSpriteRotScale
 	ldrh r0, [r4, 0x8]
 	strh r0, [r5, 0x2E]
 	strh r6, [r5, 0x32]
@@ -1748,7 +1748,7 @@ sub_80A7BC4: @ 80A7BC4
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	movs r0, 0x14
 	strh r0, [r4, 0x2E]
 	ldr r5, _080A7C10 @ =gBattleAnimTarget
@@ -1789,7 +1789,7 @@ sub_80A7C1C: @ 80A7C1C
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r0, 0x3F
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	adds r1, r0, 0
 	lsls r1, 24
 	asrs r1, 24
@@ -1907,7 +1907,7 @@ sub_80A7D04: @ 80A7D04
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080A7D54 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -1929,7 +1929,7 @@ _080A7D22:
 	strh r0, [r4, 0x34]
 	ldrh r0, [r1, 0x6]
 	strh r0, [r4, 0x36]
-	ldr r0, _080A7D5C @ =sub_8074A80
+	ldr r0, _080A7D5C @ =TranslateSpriteInCircleOverDuration
 	str r0, [r4, 0x1C]
 	ldr r1, _080A7D60 @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -1943,7 +1943,7 @@ _080A7D22:
 	.align 2, 0
 _080A7D54: .4byte gBattleAnimAttacker
 _080A7D58: .4byte gBattleAnimArgs
-_080A7D5C: .4byte sub_8074A80
+_080A7D5C: .4byte TranslateSpriteInCircleOverDuration
 _080A7D60: .4byte DestroyAnimSprite
 	thumb_func_end sub_80A7D04
 
@@ -2094,7 +2094,7 @@ _080A7E48:
 	adds r0, r6
 	strh r0, [r5, 0x36]
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldrh r0, [r7]
 	strh r0, [r5, 0x38]
 	ldrh r0, [r5, 0x2E]
@@ -2119,7 +2119,7 @@ _080A7EB8: .4byte sub_80A7EBC
 sub_80A7EBC: @ 80A7EBC
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A7F20
@@ -2233,7 +2233,7 @@ _080A7F90: .4byte sub_80A7F94
 sub_80A7F94: @ 80A7F94
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A7FA8
@@ -2252,7 +2252,7 @@ sub_80A7FB0: @ 80A7FB0
 	lsls r5, 24
 	lsrs r5, 24
 	movs r0, 0x1
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -2273,7 +2273,7 @@ sub_80A7FB0: @ 80A7FB0
 	lsrs r0, 4
 	adds r0, 0x10
 	movs r1, 0
-	bl sub_8075B48
+	bl SetGreyscaleOrOriginalPalette
 	ldr r1, _080A800C @ =gTasks
 	lsls r0, r5, 2
 	adds r0, r5
@@ -2312,7 +2312,7 @@ sub_80A8014: @ 80A8014
 	cmp r1, r0
 	bne _080A8064
 	movs r0, 0x1
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -2327,7 +2327,7 @@ sub_80A8014: @ 80A8014
 	lsrs r0, 4
 	adds r0, 0x10
 	movs r1, 0x1
-	bl sub_8075B48
+	bl SetGreyscaleOrOriginalPalette
 	adds r0, r5, 0
 	bl DestroyAnimVisualTask
 _080A8064:
@@ -2350,7 +2350,7 @@ sub_80A8074: @ 80A8074
 	ldr r0, _080A80C0 @ =gTasks
 	adds r4, r0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r5, 0
@@ -2441,7 +2441,7 @@ _080A8128:
 	movs r3, 0
 	bl SetSpriteRotScale
 	ldrb r0, [r4, 0x8]
-	bl sub_8076440
+	bl SetBattlerSpriteYOffsetFromYScale
 	movs r2, 0xC
 	ldrsh r0, [r4, r2]
 	cmp r0, 0x20
@@ -2473,7 +2473,7 @@ _080A816E:
 	movs r3, 0
 	bl SetSpriteRotScale
 	ldrb r0, [r4, 0x8]
-	bl sub_8076440
+	bl SetBattlerSpriteYOffsetFromYScale
 	movs r0, 0x2
 	strh r0, [r4, 0xA]
 	b _080A81F6
@@ -2504,7 +2504,7 @@ _080A81A4:
 	movs r3, 0
 	bl SetSpriteRotScale
 	ldrb r0, [r4, 0x8]
-	bl sub_8076440
+	bl SetBattlerSpriteYOffsetFromYScale
 	movs r2, 0xC
 	ldrsh r0, [r4, r2]
 	cmp r0, 0x20
@@ -2550,7 +2550,7 @@ sub_80A8200: @ 80A8200
 	lsrs r1, 24
 	mov r9, r1
 	movs r0, 0
-	bl duplicate_obj_of_side_rel2move_in_transparent_mode
+	bl CloneBattlerSpriteWithBlend
 	lsls r0, 16
 	lsrs r0, 16
 	mov r8, r0
@@ -2720,7 +2720,7 @@ _080A835C: .4byte gTasks
 _080A8360: .4byte gBattleAnimArgs
 _080A8364:
 	ldrb r0, [r5]
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -2733,7 +2733,7 @@ _080A8364:
 	strh r2, [r4, 0x10]
 	ldr r2, _080A8390 @ =gUnknown_83E3E60
 	adds r0, r4, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	ldr r0, _080A8394 @ =sub_80A8398
 	str r0, [r4]
 _080A838A:
@@ -2774,7 +2774,7 @@ _080A83C0:
 	b _080A84A8
 _080A83CA:
 	adds r0, r4, 0
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	ldrh r2, [r4, 0x10]
 	adds r2, 0x3
 	strh r2, [r4, 0x10]
@@ -2801,7 +2801,7 @@ _080A83CA:
 _080A83FC: .4byte gSprites
 _080A8400:
 	adds r0, r4, 0
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	ldr r2, _080A8430 @ =gSprites
 	movs r0, 0x8
 	ldrsh r1, [r4, r0]
@@ -2853,7 +2853,7 @@ _080A845C:
 	b _080A84A8
 _080A8464:
 	adds r0, r4, 0
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	lsrs r5, r0, 24
 	cmp r5, 0
@@ -2881,7 +2881,7 @@ _080A849C:
 	ldrb r1, [r4, 0x8]
 	ldr r2, _080A84B0 @ =gUnknown_83E3E60
 	adds r0, r4, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	strh r5, [r4, 0xA]
 _080A84A8:
 	pop {r4-r6}
@@ -2902,13 +2902,13 @@ sub_80A84B4: @ 80A84B4
 	ldr r0, _080A84E4 @ =gTasks
 	adds r4, r0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	ldr r2, _080A84E8 @ =gUnknown_83E3E80
 	adds r0, r4, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	ldr r0, _080A84EC @ =sub_80A84F0
 	str r0, [r4]
 	pop {r4}
@@ -2930,7 +2930,7 @@ sub_80A84F0: @ 80A84F0
 	lsls r0, 3
 	ldr r1, _080A8518 @ =gTasks
 	adds r0, r1
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A8510
@@ -2998,7 +2998,7 @@ _080A856A:
 	ldr r1, _080A85A4 @ =DestroyAnimSprite
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080A85A8 @ =sub_8074D00
+	ldr r0, _080A85A8 @ =TranslateSpriteLinearFixedPoint
 	str r0, [r4, 0x1C]
 	pop {r4,r5}
 	pop {r0}
@@ -3007,7 +3007,7 @@ _080A856A:
 _080A859C: .4byte 0x0000ffc0
 _080A85A0: .4byte gBattleAnimAttacker
 _080A85A4: .4byte DestroyAnimSprite
-_080A85A8: .4byte sub_8074D00
+_080A85A8: .4byte TranslateSpriteLinearFixedPoint
 	thumb_func_end sub_80A851C
 
 	thumb_func_start sub_80A85AC
@@ -3064,10 +3064,10 @@ _080A85E4:
 	movs r0, 0x8
 	strh r0, [r6, 0x22]
 _080A8616:
-	ldr r1, _080A8630 @ =move_anim_8074EE0
+	ldr r1, _080A8630 @ =DestroySpriteAndMatrix
 	adds r0, r6, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080A8634 @ =sub_8074F50
+	ldr r0, _080A8634 @ =RunStoredCallbackWhenAffineAnimEnds
 	str r0, [r6, 0x1C]
 	pop {r4-r6}
 	pop {r0}
@@ -3075,8 +3075,8 @@ _080A8616:
 	.align 2, 0
 _080A8628: .4byte gBattleAnimTarget
 _080A862C: .4byte gBattleAnimArgs
-_080A8630: .4byte move_anim_8074EE0
-_080A8634: .4byte sub_8074F50
+_080A8630: .4byte DestroySpriteAndMatrix
+_080A8634: .4byte RunStoredCallbackWhenAffineAnimEnds
 	thumb_func_end sub_80A85AC
 
 	thumb_func_start sub_80A8638
@@ -3090,7 +3090,7 @@ sub_80A8638: @ 80A8638
 	ldr r0, _080A866C @ =gTasks
 	adds r4, r0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -3099,7 +3099,7 @@ sub_80A8638: @ 80A8638
 	strh r0, [r4, 0xA]
 	ldr r2, _080A8670 @ =gUnknown_83E3F1C
 	adds r0, r4, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	ldr r0, _080A8674 @ =sub_80A8678
 	str r0, [r4]
 	pop {r4}
@@ -3121,7 +3121,7 @@ sub_80A8678: @ 80A8678
 	lsls r0, 3
 	ldr r1, _080A86A0 @ =gTasks
 	adds r0, r1
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A8698
@@ -3146,7 +3146,7 @@ sub_80A86A4: @ 80A86A4
 	ldr r0, _080A8718 @ =gTasks
 	adds r4, r1, r0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r2, 0
@@ -3389,7 +3389,7 @@ sub_80A8874: @ 80A8874
 	adds r5, r1, r0
 	ldr r4, _080A88C8 @ =gBattleAnimTarget
 	ldrb r0, [r4]
-	bl sub_807492C
+	bl GetBattlerYCoordWithElevation
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, 0x20
@@ -3402,10 +3402,10 @@ sub_80A8874: @ 80A8874
 	strh r1, [r5, 0x10]
 	strh r1, [r5, 0x12]
 	ldrb r0, [r4]
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	strh r0, [r5, 0x26]
 	ldrb r0, [r4]
-	bl sub_80768B0
+	bl GetBattlerSpriteBGPriorityRank
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -3609,7 +3609,7 @@ sub_80A8A1C: @ 80A8A1C
 	movs r5, 0
 	strh r0, [r4, 0x20]
 	ldrb r0, [r6]
-	bl sub_807492C
+	bl GetBattlerYCoordWithElevation
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, 0x10
@@ -3622,11 +3622,11 @@ sub_80A8A1C: @ 80A8A1C
 	strh r5, [r4, 0x36]
 	ldrb r0, [r6]
 	movs r1, 0
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	adds r0, 0x2
 	strh r0, [r4, 0x38]
 	movs r0, 0x3F
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r4, 0x3A]
@@ -3864,7 +3864,7 @@ _080A8BF2:
 	adds r1, r4, 0
 	mov r2, sp
 	adds r3, r7, 0
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	cmp r4, 0
 	bne _080A8C30
 	adds r0, r5, 0
@@ -3919,7 +3919,7 @@ _080A8C80: .4byte sub_8075D9C
 sub_80A8C84: @ 80A8C84
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080A8C9E
@@ -4128,7 +4128,7 @@ _080A8DFA:
 	mov r2, sp
 	mov r3, sp
 	adds r3, 0x2
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	b _080A8E6C
 	.align 2, 0
 _080A8E40: .4byte gSprites
@@ -4192,7 +4192,7 @@ _080A8E9E:
 	ldrh r0, [r2]
 	strh r0, [r5, 0x2E]
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r1, _080A8EE4 @ =sub_80A8C84
 	str r1, [r5, 0x1C]
 	adds r0, r5, 0
@@ -4252,7 +4252,7 @@ sub_80A8F38: @ 80A8F38
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080A8F6C @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -4565,14 +4565,14 @@ sub_80A917C: @ 80A917C
 	ldr r0, _080A91AC @ =gTasks
 	adds r4, r0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	strh r1, [r4, 0x8]
 	ldr r2, _080A91B0 @ =gUnknown_83E4128
 	adds r0, r4, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	ldr r0, _080A91B4 @ =sub_80A91B8
 	str r0, [r4]
 	pop {r4}
@@ -4595,7 +4595,7 @@ sub_80A91B8: @ 80A91B8
 	ldr r1, _080A9208 @ =gTasks
 	adds r4, r0, r1
 	adds r0, r4, 0
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	lsrs r3, r0, 24
 	cmp r3, 0
@@ -4668,7 +4668,7 @@ _080A9250:
 _080A9256:
 	strh r0, [r4, 0x24]
 	movs r0, 0x1
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x26]
@@ -4861,7 +4861,7 @@ sub_80A939C: @ 80A939C
 	movs r0, 0x2
 	strh r0, [r4, 0x24]
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x26]
@@ -5411,7 +5411,7 @@ sub_80A97E8: @ 80A97E8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r6, _080A9850 @ =gBattleAnimAttacker
 	ldrb r0, [r6]
 	bl GetBattlerSide
@@ -5474,7 +5474,7 @@ sub_80A9860: @ 80A9860
 	bne _080A987A
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 _080A987A:
 	movs r1, 0x30
 	ldrsh r0, [r4, r1]
@@ -5517,9 +5517,9 @@ sub_80A98B0: @ 80A98B0
 	movs r6, 0x98
 _080A98C4:
 	movs r5, 0
-	ldr r1, _080A9918 @ =gUnknown_2022984
+	ldr r1, _080A9918 @ =gBattle_WIN0H
 	strh r6, [r1]
-	ldr r4, _080A991C @ =gUnknown_2022986
+	ldr r4, _080A991C @ =gBattle_WIN0V
 	movs r0, 0xA0
 	strh r0, [r4]
 	ldrh r1, [r1]
@@ -5553,8 +5553,8 @@ _080A98C4:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080A9918: .4byte gUnknown_2022984
-_080A991C: .4byte gUnknown_2022986
+_080A9918: .4byte gBattle_WIN0H
+_080A991C: .4byte gBattle_WIN0V
 _080A9920: .4byte 0x00003f1f
 _080A9924: .4byte 0x00003f3f
 _080A9928: .4byte gTasks
@@ -5583,7 +5583,7 @@ sub_80A9930: @ 80A9930
 	lsls r0, r2, 16
 	cmp r1, r0
 	blt _080A9970
-	ldr r0, _080A9968 @ =gUnknown_2022984
+	ldr r0, _080A9968 @ =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
 	ldr r0, _080A996C @ =sub_80A9984
@@ -5591,10 +5591,10 @@ sub_80A9930: @ 80A9930
 	b _080A9978
 	.align 2, 0
 _080A9964: .4byte gTasks
-_080A9968: .4byte gUnknown_2022984
+_080A9968: .4byte gBattle_WIN0H
 _080A996C: .4byte sub_80A9984
 _080A9970:
-	ldr r1, _080A9980 @ =gUnknown_2022984
+	ldr r1, _080A9980 @ =gBattle_WIN0H
 	lsls r0, r4, 8
 	orrs r2, r0
 	strh r2, [r1]
@@ -5603,7 +5603,7 @@ _080A9978:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080A9980: .4byte gUnknown_2022984
+_080A9980: .4byte gBattle_WIN0H
 	thumb_func_end sub_80A9930
 
 	thumb_func_start sub_80A9984
@@ -5649,9 +5649,9 @@ _080A99D4: .4byte 0x00007fff
 _080A99D8:
 	cmp r0, 0x4
 	ble _080A9A0C
-	ldr r0, _080A9A14 @ =gUnknown_2022984
+	ldr r0, _080A9A14 @ =gBattle_WIN0H
 	strh r4, [r0]
-	ldr r0, _080A9A18 @ =gUnknown_2022986
+	ldr r0, _080A9A18 @ =gBattle_WIN0V
 	strh r4, [r0]
 	ldr r4, _080A9A1C @ =0x00003f3f
 	movs r0, 0x48
@@ -5674,8 +5674,8 @@ _080A9A0C:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080A9A14: .4byte gUnknown_2022984
-_080A9A18: .4byte gUnknown_2022986
+_080A9A14: .4byte gBattle_WIN0H
+_080A9A18: .4byte gBattle_WIN0V
 _080A9A1C: .4byte 0x00003f3f
 	thumb_func_end sub_80A9984
 
@@ -5686,7 +5686,7 @@ sub_80A9A20: @ 80A9A20
 	lsrs r0, 24
 	adds r6, r0, 0
 	movs r0, 0x1
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r4, r0, 24
 	ldr r1, _080A9A70 @ =gTasks
@@ -5702,13 +5702,13 @@ sub_80A9A20: @ 80A9A20
 	cmp r0, 0x1
 	bne _080A9A7C
 	movs r0, 0x1
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	ldr r2, _080A9A74 @ =gUnknown_83E4200
 	adds r0, r5, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	ldr r1, _080A9A78 @ =gSprites
 	lsls r0, r4, 4
 	adds r0, r4
@@ -5731,7 +5731,7 @@ _080A9A7C:
 	negs r0, r0
 	strh r0, [r4, 0x24]
 	adds r0, r5, 0
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -5755,7 +5755,7 @@ sub_80A9AB0: @ 80A9AB0
 	lsrs r0, 24
 	adds r6, r0, 0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r4, r0, 24
 	ldr r1, _080A9B00 @ =gTasks
@@ -5771,13 +5771,13 @@ sub_80A9AB0: @ 80A9AB0
 	cmp r0, 0x1
 	bne _080A9B0C
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	ldr r2, _080A9B04 @ =gUnknown_83E4200
 	adds r0, r5, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	ldr r1, _080A9B08 @ =gSprites
 	lsls r0, r4, 4
 	adds r0, r4
@@ -5800,7 +5800,7 @@ _080A9B0C:
 	negs r0, r0
 	strh r0, [r4, 0x24]
 	adds r0, r5, 0
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0
@@ -5822,7 +5822,7 @@ sub_80A9B40: @ 80A9B40
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	movs r0, 0x5F
 	strh r0, [r4, 0x2E]
 	ldrh r0, [r4, 0x20]
@@ -5843,7 +5843,7 @@ sub_80A9B40: @ 80A9B40
 	lsrs r0, 24
 	strh r0, [r4, 0x36]
 	adds r0, r4, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r0, _080A9B88 @ =sub_80A9B8C
 	str r0, [r4, 0x1C]
 	pop {r4,r5}
@@ -5858,7 +5858,7 @@ _080A9B88: .4byte sub_80A9B8C
 sub_80A9B8C: @ 80A9B8C
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	bne _080A9BB6
@@ -5967,7 +5967,7 @@ sub_80A9C4C: @ 80A9C4C
 	strh r1, [r0, 0x2E]
 	ldrh r1, [r2, 0x2]
 	strh r1, [r0, 0x30]
-	ldr r1, _080A9C74 @ =sub_8074C44
+	ldr r1, _080A9C74 @ =WaitAnimForDuration
 	str r1, [r0, 0x1C]
 	ldr r1, _080A9C78 @ =sub_80A9C7C
 	bl StoreSpriteCallbackInData6
@@ -5975,7 +5975,7 @@ sub_80A9C4C: @ 80A9C4C
 	bx r0
 	.align 2, 0
 _080A9C70: .4byte gBattleAnimArgs
-_080A9C74: .4byte sub_8074C44
+_080A9C74: .4byte WaitAnimForDuration
 _080A9C78: .4byte sub_80A9C7C
 	thumb_func_end sub_80A9C4C
 
@@ -6082,13 +6082,13 @@ _080A9D2A:
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080A9DAC @ =gFile_graphics_battle_anims_backgrounds_attract_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet
 	mov r2, sp
 	ldrh r2, [r2, 0xA]
-	bl sub_80753B4
+	bl AnimLoadCompressedBgGfx
 	ldr r0, _080A9DB4 @ =gFile_graphics_battle_anims_backgrounds_attract_palette
 	mov r1, sp
 	ldrb r1, [r1, 0x8]
@@ -6360,7 +6360,7 @@ _080A9F98:
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 	b _080A9FC6
 	.align 2, 0
 _080A9FB4: .4byte gBattleAnimTarget
@@ -6369,14 +6369,14 @@ _080A9FBC:
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 _080A9FC6:
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080AA014 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet
 	mov r2, sp
 	ldrh r2, [r2, 0xA]
-	bl sub_80753B4
+	bl AnimLoadCompressedBgGfx
 	ldr r0, _080AA018 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette
 	mov r1, sp
 	ldrb r1, [r1, 0x8]
@@ -6907,7 +6907,7 @@ sub_80AA3F0: @ 80AA3F0
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080AA404 @ =sub_80AA3D4
 	str r0, [r4, 0x1C]
 	pop {r4}
@@ -7428,7 +7428,7 @@ sub_80AA7C8: @ 80AA7C8
 	lsrs r5, 24
 	ldr r0, _080AA7FC @ =gBattleAnimArgs
 	ldrb r0, [r0]
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -7439,7 +7439,7 @@ sub_80AA7C8: @ 80AA7C8
 	adds r4, r0
 	ldr r2, _080AA804 @ =gUnknown_83E4410
 	adds r0, r4, 0
-	bl sub_80762D0
+	bl PrepareAffineAnimInTaskData
 	ldr r0, _080AA808 @ =sub_80AA80C
 	str r0, [r4]
 	pop {r4,r5}
@@ -7462,7 +7462,7 @@ sub_80AA80C: @ 80AA80C
 	lsls r0, 3
 	ldr r1, _080AA834 @ =gTasks
 	adds r0, r1
-	bl sub_8076308
+	bl RunAffineAnimFromTaskData
 	lsls r0, 24
 	cmp r0, 0
 	bne _080AA82C
@@ -7640,7 +7640,7 @@ _080AA95A:
 	lsrs r0, 4
 	adds r0, 0x10
 	movs r1, 0
-	bl sub_8075B48
+	bl SetGreyscaleOrOriginalPalette
 _080AA978:
 	movs r0, 0x2E
 	ldrsh r1, [r4, r0]
@@ -7857,7 +7857,7 @@ sub_80AAAE4: @ 80AAAE4
 	adds r3, r5, 0
 	adds r3, 0x22
 	movs r1, 0
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldrh r0, [r5, 0x22]
 	adds r0, 0x28
 	strh r0, [r5, 0x22]

asm/battle_anim_sound_tasks.s

@@ -1,927 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80DCE10
-sub_80DCE10: @ 80DCE10
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _080DCE6C @ =gTasks
-	lsls r6, r0, 2
-	adds r6, r0
-	lsls r6, 3
-	adds r6, r1
-	ldr r1, _080DCE70 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	strh r0, [r6, 0x8]
-	ldrh r0, [r1, 0x2]
-	strh r0, [r6, 0xA]
-	movs r0, 0x40
-	negs r0, r0
-	bl sub_8073A44
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x3F
-	bl sub_8073A44
-	adds r5, r0, 0
-	lsls r4, 24
-	asrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x2
-	bl CalculatePanIncrement
-	strh r4, [r6, 0xC]
-	strh r5, [r6, 0xE]
-	lsls r0, 24
-	asrs r0, 24
-	strh r0, [r6, 0x10]
-	movs r0, 0xA
-	strh r0, [r6, 0x1C]
-	ldr r0, _080DCE74 @ =sub_80DCE78
-	str r0, [r6]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCE6C: .4byte gTasks
-_080DCE70: .4byte gBattleAnimArgs
-_080DCE74: .4byte sub_80DCE78
-	thumb_func_end sub_80DCE10
-
-	thumb_func_start sub_80DCE78
-sub_80DCE78: @ 80DCE78
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080DCEA8 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-	ldrh r5, [r4, 0xC]
-	ldrb r6, [r4, 0x10]
-	ldrh r0, [r4, 0x1E]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r4, 0x1E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x6F
-	bne _080DCEB0
-	movs r0, 0x5
-	strh r0, [r4, 0x1C]
-	strh r1, [r4, 0x1E]
-	ldr r0, _080DCEAC @ =sub_80DCEE4
-	str r0, [r4]
-	b _080DCEDE
-	.align 2, 0
-_080DCEA8: .4byte gTasks
-_080DCEAC: .4byte sub_80DCEE4
-_080DCEB0:
-	ldrh r0, [r4, 0x1C]
-	adds r0, 0x1
-	strh r0, [r4, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xB
-	bne _080DCECA
-	strh r1, [r4, 0x1C]
-	ldrh r0, [r4, 0x8]
-	lsls r1, r5, 24
-	asrs r1, 24
-	bl PlaySE12WithPanning
-_080DCECA:
-	lsls r1, r6, 24
-	asrs r1, 24
-	lsls r0, r5, 16
-	asrs r0, 16
-	adds r0, r1
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_8073B60
-	strh r0, [r4, 0xC]
-_080DCEDE:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DCE78
-
-	thumb_func_start sub_80DCEE4
-sub_80DCEE4: @ 80DCEE4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _080DCF34 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x1C]
-	adds r0, 0x1
-	strh r0, [r4, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x6
-	bne _080DCF2C
-	movs r0, 0
-	strh r0, [r4, 0x1C]
-	movs r0, 0x3F
-	bl sub_8073A44
-	adds r1, r0, 0
-	ldrh r0, [r4, 0xA]
-	lsls r1, 24
-	asrs r1, 24
-	bl PlaySE12WithPanning
-	ldrh r0, [r4, 0x1E]
-	adds r0, 0x1
-	strh r0, [r4, 0x1E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x2
-	bne _080DCF2C
-	adds r0, r5, 0
-	bl DestroyAnimSoundTask
-_080DCF2C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCF34: .4byte gTasks
-	thumb_func_end sub_80DCEE4
-
-	thumb_func_start mas_80DCF38
-mas_80DCF38: @ 80DCF38
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r8, r0
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r0, _080DCFDC @ =gBattleAnimArgs
-	ldrh r1, [r0]
-	str r1, [sp]
-	ldrb r5, [r0, 0x4]
-	ldrb r6, [r0, 0x6]
-	ldrb r3, [r0, 0x8]
-	mov r10, r3
-	ldrb r7, [r0, 0xA]
-	ldrb r1, [r0, 0xC]
-	mov r9, r1
-	ldrb r0, [r0, 0x2]
-	lsls r0, 24
-	asrs r0, 24
-	bl sub_8073A44
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	adds r0, r5, 0
-	bl sub_8073A44
-	adds r5, r0, 0
-	lsls r4, 24
-	asrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	lsls r6, 24
-	asrs r6, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	adds r2, r6, 0
-	bl CalculatePanIncrement
-	ldr r2, _080DCFE0 @ =gTasks
-	mov r3, r8
-	lsls r1, r3, 2
-	add r1, r8
-	lsls r1, 3
-	adds r1, r2
-	movs r2, 0
-	mov r6, sp
-	ldrh r6, [r6]
-	strh r6, [r1, 0x8]
-	strh r4, [r1, 0xA]
-	strh r5, [r1, 0xC]
-	lsls r0, 24
-	asrs r0, 24
-	strh r0, [r1, 0xE]
-	mov r0, r10
-	strh r0, [r1, 0x10]
-	strh r7, [r1, 0x12]
-	mov r3, r9
-	strh r3, [r1, 0x14]
-	strh r2, [r1, 0x1C]
-	strh r4, [r1, 0x1E]
-	strh r3, [r1, 0x20]
-	ldr r2, _080DCFE4 @ =sub_80DCFE8
-	str r2, [r1]
-	mov r0, r8
-	bl _call_via_r2
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DCFDC: .4byte gBattleAnimArgs
-_080DCFE0: .4byte gTasks
-_080DCFE4: .4byte sub_80DCFE8
-	thumb_func_end mas_80DCF38
-
-	thumb_func_start sub_80DCFE8
-sub_80DCFE8: @ 80DCFE8
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _080DD02C @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x20]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x20]
-	lsls r0, 16
-	asrs r0, 16
-	movs r2, 0x14
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	bne _080DD030
-	movs r0, 0
-	strh r0, [r4, 0x20]
-	ldrh r0, [r4, 0x8]
-	movs r1, 0x1E
-	ldrsb r1, [r4, r1]
-	bl PlaySE12WithPanning
-	ldrh r0, [r4, 0x10]
-	subs r0, 0x1
-	strh r0, [r4, 0x10]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080DD030
-	adds r0, r5, 0
-	bl DestroyAnimSoundTask
-	b _080DD062
-	.align 2, 0
-_080DD02C: .4byte gTasks
-_080DD030:
-	ldr r1, _080DD068 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r0, [r4, 0x1C]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	bne _080DD062
-	movs r0, 0
-	strh r0, [r4, 0x1C]
-	ldrh r0, [r4, 0xE]
-	ldrh r1, [r4, 0x1E]
-	adds r0, r1
-	strh r0, [r4, 0x1E]
-	movs r2, 0x1E
-	ldrsh r0, [r4, r2]
-	bl sub_8073B60
-	strh r0, [r4, 0x1E]
-_080DD062:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD068: .4byte gTasks
-	thumb_func_end sub_80DCFE8
-
-	thumb_func_start sub_80DD06C
-sub_80DD06C: @ 80DD06C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r0, 0x40
-	negs r0, r0
-	bl sub_8073A44
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, _080DD090 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080DD098
-	ldr r0, _080DD094 @ =gBattleAnimAttacker
-	ldrb r4, [r0]
-	b _080DD0BE
-	.align 2, 0
-_080DD090: .4byte gBattleAnimArgs
-_080DD094: .4byte gBattleAnimAttacker
-_080DD098:
-	cmp r0, 0x1
-	bne _080DD0A8
-	ldr r0, _080DD0A4 @ =gBattleAnimTarget
-	ldrb r4, [r0]
-	b _080DD0BE
-	.align 2, 0
-_080DD0A4: .4byte gBattleAnimTarget
-_080DD0A8:
-	cmp r0, 0x2
-	bne _080DD0B4
-	ldr r0, _080DD0B0 @ =gBattleAnimAttacker
-	b _080DD0B6
-	.align 2, 0
-_080DD0B0: .4byte gBattleAnimAttacker
-_080DD0B4:
-	ldr r0, _080DD0E0 @ =gBattleAnimTarget
-_080DD0B6:
-	ldrb r1, [r0]
-	movs r0, 0x2
-	adds r4, r0, 0
-	eors r4, r1
-_080DD0BE:
-	ldr r0, _080DD0E4 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x1
-	beq _080DD0CC
-	cmp r0, 0x3
-	bne _080DD0E8
-_080DD0CC:
-	adds r0, r4, 0
-	bl IsBattlerSpriteVisible
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD0E8
-	adds r0, r5, 0
-	bl DestroyAnimVisualTask
-	b _080DD13A
-	.align 2, 0
-_080DD0E0: .4byte gBattleAnimTarget
-_080DD0E4: .4byte gBattleAnimArgs
-_080DD0E8:
-	adds r0, r4, 0
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DD10C
-	ldr r1, _080DD104 @ =gBattlerPartyIndexes
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080DD108 @ =gEnemyParty
-	b _080DD11A
-	.align 2, 0
-_080DD104: .4byte gBattlerPartyIndexes
-_080DD108: .4byte gEnemyParty
-_080DD10C:
-	ldr r1, _080DD140 @ =gBattlerPartyIndexes
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080DD144 @ =gPlayerParty
-_080DD11A:
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0
-	beq _080DD134
-	lsls r1, r6, 24
-	asrs r1, 24
-	movs r2, 0x3
-	bl PlayCry3
-_080DD134:
-	adds r0, r5, 0
-	bl DestroyAnimVisualTask
-_080DD13A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD140: .4byte gBattlerPartyIndexes
-_080DD144: .4byte gPlayerParty
-	thumb_func_end sub_80DD06C
-
-	thumb_func_start sub_80DD148
-sub_80DD148: @ 80DD148
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r0, 0x40
-	negs r0, r0
-	bl sub_8073A44
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _080DD16C @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080DD174
-	ldr r0, _080DD170 @ =gBattleAnimAttacker
-	ldrb r4, [r0]
-	b _080DD19A
-	.align 2, 0
-_080DD16C: .4byte gBattleAnimArgs
-_080DD170: .4byte gBattleAnimAttacker
-_080DD174:
-	cmp r0, 0x1
-	bne _080DD184
-	ldr r0, _080DD180 @ =gBattleAnimTarget
-	ldrb r4, [r0]
-	b _080DD19A
-	.align 2, 0
-_080DD180: .4byte gBattleAnimTarget
-_080DD184:
-	cmp r0, 0x2
-	bne _080DD190
-	ldr r0, _080DD18C @ =gBattleAnimAttacker
-	b _080DD192
-	.align 2, 0
-_080DD18C: .4byte gBattleAnimAttacker
-_080DD190:
-	ldr r0, _080DD1BC @ =gBattleAnimTarget
-_080DD192:
-	ldrb r1, [r0]
-	movs r0, 0x2
-	adds r4, r0, 0
-	eors r4, r1
-_080DD19A:
-	ldr r0, _080DD1C0 @ =gBattleAnimArgs
-	movs r2, 0
-	ldrsh r0, [r0, r2]
-	cmp r0, 0x1
-	beq _080DD1A8
-	cmp r0, 0x3
-	bne _080DD1C4
-_080DD1A8:
-	adds r0, r4, 0
-	bl IsBattlerSpriteVisible
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD1C4
-	adds r0, r6, 0
-	bl DestroyAnimVisualTask
-	b _080DD26A
-	.align 2, 0
-_080DD1BC: .4byte gBattleAnimTarget
-_080DD1C0: .4byte gBattleAnimArgs
-_080DD1C4:
-	adds r0, r4, 0
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080DD1E8
-	ldr r1, _080DD1E0 @ =gBattlerPartyIndexes
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080DD1E4 @ =gEnemyParty
-	b _080DD1F6
-	.align 2, 0
-_080DD1E0: .4byte gBattlerPartyIndexes
-_080DD1E4: .4byte gEnemyParty
-_080DD1E8:
-	ldr r1, _080DD234 @ =gBattlerPartyIndexes
-	lsls r0, r4, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _080DD238 @ =gPlayerParty
-_080DD1F6:
-	adds r0, r1
-	movs r1, 0xB
-	bl GetMonData
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldr r1, _080DD23C @ =gTasks
-	lsls r2, r6, 2
-	adds r0, r2, r6
-	lsls r0, 3
-	adds r0, r1
-	ldr r4, _080DD240 @ =gBattleAnimArgs
-	ldrh r1, [r4, 0x2]
-	strh r1, [r0, 0x8]
-	strh r3, [r0, 0xA]
-	lsls r1, r5, 24
-	asrs r1, 24
-	strh r1, [r0, 0xC]
-	adds r5, r2, 0
-	cmp r3, 0
-	beq _080DD264
-	movs r2, 0x2
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xFF
-	bne _080DD244
-	adds r0, r3, 0
-	movs r2, 0x9
-	bl PlayCry3
-	b _080DD24C
-	.align 2, 0
-_080DD234: .4byte gBattlerPartyIndexes
-_080DD238: .4byte gPlayerParty
-_080DD23C: .4byte gTasks
-_080DD240: .4byte gBattleAnimArgs
-_080DD244:
-	adds r0, r3, 0
-	movs r2, 0x7
-	bl PlayCry3
-_080DD24C:
-	ldr r0, _080DD25C @ =gTasks
-	adds r1, r5, r6
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _080DD260 @ =sub_80DD270
-	str r0, [r1]
-	b _080DD26A
-	.align 2, 0
-_080DD25C: .4byte gTasks
-_080DD260: .4byte sub_80DD270
-_080DD264:
-	adds r0, r6, 0
-	bl DestroyAnimVisualTask
-_080DD26A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DD148
-
-	thumb_func_start sub_80DD270
-sub_80DD270: @ 80DD270
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	mov r9, r4
-	ldr r1, _080DD2A0 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r1, r0, r1
-	ldrh r6, [r1, 0xA]
-	mov r8, r6
-	ldrb r5, [r1, 0xC]
-	adds r7, r5, 0
-	ldrh r2, [r1, 0x1A]
-	movs r3, 0x1A
-	ldrsh r0, [r1, r3]
-	cmp r0, 0x1
-	bgt _080DD2A4
-	adds r0, r2, 0x1
-	strh r0, [r1, 0x1A]
-	b _080DD2E6
-	.align 2, 0
-_080DD2A0: .4byte gTasks
-_080DD2A4:
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	cmp r0, 0xFF
-	bne _080DD2CA
-	bl IsCryPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD2E6
-	lsls r1, r5, 24
-	asrs r1, 24
-	adds r0, r6, 0
-	movs r2, 0xA
-	bl PlayCry3
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-	b _080DD2E6
-_080DD2CA:
-	bl IsCryPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD2E6
-	lsls r1, r7, 24
-	asrs r1, 24
-	mov r0, r8
-	movs r2, 0x8
-	bl PlayCry3
-	mov r0, r9
-	bl DestroyAnimVisualTask
-_080DD2E6:
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DD270
-
-	thumb_func_start sub_80DD2F4
-sub_80DD2F4: @ 80DD2F4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	ldr r1, _080DD318 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r1, r0, r1
-	ldrh r2, [r1, 0x1A]
-	movs r3, 0x1A
-	ldrsh r0, [r1, r3]
-	cmp r0, 0x1
-	bgt _080DD31C
-	adds r0, r2, 0x1
-	strh r0, [r1, 0x1A]
-	b _080DD32C
-	.align 2, 0
-_080DD318: .4byte gTasks
-_080DD31C:
-	bl IsCryPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD32C
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-_080DD32C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DD2F4
-
-	thumb_func_start sub_80DD334
-sub_80DD334: @ 80DD334
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r0, 0x40
-	negs r0, r0
-	bl sub_8073A44
-	ldr r2, _080DD374 @ =gUnknown_2037F1C
-	ldr r1, _080DD378 @ =gBattleAnimAttacker
-	ldrb r1, [r1]
-	lsls r1, 1
-	adds r1, r2
-	ldrh r3, [r1]
-	ldr r2, _080DD37C @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r4, r1, r2
-	strh r3, [r4, 0xA]
-	lsls r0, 24
-	asrs r1, r0, 24
-	strh r1, [r4, 0xC]
-	cmp r3, 0
-	beq _080DD384
-	adds r0, r3, 0
-	movs r2, 0x4
-	bl PlayCry3
-	ldr r0, _080DD380 @ =sub_80DD390
-	str r0, [r4]
-	b _080DD38A
-	.align 2, 0
-_080DD374: .4byte gUnknown_2037F1C
-_080DD378: .4byte gBattleAnimAttacker
-_080DD37C: .4byte gTasks
-_080DD380: .4byte sub_80DD390
-_080DD384:
-	adds r0, r5, 0
-	bl DestroyAnimVisualTask
-_080DD38A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DD334
-
-	thumb_func_start sub_80DD390
-sub_80DD390: @ 80DD390
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	ldr r1, _080DD3B4 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r1, [r4, 0x1A]
-	movs r2, 0x1A
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x1
-	bgt _080DD3B8
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x1A]
-	b _080DD3D4
-	.align 2, 0
-_080DD3B4: .4byte gTasks
-_080DD3B8:
-	bl IsCryPlaying
-	lsls r0, 24
-	cmp r0, 0
-	bne _080DD3D4
-	ldrh r0, [r4, 0xA]
-	movs r1, 0xC
-	ldrsb r1, [r4, r1]
-	movs r2, 0x6
-	bl PlayCry3
-	adds r0, r5, 0
-	bl DestroyAnimVisualTask
-_080DD3D4:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80DD390
-
-	thumb_func_start sub_80DD3DC
-sub_80DD3DC: @ 80DD3DC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, _080DD40C @ =gBattleAnimArgs
-	ldrh r5, [r0]
-	ldrb r0, [r0, 0x2]
-	lsls r0, 24
-	asrs r0, 24
-	bl sub_8073A44
-	adds r1, r0, 0
-	lsls r1, 24
-	asrs r1, 24
-	adds r0, r5, 0
-	bl PlaySE1WithPanning
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD40C: .4byte gBattleAnimArgs
-	thumb_func_end sub_80DD3DC
-
-	thumb_func_start sub_80DD410
-sub_80DD410: @ 80DD410
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, _080DD440 @ =gBattleAnimArgs
-	ldrh r5, [r0]
-	ldrb r0, [r0, 0x2]
-	lsls r0, 24
-	asrs r0, 24
-	bl sub_8073A44
-	adds r1, r0, 0
-	lsls r1, 24
-	asrs r1, 24
-	adds r0, r5, 0
-	bl PlaySE2WithPanning
-	adds r0, r4, 0
-	bl DestroyAnimVisualTask
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD440: .4byte gBattleAnimArgs
-	thumb_func_end sub_80DD410
-
-	thumb_func_start sub_80DD444
-sub_80DD444: @ 80DD444
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	mov r8, r0
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	ldr r0, _080DD4C8 @ =gBattleAnimArgs
-	ldrb r5, [r0, 0x2]
-	ldrb r6, [r0, 0x4]
-	ldrh r1, [r0, 0x6]
-	mov r9, r1
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	bl sub_8073A44
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	adds r0, r5, 0
-	bl sub_8073A44
-	adds r5, r0, 0
-	lsls r4, 24
-	asrs r4, 24
-	lsls r5, 24
-	asrs r5, 24
-	lsls r6, 24
-	asrs r6, 24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	adds r2, r6, 0
-	bl CalculatePanIncrement
-	ldr r2, _080DD4CC @ =gTasks
-	mov r3, r8
-	lsls r1, r3, 2
-	add r1, r8
-	lsls r1, 3
-	adds r1, r2
-	movs r2, 0
-	strh r4, [r1, 0xA]
-	strh r5, [r1, 0xC]
-	lsls r0, 24
-	asrs r0, 24
-	strh r0, [r1, 0xE]
-	mov r0, r9
-	strh r0, [r1, 0x12]
-	strh r2, [r1, 0x1C]
-	strh r4, [r1, 0x1E]
-	ldr r2, _080DD4D0 @ =sub_80DD4D4
-	str r2, [r1]
-	mov r0, r8
-	bl _call_via_r2
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD4C8: .4byte gBattleAnimArgs
-_080DD4CC: .4byte gTasks
-_080DD4D0: .4byte sub_80DD4D4
-	thumb_func_end sub_80DD444
-
-	thumb_func_start sub_80DD4D4
-sub_80DD4D4: @ 80DD4D4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	ldr r1, _080DD52C @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	ldrh r2, [r4, 0xE]
-	ldrh r0, [r4, 0x1C]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0x1C]
-	lsls r0, 16
-	asrs r0, 16
-	movs r3, 0x12
-	ldrsh r1, [r4, r3]
-	cmp r0, r1
-	bne _080DD50E
-	movs r0, 0
-	strh r0, [r4, 0x1C]
-	ldrh r1, [r4, 0x1E]
-	adds r0, r2, r1
-	strh r0, [r4, 0x1E]
-	movs r2, 0x1E
-	ldrsh r0, [r4, r2]
-	bl sub_8073B60
-	strh r0, [r4, 0x1E]
-_080DD50E:
-	ldr r1, _080DD530 @ =gUnknown_2037F24
-	ldrh r0, [r4, 0x1E]
-	strb r0, [r1]
-	movs r3, 0x1E
-	ldrsh r1, [r4, r3]
-	movs r2, 0xC
-	ldrsh r0, [r4, r2]
-	cmp r1, r0
-	bne _080DD526
-	adds r0, r5, 0
-	bl DestroyAnimVisualTask
-_080DD526:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080DD52C: .4byte gTasks
-_080DD530: .4byte gUnknown_2037F24
-	thumb_func_end sub_80DD4D4
-
-	.align 2, 0 @ Don't pad with nop.

asm/battle_anim_special.s

@@ -18,10 +18,10 @@ sub_80EEC0C: @ 80EEC0C
 	str r0, [sp, 0x10]
 	ldr r0, _080EEDB4 @ =gBattleAnimAttacker
 	ldrb r4, [r0]
-	ldr r0, _080EEDB8 @ =gUnknown_2022984
+	ldr r0, _080EEDB8 @ =gBattle_WIN0H
 	movs r1, 0
 	strh r1, [r0]
-	ldr r0, _080EEDBC @ =gUnknown_2022986
+	ldr r0, _080EEDBC @ =gBattle_WIN0V
 	strh r1, [r0]
 	ldr r1, _080EEDC0 @ =0x00003f3f
 	movs r0, 0x48
@@ -155,13 +155,13 @@ sub_80EEC0C: @ 80EEC0C
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080EEDD8 @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet
 	mov r2, sp
 	ldrh r2, [r2, 0xA]
-	bl sub_80753B4
+	bl AnimLoadCompressedBgGfx
 	ldr r0, _080EEDE0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette
 	mov r1, sp
 	ldrb r1, [r1, 0x8]
@@ -204,8 +204,8 @@ sub_80EEC0C: @ 80EEC0C
 	bx r0
 	.align 2, 0
 _080EEDB4: .4byte gBattleAnimAttacker
-_080EEDB8: .4byte gUnknown_2022984
-_080EEDBC: .4byte gUnknown_2022986
+_080EEDB8: .4byte gBattle_WIN0H
+_080EEDBC: .4byte gBattle_WIN0V
 _080EEDC0: .4byte 0x00003f3f
 _080EEDC4: .4byte 0x00003f3d
 _080EEDC8: .4byte 0x00003f42
@@ -336,9 +336,9 @@ _080EEE9C:
 	bne _080EEFA8
 	movs r0, 0
 	bl sub_8073128
-	ldr r0, _080EEFB4 @ =gUnknown_2022984
+	ldr r0, _080EEFB4 @ =gBattle_WIN0H
 	strh r4, [r0]
-	ldr r0, _080EEFB8 @ =gUnknown_2022986
+	ldr r0, _080EEFB8 @ =gBattle_WIN0V
 	strh r4, [r0]
 	ldr r4, _080EEFBC @ =0x00003f3f
 	movs r0, 0x48
@@ -439,8 +439,8 @@ _080EEFA8:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080EEFB4: .4byte gUnknown_2022984
-_080EEFB8: .4byte gUnknown_2022986
+_080EEFB4: .4byte gBattle_WIN0H
+_080EEFB8: .4byte gBattle_WIN0V
 _080EEFBC: .4byte 0x00003f3f
 _080EEFC0: .4byte gSprites
 _080EEFC4: .4byte gHealthboxSpriteIds
@@ -855,7 +855,7 @@ _080EF2E6:
 	movs r3, 0
 	bl SetSpriteRotScale
 	adds r0, r5, 0
-	bl sub_8076440
+	bl SetBattlerSpriteYOffsetFromYScale
 	movs r0, 0x1C
 	ldrsh r1, [r4, r0]
 	ldr r0, _080EF314 @ =0x000002cf
@@ -1585,7 +1585,7 @@ sub_80EF8C0: @ 80EF8C0
 	ldr r0, _080EF8E8 @ =0x0000ffd8
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	ldr r0, _080EF8EC @ =sub_80EF8F0
 	str r0, [r4, 0x1C]
 	pop {r4}
@@ -1601,7 +1601,7 @@ sub_80EF8F0: @ 80EF8F0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	adds r4, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080EF99E
@@ -2804,7 +2804,7 @@ _080F01F2:
 	ldrsb r0, [r1, r0]
 	strh r0, [r5, 0x38]
 	adds r0, r5, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	add r4, r10
 	ldr r0, _080F0270 @ =sub_80F0278
 	str r0, [r4]
@@ -2849,7 +2849,7 @@ sub_80F0278: @ 80F0278
 	orrs r0, r1
 	strb r0, [r3]
 	adds r0, r4, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F02A8
@@ -3204,9 +3204,9 @@ sub_80F052C: @ 80F052C
 	movs r0, 0x20
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	adds r0, r4, 0
-	bl sub_80750C8
+	bl TranslateAnimVerticalArc
 	ldr r0, _080F0570 @ =sub_80F0574
 	str r0, [r4, 0x1C]
 	pop {r4}
@@ -3220,7 +3220,7 @@ _080F0570: .4byte sub_80F0574
 sub_80F0574: @ 80F0574
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80750C8
+	bl TranslateAnimVerticalArc
 	lsls r0, 24
 	cmp r0, 0
 	bne _080F0590
@@ -5317,7 +5317,7 @@ _080F15F0:
 _080F15F6:
 	ldr r0, _080F1610 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
-	bl sub_80768B0
+	bl GetBattlerSpriteBGPriorityRank
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5982,7 +5982,7 @@ sub_80F1B3C: @ 80F1B3C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	movs r0, 0x1E
 	strh r0, [r4, 0x2E]
 	movs r0, 0x1
@@ -6011,7 +6011,7 @@ sub_80F1B3C: @ 80F1B3C
 	ldr r0, _080F1BB4 @ =0x0000ffe0
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	ldr r2, _080F1BB8 @ =gSprites
 	ldr r1, _080F1BBC @ =gBattlerSpriteIds
 	ldr r0, _080F1BC0 @ =gBattleAnimAttacker
@@ -6074,7 +6074,7 @@ _080F1C00: .4byte sub_80F1C04
 sub_80F1C04: @ 80F1C04
 	push {r4,lr}
 	adds r4, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080F1C26

asm/berry_crush_2.s

@@ -2856,7 +2856,7 @@ _0814D106:
 	movs r0, 0
 	movs r1, 0
 	bl DrawDialogueFrame
-	ldr r2, _0814D148 @ =gUnknown_8419F54
+	ldr r2, _0814D148 @ =gText_SavingDontTurnOffThePower2
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x2
@@ -2877,7 +2877,7 @@ _0814D106:
 	bl CreateTask
 	b _0814D178
 	.align 2, 0
-_0814D148: .4byte gUnknown_8419F54
+_0814D148: .4byte gText_SavingDontTurnOffThePower2
 _0814D14C: .4byte sub_80DA634
 _0814D150:
 	ldr r0, _0814D160 @ =sub_80DA634

asm/bug.s

@@ -1,829 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80B3FAC
-sub_80B3FAC: @ 80B3FAC
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B3FD8
-	adds r0, r6, 0
-	movs r1, 0x2
-	bl StartSpriteAffineAnim
-	ldr r0, _080B3FD4 @ =gBattleAnimArgs
-	ldrh r1, [r0, 0x4]
-	negs r1, r1
-	strh r1, [r0, 0x4]
-	ldrh r1, [r0]
-	negs r1, r1
-	strh r1, [r0]
-	b _080B4008
-	.align 2, 0
-_080B3FD4: .4byte gBattleAnimArgs
-_080B3FD8:
-	ldr r0, _080B406C @ =gBattleAnimTarget
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B4008
-	adds r0, r6, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	ldr r1, _080B4070 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-	ldrh r0, [r1, 0x6]
-	negs r0, r0
-	strh r0, [r1, 0x6]
-	ldrh r0, [r1]
-	negs r0, r0
-	strh r0, [r1]
-_080B4008:
-	ldr r5, _080B406C @ =gBattleAnimTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl sub_8074844
-	lsls r0, 24
-	ldr r4, _080B4070 @ =gBattleAnimArgs
-	lsrs r0, 24
-	ldrh r1, [r4]
-	adds r0, r1
-	strh r0, [r6, 0x20]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl sub_8074844
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x2]
-	adds r0, r1
-	strh r0, [r6, 0x22]
-	ldrh r0, [r4, 0x8]
-	strh r0, [r6, 0x2E]
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x4]
-	adds r0, r1
-	strh r0, [r6, 0x32]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r4, [r4, 0x6]
-	adds r0, r4
-	strh r0, [r6, 0x36]
-	ldr r0, _080B4074 @ =StartAnimLinearTranslation
-	str r0, [r6, 0x1C]
-	ldr r1, _080B4078 @ =DestroyAnimSprite
-	adds r0, r6, 0
-	bl StoreSpriteCallbackInData6
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B406C: .4byte gBattleAnimTarget
-_080B4070: .4byte gBattleAnimArgs
-_080B4074: .4byte StartAnimLinearTranslation
-_080B4078: .4byte DestroyAnimSprite
-	thumb_func_end sub_80B3FAC
-
-	thumb_func_start sub_80B407C
-sub_80B407C: @ 80B407C
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B40A0
-	ldr r1, _080B409C @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	negs r0, r0
-	strh r0, [r1]
-	adds r0, r6, 0
-	movs r1, 0x2
-	bl StartSpriteAffineAnim
-	b _080B40BC
-	.align 2, 0
-_080B409C: .4byte gBattleAnimArgs
-_080B40A0:
-	ldr r0, _080B4118 @ =gBattleAnimTarget
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B40BC
-	ldr r0, _080B411C @ =gBattleAnimArgs
-	ldrh r1, [r0, 0x2]
-	negs r1, r1
-	strh r1, [r0, 0x2]
-	ldrh r1, [r0]
-	negs r1, r1
-	strh r1, [r0]
-_080B40BC:
-	ldr r5, _080B4118 @ =gBattleAnimTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl sub_8074844
-	lsls r0, 24
-	ldr r4, _080B411C @ =gBattleAnimArgs
-	lsrs r0, 24
-	ldrh r1, [r4]
-	adds r0, r1
-	strh r0, [r6, 0x20]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl sub_8074844
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x2]
-	adds r0, r1
-	strh r0, [r6, 0x22]
-	ldrh r0, [r4, 0x4]
-	strh r0, [r6, 0x2E]
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x32]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x36]
-	ldr r0, _080B4120 @ =StartAnimLinearTranslation
-	str r0, [r6, 0x1C]
-	ldr r1, _080B4124 @ =DestroyAnimSprite
-	adds r0, r6, 0
-	bl StoreSpriteCallbackInData6
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B4118: .4byte gBattleAnimTarget
-_080B411C: .4byte gBattleAnimArgs
-_080B4120: .4byte StartAnimLinearTranslation
-_080B4124: .4byte DestroyAnimSprite
-	thumb_func_end sub_80B407C
-
-	thumb_func_start sub_80B4128
-sub_80B4128: @ 80B4128
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4144
-	ldr r0, _080B4184 @ =gBattleAnimArgs
-	movs r2, 0x4
-	ldrsh r1, [r0, r2]
-	lsrs r2, r1, 31
-	adds r1, r2
-	asrs r1, 1
-	strh r1, [r0, 0x4]
-_080B4144:
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl sub_8075160
-	ldr r1, _080B4184 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r5, 0x20]
-	strh r0, [r5, 0x30]
-	ldrh r0, [r5, 0x22]
-	strh r0, [r5, 0x34]
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bne _080B418C
-	ldr r4, _080B4188 @ =gBattleAnimTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x32]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x36]
-	b _080B419E
-	.align 2, 0
-_080B4184: .4byte gBattleAnimArgs
-_080B4188: .4byte gBattleAnimTarget
-_080B418C:
-	ldr r0, _080B41B4 @ =gBattleAnimTarget
-	ldrb r0, [r0]
-	adds r2, r5, 0
-	adds r2, 0x32
-	adds r3, r5, 0
-	adds r3, 0x36
-	movs r1, 0x1
-	bl sub_8076D9C
-_080B419E:
-	adds r0, r5, 0
-	bl sub_8075678
-	ldr r0, _080B41B8 @ =gBattleAnimArgs
-	ldrh r0, [r0, 0x6]
-	strh r0, [r5, 0x38]
-	ldr r0, _080B41BC @ =sub_80B41C0
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B41B4: .4byte gBattleAnimTarget
-_080B41B8: .4byte gBattleAnimArgs
-_080B41BC: .4byte sub_80B41C0
-	thumb_func_end sub_80B4128
-
-	thumb_func_start sub_80B41C0
-sub_80B41C0: @ 80B41C0
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80755E0
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B41D6
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-	b _080B41F2
-_080B41D6:
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	movs r2, 0x38
-	ldrsh r1, [r4, r2]
-	bl Sin
-	ldrh r1, [r4, 0x24]
-	adds r0, r1
-	strh r0, [r4, 0x24]
-	ldrh r0, [r4, 0x3A]
-	adds r0, 0xD
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x3A]
-_080B41F2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B41C0
-
-	thumb_func_start sub_80B41F8
-sub_80B41F8: @ 80B41F8
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080B4228 @ =gBattleAnimTarget
-	ldrb r0, [r0]
-	adds r2, r4, 0
-	adds r2, 0x20
-	adds r3, r4, 0
-	adds r3, 0x22
-	movs r1, 0
-	bl sub_8076D9C
-	ldr r0, _080B422C @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4234
-	ldr r0, _080B4230 @ =gBattleAnimArgs
-	ldrh r1, [r4, 0x20]
-	ldrh r2, [r0]
-	subs r1, r2
-	strh r1, [r4, 0x20]
-	b _080B4240
-	.align 2, 0
-_080B4228: .4byte gBattleAnimTarget
-_080B422C: .4byte gBattleAnimAttacker
-_080B4230: .4byte gBattleAnimArgs
-_080B4234:
-	ldr r1, _080B4268 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r4, 0x20]
-	adds r0, r1, 0
-_080B4240:
-	ldrh r0, [r0, 0x2]
-	ldrh r1, [r4, 0x22]
-	adds r0, r1
-	strh r0, [r4, 0x22]
-	ldr r0, _080B426C @ =gBattleAnimTarget
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B425C
-	ldrh r0, [r4, 0x22]
-	adds r0, 0x8
-	strh r0, [r4, 0x22]
-_080B425C:
-	ldr r0, _080B4270 @ =sub_80B4274
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B4268: .4byte gBattleAnimArgs
-_080B426C: .4byte gBattleAnimTarget
-_080B4270: .4byte sub_80B4274
-	thumb_func_end sub_80B41F8
-
-	thumb_func_start sub_80B4274
-sub_80B4274: @ 80B4274
-	push {lr}
-	adds r3, r0, 0
-	ldrh r0, [r3, 0x2E]
-	adds r0, 0x1
-	strh r0, [r3, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x3
-	bne _080B42A8
-	movs r0, 0
-	strh r0, [r3, 0x2E]
-	movs r0, 0x3E
-	adds r0, r3
-	mov r12, r0
-	ldrb r2, [r0]
-	lsls r0, r2, 29
-	lsrs r0, 31
-	movs r1, 0x1
-	eors r1, r0
-	lsls r1, 2
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	mov r1, r12
-	strb r0, [r1]
-_080B42A8:
-	ldrh r0, [r3, 0x30]
-	adds r0, 0x1
-	strh r0, [r3, 0x30]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x33
-	bne _080B42BC
-	adds r0, r3, 0
-	bl DestroyAnimSprite
-_080B42BC:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B4274
-
-	thumb_func_start sub_80B42C0
-sub_80B42C0: @ 80B42C0
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0xFD
-	lsls r1, 6
-	movs r0, 0x50
-	bl SetGpuReg
-	movs r0, 0x52
-	movs r1, 0x10
-	bl SetGpuReg
-	movs r0, 0x10
-	strh r0, [r4, 0x2E]
-	ldr r0, _080B42E4 @ =sub_80B42E8
-	str r0, [r4, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B42E4: .4byte sub_80B42E8
-	thumb_func_end sub_80B42C0
-
-	thumb_func_start sub_80B42E8
-sub_80B42E8: @ 80B42E8
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x32]
-	movs r2, 0x32
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x13
-	bgt _080B42FC
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x32]
-	b _080B433A
-_080B42FC:
-	ldrh r1, [r4, 0x30]
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x30]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080B433A
-	ldrh r1, [r4, 0x2E]
-	subs r1, 0x1
-	strh r1, [r4, 0x2E]
-	movs r0, 0x10
-	subs r0, r1
-	lsls r0, 8
-	orrs r1, r0
-	lsls r1, 16
-	lsrs r1, 16
-	movs r0, 0x52
-	bl SetGpuReg
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080B433A
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, _080B4340 @ =sub_80B4344
-	str r0, [r4, 0x1C]
-_080B433A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B4340: .4byte sub_80B4344
-	thumb_func_end sub_80B42E8
-
-	thumb_func_start sub_80B4344
-sub_80B4344: @ 80B4344
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x52
-	movs r1, 0
-	bl SetGpuReg
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B4344
-
-	thumb_func_start sub_80B4364
-sub_80B4364: @ 80B4364
-	push {r4-r7,lr}
-	sub sp, 0x4
-	adds r7, r0, 0
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B4384
-	ldr r1, _080B4380 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-	b _080B43A6
-	.align 2, 0
-_080B4380: .4byte gBattleAnimArgs
-_080B4384:
-	ldr r0, _080B4480 @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B43A6
-	ldr r1, _080B4484 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-	ldrh r0, [r1, 0x2]
-	negs r0, r0
-	strh r0, [r1, 0x2]
-	ldrh r0, [r1, 0x6]
-	negs r0, r0
-	strh r0, [r1, 0x6]
-_080B43A6:
-	bl IsContest
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B43F6
-	ldr r0, _080B4480 @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	adds r4, r0, 0
-	ldr r5, _080B4488 @ =gBattleAnimTarget
-	ldrb r0, [r5]
-	bl GetBattlerSide
-	lsls r4, 24
-	lsls r0, 24
-	cmp r4, r0
-	bne _080B43F6
-	ldrb r0, [r5]
-	bl GetBattlerPosition
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B43E4
-	ldrb r0, [r5]
-	bl GetBattlerPosition
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080B43F6
-_080B43E4:
-	ldr r0, _080B4484 @ =gBattleAnimArgs
-	movs r2, 0x4
-	ldrsh r1, [r0, r2]
-	negs r1, r1
-	strh r1, [r0, 0x4]
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	negs r1, r1
-	strh r1, [r0]
-_080B43F6:
-	adds r0, r7, 0
-	movs r1, 0x1
-	bl sub_8075160
-	ldr r5, _080B4488 @ =gBattleAnimTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	adds r4, r0, 0
-	lsls r4, 24
-	ldr r6, _080B4484 @ =gBattleAnimArgs
-	lsrs r4, 24
-	ldrh r0, [r6, 0x4]
-	adds r4, r0
-	lsls r4, 16
-	lsrs r4, 16
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldrh r2, [r6, 0x6]
-	adds r1, r2
-	lsls r1, 16
-	ldrh r2, [r7, 0x20]
-	lsls r0, r4, 16
-	asrs r0, 16
-	subs r0, r2
-	lsls r0, 16
-	asrs r0, 16
-	ldrh r2, [r7, 0x22]
-	lsrs r5, r1, 16
-	asrs r1, 16
-	subs r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	bl sub_8075B30
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 24
-	adds r0, r1
-	lsrs r0, 16
-	movs r3, 0x80
-	lsls r3, 1
-	str r0, [sp]
-	adds r0, r7, 0
-	movs r1, 0
-	adds r2, r3, 0
-	bl sub_8075A1C
-	ldrh r0, [r6, 0x8]
-	strh r0, [r7, 0x2E]
-	strh r4, [r7, 0x32]
-	strh r5, [r7, 0x36]
-	ldr r0, _080B448C @ =StartAnimLinearTranslation
-	str r0, [r7, 0x1C]
-	ldr r1, _080B4490 @ =DestroyAnimSprite
-	adds r0, r7, 0
-	bl StoreSpriteCallbackInData6
-	add sp, 0x4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B4480: .4byte gBattleAnimAttacker
-_080B4484: .4byte gBattleAnimArgs
-_080B4488: .4byte gBattleAnimTarget
-_080B448C: .4byte StartAnimLinearTranslation
-_080B4490: .4byte DestroyAnimSprite
-	thumb_func_end sub_80B4364
-
-	thumb_func_start sub_80B4494
-sub_80B4494: @ 80B4494
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r1, 0x1
-	bl sub_8075160
-	ldr r0, _080B4500 @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B44B4
-	ldr r1, _080B4504 @ =gBattleAnimArgs
-	ldrh r0, [r1, 0x4]
-	negs r0, r0
-	strh r0, [r1, 0x4]
-_080B44B4:
-	ldr r4, _080B4504 @ =gBattleAnimArgs
-	ldrh r0, [r4, 0x8]
-	strh r0, [r6, 0x2E]
-	ldr r5, _080B4508 @ =gBattleAnimTarget
-	ldrb r0, [r5]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x4]
-	adds r0, r1
-	strh r0, [r6, 0x32]
-	ldrb r0, [r5]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r1, [r4, 0x6]
-	adds r0, r1
-	strh r0, [r6, 0x36]
-	ldrh r0, [r4, 0xA]
-	strh r0, [r6, 0x38]
-	adds r0, r6, 0
-	bl sub_8075068
-	ldr r0, _080B450C @ =sub_80B4510
-	str r0, [r6, 0x1C]
-	adds r2, r6, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B4500: .4byte gBattleAnimAttacker
-_080B4504: .4byte gBattleAnimArgs
-_080B4508: .4byte gBattleAnimTarget
-_080B450C: .4byte sub_80B4510
-	thumb_func_end sub_80B4494
-
-	thumb_func_start sub_80B4510
-sub_80B4510: @ 80B4510
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x14
-	adds r4, r0, 0
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x5
-	negs r1, r1
-	ands r1, r0
-	strb r1, [r2]
-	adds r0, r4, 0
-	bl AnimateBallThrow
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B453C
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-	b _080B45CC
-_080B453C:
-	movs r0, 0x2E
-	adds r0, r4
-	mov r8, r0
-	ldrh r7, [r4, 0x20]
-	ldrh r5, [r4, 0x24]
-	ldrh r1, [r4, 0x22]
-	mov r12, r1
-	ldrh r6, [r4, 0x26]
-	mov r2, r8
-	add r1, sp, 0x4
-	movs r3, 0x7
-_080B4552:
-	ldrh r0, [r2]
-	strh r0, [r1]
-	adds r2, 0x2
-	adds r1, 0x2
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080B4552
-	adds r0, r7, r5
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r2, r12
-	adds r0, r2, r6
-	lsls r0, 16
-	lsrs r6, r0, 16
-	adds r0, r4, 0
-	bl AnimateBallThrow
-	lsls r0, 24
-	cmp r0, 0
-	bne _080B45CC
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	lsls r1, r5, 16
-	asrs r1, 16
-	subs r0, r1
-	lsls r0, 16
-	asrs r0, 16
-	ldrh r1, [r4, 0x26]
-	ldrh r2, [r4, 0x22]
-	adds r1, r2
-	lsls r2, r6, 16
-	asrs r2, 16
-	subs r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	bl sub_8075B30
-	lsls r0, 16
-	movs r1, 0xC0
-	lsls r1, 24
-	adds r0, r1
-	lsrs r0, 16
-	movs r3, 0x80
-	lsls r3, 1
-	str r0, [sp]
-	adds r0, r4, 0
-	movs r1, 0
-	adds r2, r3, 0
-	bl sub_8075A1C
-	add r2, sp, 0x4
-	mov r1, r8
-	movs r3, 0x7
-_080B45BE:
-	ldrh r0, [r2]
-	strh r0, [r1]
-	adds r2, 0x2
-	adds r1, 0x2
-	subs r3, 0x1
-	cmp r3, 0
-	bge _080B45BE
-_080B45CC:
-	add sp, 0x14
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B4510
-
-	thumb_func_start sub_80B45D8
-sub_80B45D8: @ 80B45D8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _080B45EC @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080B45F4
-	ldr r4, _080B45F0 @ =gBattleAnimAttacker
-	b _080B45F6
-	.align 2, 0
-_080B45EC: .4byte gBattleAnimArgs
-_080B45F0: .4byte gBattleAnimAttacker
-_080B45F4:
-	ldr r4, _080B4628 @ =gBattleAnimTarget
-_080B45F6:
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	adds r0, 0x12
-	strh r0, [r5, 0x22]
-	ldr r1, _080B462C @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData6
-	ldr r0, _080B4630 @ =sub_8074F50
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B4628: .4byte gBattleAnimTarget
-_080B462C: .4byte move_anim_8074EE0
-_080B4630: .4byte sub_8074F50
-	thumb_func_end sub_80B45D8
-
-	.align 2, 0 @ Don't pad with nop.

asm/cable_club.s

@@ -1496,7 +1496,7 @@ _08081308: .4byte gReceivedRemoteLinkPlayers
 	thumb_func_start sub_808130C
 sub_808130C: @ 808130C
 	push {lr}
-	bl sub_806F67C
+	bl Field_AskSaveTheGame
 	pop {r0}
 	bx r0
 	thumb_func_end sub_808130C
@@ -2001,7 +2001,7 @@ _08081724:
 	ldr r0, _0808173C @ =c2_8056854
 _08081728:
 	str r0, [r1, 0x8]
-	ldr r0, _08081740 @ =sub_806FB7C
+	ldr r0, _08081740 @ =CB2_SetUpSaveAfterLinkBattle
 	bl SetMainCallback2
 	pop {r4,r5}
 	pop {r0}
@@ -2009,7 +2009,7 @@ _08081728:
 	.align 2, 0
 _08081738: .4byte gMain
 _0808173C: .4byte c2_8056854
-_08081740: .4byte sub_806FB7C
+_08081740: .4byte CB2_SetUpSaveAfterLinkBattle
 	thumb_func_end sub_8081668
 
 	thumb_func_start sub_8081744
@@ -2388,7 +2388,7 @@ sp02A_crash_sound: @ 8081A1C
 	ldr r0, _08081A2C @ =gSpecialVar_0x8006
 	ldrb r0, [r0]
 	ldr r1, _08081A30 @ =CB2_ReturnToFieldContinueScriptPlayMapMusic
-	bl sub_808B700
+	bl InitLinkPartnerTrainerCard
 	pop {r0}
 	bx r0
 	.align 2, 0

asm/dodrio_berry_picking.s

@@ -10658,7 +10658,7 @@ _08155AA6:
 	movs r0, 0
 	movs r1, 0
 	bl DrawDialogueFrame
-	ldr r2, _08155ACC @ =gUnknown_8419F54
+	ldr r2, _08155ACC @ =gText_SavingDontTurnOffThePower2
 	str r4, [sp]
 	movs r0, 0x2
 	str r0, [sp, 0x4]
@@ -10672,7 +10672,7 @@ _08155AA6:
 	bl AddTextPrinterParameterized2
 	b _08155B08
 	.align 2, 0
-_08155ACC: .4byte gUnknown_8419F54
+_08155ACC: .4byte gText_SavingDontTurnOffThePower2
 _08155AD0:
 	movs r0, 0
 	movs r1, 0x3

asm/dragon.s

@@ -1,835 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_80B725C
-sub_80B725C: @ 80B725C
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, _080B72A4 @ =gBattleAnimAttacker
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x22]
-	ldrb r0, [r4]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B72AC
-	ldr r2, _080B72A8 @ =gBattleAnimArgs
-	ldrh r0, [r5, 0x20]
-	ldrh r1, [r2]
-	subs r0, r1
-	strh r0, [r5, 0x20]
-	ldrh r0, [r2, 0x6]
-	negs r0, r0
-	strh r0, [r2, 0x6]
-	ldrh r0, [r2, 0x8]
-	negs r0, r0
-	strh r0, [r2, 0x8]
-	adds r1, r2, 0
-	b _080B72B6
-	.align 2, 0
-_080B72A4: .4byte gBattleAnimAttacker
-_080B72A8: .4byte gBattleAnimArgs
-_080B72AC:
-	ldr r1, _080B72EC @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	ldrh r2, [r5, 0x20]
-	adds r0, r2
-	strh r0, [r5, 0x20]
-_080B72B6:
-	ldrh r0, [r1, 0x2]
-	ldrh r2, [r5, 0x22]
-	adds r0, r2
-	strh r0, [r5, 0x22]
-	ldrh r0, [r1, 0x4]
-	strh r0, [r5, 0x2E]
-	ldrh r0, [r1, 0x6]
-	strh r0, [r5, 0x30]
-	ldrh r0, [r1, 0x8]
-	strh r0, [r5, 0x34]
-	ldrh r0, [r1, 0xA]
-	strh r0, [r5, 0x38]
-	adds r2, r5, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r1, _080B72F0 @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData6
-	ldr r0, _080B72F4 @ =sub_8074E70
-	str r0, [r5, 0x1C]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B72EC: .4byte gBattleAnimArgs
-_080B72F0: .4byte move_anim_8074EE0
-_080B72F4: .4byte sub_8074E70
-	thumb_func_end sub_80B725C
-
-	thumb_func_start sub_80B72F8
-sub_80B72F8: @ 80B72F8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	bl sub_8074FCC
-	ldr r4, _080B7350 @ =gBattleAnimTarget
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x32]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x36]
-	ldr r0, _080B7354 @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B735C
-	ldr r2, _080B7358 @ =gBattleAnimArgs
-	ldrh r0, [r5, 0x20]
-	ldrh r1, [r2, 0x2]
-	subs r0, r1
-	strh r0, [r5, 0x20]
-	ldrh r0, [r5, 0x22]
-	adds r1, r0
-	strh r1, [r5, 0x22]
-	ldrh r0, [r5, 0x32]
-	ldrh r1, [r2, 0x4]
-	subs r0, r1
-	strh r0, [r5, 0x32]
-	ldrh r0, [r2, 0x6]
-	ldrh r1, [r5, 0x36]
-	adds r0, r1
-	strh r0, [r5, 0x36]
-	b _080B7386
-	.align 2, 0
-_080B7350: .4byte gBattleAnimTarget
-_080B7354: .4byte gBattleAnimAttacker
-_080B7358: .4byte gBattleAnimArgs
-_080B735C:
-	ldr r1, _080B73A0 @ =gBattleAnimArgs
-	ldrh r0, [r1]
-	ldrh r2, [r5, 0x20]
-	adds r0, r2
-	strh r0, [r5, 0x20]
-	ldrh r0, [r1, 0x2]
-	ldrh r2, [r5, 0x22]
-	adds r0, r2
-	strh r0, [r5, 0x22]
-	ldrh r0, [r1, 0x4]
-	ldrh r2, [r5, 0x32]
-	adds r0, r2
-	strh r0, [r5, 0x32]
-	ldrh r0, [r1, 0x6]
-	ldrh r1, [r5, 0x36]
-	adds r0, r1
-	strh r0, [r5, 0x36]
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-_080B7386:
-	ldr r0, _080B73A0 @ =gBattleAnimArgs
-	ldrh r0, [r0, 0x8]
-	strh r0, [r5, 0x2E]
-	ldr r0, _080B73A4 @ =StartAnimLinearTranslation
-	str r0, [r5, 0x1C]
-	ldr r1, _080B73A8 @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData6
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B73A0: .4byte gBattleAnimArgs
-_080B73A4: .4byte StartAnimLinearTranslation
-_080B73A8: .4byte move_anim_8074EE0
-	thumb_func_end sub_80B72F8
-
-	thumb_func_start sub_80B73AC
-sub_80B73AC: @ 80B73AC
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _080B73C0 @ =gBattleAnimArgs
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	bne _080B73C8
-	ldr r4, _080B73C4 @ =gBattleAnimAttacker
-	b _080B73CA
-	.align 2, 0
-_080B73C0: .4byte gBattleAnimArgs
-_080B73C4: .4byte gBattleAnimAttacker
-_080B73C8:
-	ldr r4, _080B740C @ =gBattleAnimTarget
-_080B73CA:
-	ldrb r0, [r4]
-	movs r1, 0
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x1
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0x22]
-	ldr r4, _080B7410 @ =gBattleAnimArgs
-	movs r0, 0x2
-	ldrsh r1, [r4, r0]
-	adds r0, r5, 0
-	bl sub_8074FF8
-	ldrh r0, [r4, 0x4]
-	ldrh r1, [r5, 0x22]
-	adds r0, r1
-	strh r0, [r5, 0x22]
-	ldr r0, _080B7414 @ =sub_8074F6C
-	str r0, [r5, 0x1C]
-	ldr r1, _080B7418 @ =move_anim_8074EE0
-	adds r0, r5, 0
-	bl StoreSpriteCallbackInData6
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B740C: .4byte gBattleAnimTarget
-_080B7410: .4byte gBattleAnimArgs
-_080B7414: .4byte sub_8074F6C
-_080B7418: .4byte move_anim_8074EE0
-	thumb_func_end sub_80B73AC
-
-	thumb_func_start sub_80B741C
-sub_80B741C: @ 80B741C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080B7444 @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl GetBattlerSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _080B7436
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-_080B7436:
-	adds r0, r4, 0
-	bl sub_80B72F8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B7444: .4byte gBattleAnimAttacker
-	thumb_func_end sub_80B741C
-
-	thumb_func_start sub_80B7448
-sub_80B7448: @ 80B7448
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	ldr r4, _080B749C @ =gBattleAnimAttacker
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	movs r5, 0
-	strh r0, [r6, 0x20]
-	ldrb r0, [r4]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x22]
-	strh r5, [r6, 0x36]
-	movs r0, 0x1
-	strh r0, [r6, 0x38]
-	ldr r0, _080B74A0 @ =gBattleAnimArgs
-	ldrh r0, [r0]
-	strh r0, [r6, 0x3A]
-	ldr r4, _080B74A4 @ =gBattlerAttacker
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_8076B2C
-	lsls r7, r0, 16
-	lsrs r5, r7, 16
-	ldrb r0, [r4]
-	movs r1, 0x1
-	bl sub_8076B2C
-	lsls r1, r0, 16
-	lsrs r0, r1, 16
-	cmp r5, r0
-	bls _080B74A8
-	lsrs r0, r7, 17
-	b _080B74AA
-	.align 2, 0
-_080B749C: .4byte gBattleAnimAttacker
-_080B74A0: .4byte gBattleAnimArgs
-_080B74A4: .4byte gBattlerAttacker
-_080B74A8:
-	lsrs r0, r1, 17
-_080B74AA:
-	strh r0, [r6, 0x3C]
-	movs r1, 0x3A
-	ldrsh r0, [r6, r1]
-	movs r2, 0x3C
-	ldrsh r1, [r6, r2]
-	bl Cos
-	strh r0, [r6, 0x24]
-	movs r1, 0x3A
-	ldrsh r0, [r6, r1]
-	movs r2, 0x3C
-	ldrsh r1, [r6, r2]
-	bl Sin
-	strh r0, [r6, 0x26]
-	ldr r0, _080B74D4 @ =sub_80B74D8
-	str r0, [r6, 0x1C]
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B74D4: .4byte sub_80B74D8
-	thumb_func_end sub_80B7448
-
-	thumb_func_start sub_80B74D8
-sub_80B74D8: @ 80B74D8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r0, 0x2E
-	ldrsh r5, [r4, r0]
-	cmp r5, 0
-	beq _080B74EA
-	cmp r5, 0x1
-	beq _080B7556
-	b _080B75DA
-_080B74EA:
-	ldrh r0, [r4, 0x3A]
-	ldrh r1, [r4, 0x38]
-	subs r0, r1
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x3A]
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	movs r2, 0x3C
-	ldrsh r1, [r4, r2]
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	movs r2, 0x3C
-	ldrsh r1, [r4, r2]
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x36]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x5
-	ble _080B753C
-	strh r5, [r4, 0x36]
-	ldrh r1, [r4, 0x38]
-	movs r2, 0x38
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xF
-	bgt _080B753C
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x38]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xF
-	ble _080B753C
-	movs r0, 0x10
-	strh r0, [r4, 0x38]
-_080B753C:
-	ldrh r0, [r4, 0x34]
-	adds r0, 0x1
-	strh r0, [r4, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x3C
-	ble _080B75DA
-	movs r0, 0
-	strh r0, [r4, 0x34]
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	b _080B75DA
-_080B7556:
-	ldrh r0, [r4, 0x3A]
-	ldrh r1, [r4, 0x38]
-	subs r0, r1
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x3A]
-	ldrh r1, [r4, 0x3C]
-	movs r2, 0x3C
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x95
-	bgt _080B757E
-	adds r0, r1, 0
-	adds r0, 0x8
-	strh r0, [r4, 0x3C]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x95
-	ble _080B757E
-	movs r0, 0x96
-	strh r0, [r4, 0x3C]
-_080B757E:
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	movs r2, 0x3C
-	ldrsh r1, [r4, r2]
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	movs r2, 0x3C
-	ldrsh r1, [r4, r2]
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x36]
-	adds r0, 0x1
-	strh r0, [r4, 0x36]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x5
-	ble _080B75C6
-	movs r0, 0
-	strh r0, [r4, 0x36]
-	ldrh r1, [r4, 0x38]
-	movs r2, 0x38
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xF
-	bgt _080B75C6
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x38]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0xF
-	ble _080B75C6
-	movs r0, 0x10
-	strh r0, [r4, 0x38]
-_080B75C6:
-	ldrh r0, [r4, 0x34]
-	adds r0, 0x1
-	strh r0, [r4, 0x34]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x14
-	ble _080B75DA
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080B75DA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B74D8
-
-	thumb_func_start sub_80B75E0
-sub_80B75E0: @ 80B75E0
-	push {r4-r6,lr}
-	sub sp, 0xC
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _080B760C @ =gTasks
-	adds r4, r1, r0
-	ldr r0, _080B7610 @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl sub_80768B0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080B761C
-	ldr r0, _080B7614 @ =0x04000014
-	str r0, [sp]
-	ldr r0, _080B7618 @ =gBattle_BG1_X
-	b _080B7622
-	.align 2, 0
-_080B760C: .4byte gTasks
-_080B7610: .4byte gBattleAnimAttacker
-_080B7614: .4byte 0x04000014
-_080B7618: .4byte gBattle_BG1_X
-_080B761C:
-	ldr r0, _080B7698 @ =0x04000018
-	str r0, [sp]
-	ldr r0, _080B769C @ =gBattle_BG2_X
-_080B7622:
-	ldrh r0, [r0]
-	strh r0, [r4, 0xC]
-	ldr r0, _080B76A0 @ =0xa2600001
-	str r0, [sp, 0x4]
-	mov r1, sp
-	movs r5, 0
-	movs r0, 0x1
-	strb r0, [r1, 0x8]
-	mov r0, sp
-	strb r5, [r0, 0x9]
-	ldr r0, _080B76A4 @ =gBattleAnimAttacker
-	ldrb r0, [r0]
-	bl sub_807492C
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	subs r1, 0x20
-	strh r1, [r4, 0xE]
-	adds r0, 0x20
-	strh r0, [r4, 0x10]
-	cmp r1, 0
-	bge _080B7652
-	strh r5, [r4, 0xE]
-_080B7652:
-	ldrh r3, [r4, 0xE]
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r3, r0
-	bgt _080B7680
-	ldr r5, _080B76A8 @ =gScanlineEffectRegBuffers
-	movs r0, 0xF0
-	lsls r0, 3
-	adds r6, r5, r0
-_080B7664:
-	lsls r1, r3, 1
-	adds r2, r1, r5
-	ldrh r0, [r4, 0xC]
-	strh r0, [r2]
-	adds r1, r6
-	ldrh r0, [r4, 0xC]
-	strh r0, [r1]
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r3, r0
-	ble _080B7664
-_080B7680:
-	ldr r0, [sp]
-	ldr r1, [sp, 0x4]
-	ldr r2, [sp, 0x8]
-	bl ScanlineEffect_SetParams
-	ldr r0, _080B76AC @ =sub_80B76B0
-	str r0, [r4]
-	add sp, 0xC
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B7698: .4byte 0x04000018
-_080B769C: .4byte gBattle_BG2_X
-_080B76A0: .4byte 0xa2600001
-_080B76A4: .4byte gBattleAnimAttacker
-_080B76A8: .4byte gScanlineEffectRegBuffers
-_080B76AC: .4byte sub_80B76B0
-	thumb_func_end sub_80B75E0
-
-	thumb_func_start sub_80B76B0
-sub_80B76B0: @ 80B76B0
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	lsls r0, r3, 2
-	adds r0, r3
-	lsls r0, 3
-	ldr r1, _080B76D4 @ =gTasks
-	adds r2, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r2, r1]
-	cmp r0, 0x4
-	bhi _080B7766
-	lsls r0, 2
-	ldr r1, _080B76D8 @ =_080B76DC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080B76D4: .4byte gTasks
-_080B76D8: .4byte _080B76DC
-	.align 2, 0
-_080B76DC:
-	.4byte _080B76F0
-	.4byte _080B7712
-	.4byte _080B7722
-	.4byte _080B774E
-	.4byte _080B7760
-_080B76F0:
-	ldrh r0, [r2, 0x16]
-	adds r0, 0x1
-	strh r0, [r2, 0x16]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080B7746
-	movs r0, 0
-	strh r0, [r2, 0x16]
-	ldrh r0, [r2, 0x14]
-	adds r0, 0x1
-	strh r0, [r2, 0x14]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x3
-	bne _080B7746
-	b _080B7740
-_080B7712:
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x3C
-	ble _080B7746
-	b _080B7740
-_080B7722:
-	ldrh r0, [r2, 0x16]
-	adds r0, 0x1
-	strh r0, [r2, 0x16]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x1
-	ble _080B7746
-	movs r0, 0
-	strh r0, [r2, 0x16]
-	ldrh r0, [r2, 0x14]
-	subs r0, 0x1
-	strh r0, [r2, 0x14]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080B7746
-_080B7740:
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-_080B7746:
-	adds r0, r2, 0
-	bl sub_80B776C
-	b _080B7766
-_080B774E:
-	ldr r1, _080B775C @ =gScanlineEffect
-	movs r0, 0x3
-	strb r0, [r1, 0x15]
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	b _080B7766
-	.align 2, 0
-_080B775C: .4byte gScanlineEffect
-_080B7760:
-	adds r0, r3, 0
-	bl DestroyAnimVisualTask
-_080B7766:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B76B0
-
-	thumb_func_start sub_80B776C
-sub_80B776C: @ 80B776C
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r5, r0, 0
-	ldrh r3, [r5, 0x12]
-	ldrh r4, [r5, 0xE]
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	cmp r4, r0
-	bgt _080B77C2
-	ldr r7, _080B77D8 @ =gScanlineEffectRegBuffers
-	mov r12, r7
-	ldr r0, _080B77DC @ =gSineTable
-	mov r8, r0
-	ldr r6, _080B77E0 @ =gScanlineEffect
-_080B778A:
-	lsls r2, r4, 1
-	ldrb r1, [r6, 0x14]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 7
-	adds r2, r0
-	add r2, r12
-	lsls r0, r3, 1
-	add r0, r8
-	movs r7, 0
-	ldrsh r1, [r0, r7]
-	movs r7, 0x14
-	ldrsh r0, [r5, r7]
-	muls r0, r1
-	asrs r0, 7
-	ldrh r1, [r5, 0xC]
-	adds r0, r1
-	strh r0, [r2]
-	adds r3, 0x8
-	movs r0, 0xFF
-	ands r3, r0
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	movs r7, 0x10
-	ldrsh r0, [r5, r7]
-	cmp r4, r0
-	ble _080B778A
-_080B77C2:
-	ldrh r0, [r5, 0x12]
-	adds r0, 0x9
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r5, 0x12]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B77D8: .4byte gScanlineEffectRegBuffers
-_080B77DC: .4byte gSineTable
-_080B77E0: .4byte gScanlineEffect
-	thumb_func_end sub_80B776C
-
-	thumb_func_start sub_80B77E4
-sub_80B77E4: @ 80B77E4
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r4, r0, 0
-	ldr r5, _080B7884 @ =gBattleAnimArgs
-	movs r0, 0x4
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 1
-	adds r0, r1
-	movs r1, 0x5
-	bl __divsi3
-	adds r6, r0, 0
-	ldr r1, _080B7888 @ =gBattleAnimAttacker
-	mov r8, r1
-	ldrb r0, [r1]
-	movs r1, 0x2
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x20]
-	mov r2, r8
-	ldrb r0, [r2]
-	movs r1, 0x3
-	bl GetBattlerSpriteCoord
-	lsls r0, 24
-	lsrs r0, 24
-	ldrh r3, [r5, 0x8]
-	adds r0, r3
-	strh r0, [r4, 0x22]
-	movs r1, 0x2
-	ldrsh r0, [r5, r1]
-	movs r2, 0x4
-	ldrsh r1, [r5, r2]
-	bl Cos
-	strh r0, [r4, 0x30]
-	movs r3, 0x2
-	ldrsh r0, [r5, r3]
-	lsls r6, 16
-	asrs r6, 16
-	adds r1, r6, 0
-	bl Sin
-	strh r0, [r4, 0x32]
-	ldrh r1, [r4, 0x30]
-	ldrh r2, [r5]
-	adds r3, r2, 0
-	muls r3, r1
-	adds r1, r3, 0
-	ldrh r3, [r4, 0x20]
-	adds r1, r3
-	strh r1, [r4, 0x20]
-	adds r1, r2, 0
-	muls r1, r0
-	adds r0, r1, 0
-	ldrh r2, [r4, 0x22]
-	adds r0, r2
-	strh r0, [r4, 0x22]
-	ldrh r0, [r5, 0x6]
-	strh r0, [r4, 0x34]
-	ldr r0, _080B788C @ =sub_80B7894
-	str r0, [r4, 0x1C]
-	adds r4, 0x2E
-	ldr r2, _080B7890 @ =gUnknown_20399A4
-	movs r1, 0x6
-_080B786C:
-	ldrh r0, [r4]
-	strh r0, [r2]
-	adds r4, 0x2
-	adds r2, 0x2
-	subs r1, 0x1
-	cmp r1, 0
-	bge _080B786C
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080B7884: .4byte gBattleAnimArgs
-_080B7888: .4byte gBattleAnimAttacker
-_080B788C: .4byte sub_80B7894
-_080B7890: .4byte gUnknown_20399A4
-	thumb_func_end sub_80B77E4
-
-	thumb_func_start sub_80B7894
-sub_80B7894: @ 80B7894
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x30]
-	ldrh r1, [r4, 0x36]
-	adds r0, r1
-	strh r0, [r4, 0x36]
-	ldrh r0, [r4, 0x32]
-	ldrh r2, [r4, 0x38]
-	adds r0, r2
-	strh r0, [r4, 0x38]
-	movs r1, 0x36
-	ldrsh r0, [r4, r1]
-	movs r1, 0xA
-	bl __divsi3
-	strh r0, [r4, 0x24]
-	movs r2, 0x38
-	ldrsh r0, [r4, r2]
-	movs r1, 0xA
-	bl __divsi3
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	lsls r0, 16
-	asrs r0, 16
-	movs r2, 0x34
-	ldrsh r1, [r4, r2]
-	cmp r0, r1
-	ble _080B78D8
-	adds r0, r4, 0
-	bl DestroyAnimSprite
-_080B78D8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80B7894
-
-	.align 2, 0 @ Don't pad with nop.

asm/electric.s

@@ -110,7 +110,7 @@ sub_80ADC9C: @ 80ADC9C
 	cmp r0, 0
 	beq _080ADCB2
 	adds r0, r2, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _080ADCB2:
 	pop {r0}
 	bx r0
@@ -173,18 +173,18 @@ _080ADD1C:
 	strh r0, [r5, 0x32]
 	ldrh r0, [r2, 0x8]
 	strh r0, [r5, 0x34]
-	ldr r1, _080ADD44 @ =move_anim_8074EE0
+	ldr r1, _080ADD44 @ =DestroySpriteAndMatrix
 	adds r0, r5, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080ADD48 @ =sub_8074A80
+	ldr r0, _080ADD48 @ =TranslateSpriteInCircleOverDuration
 	str r0, [r5, 0x1C]
 	pop {r4,r5}
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080ADD40: .4byte gBattleAnimArgs
-_080ADD44: .4byte move_anim_8074EE0
-_080ADD48: .4byte sub_8074A80
+_080ADD44: .4byte DestroySpriteAndMatrix
+_080ADD48: .4byte TranslateSpriteInCircleOverDuration
 	thumb_func_end sub_80ADCB8
 
 	thumb_func_start sub_80ADD4C
@@ -315,7 +315,7 @@ _080ADE02:
 	cmp r0, 0
 	beq _080ADE66
 	adds r0, r4, 0
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, 0x1
@@ -370,7 +370,7 @@ sub_80ADEB0: @ 80ADEB0
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r5, _080ADF24 @ =gBattleAnimArgs
 	ldrh r0, [r5, 0x6]
 	strh r0, [r4, 0x2E]
@@ -392,7 +392,7 @@ sub_80ADEB0: @ 80ADEB0
 	lsrs r0, 24
 	strh r0, [r4, 0x36]
 	adds r0, r4, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldrh r0, [r5, 0x4]
 	strh r0, [r4, 0x38]
 	ldrh r0, [r5, 0xA]
@@ -432,7 +432,7 @@ _080ADF34: .4byte sub_80ADF38
 sub_80ADF38: @ 80ADF38
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	bne _080ADFA2
@@ -743,7 +743,7 @@ sub_80AE1A0: @ 80AE1A0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	ldrh r2, [r4, 0x4]
 	lsls r1, r2, 22
 	lsrs r1, 22
@@ -788,7 +788,7 @@ _080AE1FA:
 	ldr r0, _080AE214 @ =gBattleAnimArgs
 	ldrh r0, [r0, 0x4]
 	strh r0, [r4, 0x2E]
-	ldr r0, _080AE218 @ =sub_8074C44
+	ldr r0, _080AE218 @ =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	ldr r1, _080AE21C @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -798,7 +798,7 @@ _080AE1FA:
 	bx r0
 	.align 2, 0
 _080AE214: .4byte gBattleAnimArgs
-_080AE218: .4byte sub_8074C44
+_080AE218: .4byte WaitAnimForDuration
 _080AE21C: .4byte DestroyAnimSprite
 	thumb_func_end sub_80AE1A0
 
@@ -1142,7 +1142,7 @@ sub_80AE470: @ 80AE470
 	ands r0, r5
 	orrs r0, r1
 	strh r0, [r6, 0x4]
-	ldr r1, _080AE4EC @ =gUnknown_2037EE2
+	ldr r1, _080AE4EC @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
@@ -1160,7 +1160,7 @@ _080AE4DC: .4byte gUnknown_83E60B8
 _080AE4E0: .4byte gSprites
 _080AE4E4: .4byte 0x000003ff
 _080AE4E8: .4byte 0xfffffc00
-_080AE4EC: .4byte gUnknown_2037EE2
+_080AE4EC: .4byte gAnimVisualTaskCount
 _080AE4F0: .4byte sub_80AE4F4
 	thumb_func_end sub_80AE470
 
@@ -1344,11 +1344,11 @@ sub_80AE5BC: @ 80AE5BC
 	strh r0, [r4, 0x36]
 	strh r6, [r4, 0x38]
 	adds r0, r4, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r1, _080AE6B4 @ =sub_80AE704
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080AE6B8 @ =sub_8074F6C
+	ldr r0, _080AE6B8 @ =RunStoredCallbackWhenAnimEnds
 	str r0, [r4, 0x1C]
 	ldrh r0, [r5, 0x1A]
 	adds r0, 0x1
@@ -1390,7 +1390,7 @@ _080AE6A8: .4byte gUnknown_83E6120
 _080AE6AC: .4byte gSprites
 _080AE6B0: .4byte gUnknown_83E60D0
 _080AE6B4: .4byte sub_80AE704
-_080AE6B8: .4byte sub_8074F6C
+_080AE6B8: .4byte RunStoredCallbackWhenAnimEnds
 _080AE6BC:
 	movs r1, 0x16
 	ldrsh r0, [r5, r1]
@@ -1408,7 +1408,7 @@ _080AE6CA:
 sub_80AE6D0: @ 80AE6D0
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080AE6F8
@@ -1476,18 +1476,18 @@ _080AE73A:
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r5, 0x22]
-	ldr r1, _080AE76C @ =move_anim_8074EE0
+	ldr r1, _080AE76C @ =DestroySpriteAndMatrix
 	adds r0, r5, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080AE770 @ =sub_8074F50
+	ldr r0, _080AE770 @ =RunStoredCallbackWhenAffineAnimEnds
 	str r0, [r5, 0x1C]
 	pop {r4,r5}
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080AE768: .4byte gBattleAnimTarget
-_080AE76C: .4byte move_anim_8074EE0
-_080AE770: .4byte sub_8074F50
+_080AE76C: .4byte DestroySpriteAndMatrix
+_080AE770: .4byte RunStoredCallbackWhenAffineAnimEnds
 	thumb_func_end sub_80AE71C
 
 	thumb_func_start sub_80AE774
@@ -1527,7 +1527,7 @@ _080AE792:
 	ldr r1, _080AE7D4 @ =DestroyAnimSprite
 	adds r0, r5, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080AE7D8 @ =sub_8074F6C
+	ldr r0, _080AE7D8 @ =RunStoredCallbackWhenAnimEnds
 	str r0, [r5, 0x1C]
 	pop {r4,r5}
 	pop {r0}
@@ -1536,7 +1536,7 @@ _080AE792:
 _080AE7CC: .4byte gBattleAnimTarget
 _080AE7D0: .4byte gBattleAnimArgs
 _080AE7D4: .4byte DestroyAnimSprite
-_080AE7D8: .4byte sub_8074F6C
+_080AE7D8: .4byte RunStoredCallbackWhenAnimEnds
 	thumb_func_end sub_80AE774
 
 	thumb_func_start sub_80AE7DC
@@ -1559,7 +1559,7 @@ sub_80AE7DC: @ 80AE7DC
 	lsrs r0, 24
 	strh r0, [r5, 0x22]
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r5, 0x3A]
@@ -1632,7 +1632,7 @@ _080AE864:
 	cmp r0, r1
 	bls _080AE894
 	adds r0, r4, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _080AE894:
 	pop {r4}
 	pop {r0}
@@ -1672,7 +1672,7 @@ _080AE8D2:
 	b _080AEA04
 _080AE8D4:
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r6, 0
@@ -2203,7 +2203,7 @@ _080AECC4:
 	cmp r0, 0
 	beq _080AECD8
 	adds r0, r5, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _080AECD8:
 	pop {r4,r5}
 	pop {r0}
@@ -2279,12 +2279,12 @@ _080AED20:
 	movs r0, 0xC
 	strh r0, [r5, 0x1E]
 	subs r0, 0x4C
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r5, 0x20]
 	movs r0, 0x3F
-	bl sub_8073A44
+	bl BattleAnimAdjustPanning
 	lsls r0, 24
 	asrs r0, 24
 	strh r0, [r5, 0x22]

asm/field_effect.s

@@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310
 	ldrsh r6, [r4, r0]
 	cmp r6, 0
 	bne _08084350
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084376
@@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites
 sub_8084564: @ 8084564
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08084578
@@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274
 	adds r4, r0, 0
 	adds r5, r1, 0
 	adds r6, r2, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080852B4
@@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks
 sub_8085A54: @ 8085A54
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08085A78
@@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks
 sub_8085E0C: @ 8085E0C
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _08085E82

asm/field_message_box.s

@@ -75,7 +75,7 @@ _080693C4:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080693D4
-	bl sub_80F6E9C
+	bl LoadStdWindowFrameGfx
 	b _080693E2
 _080693D4:
 	bl sub_80F79A4

asm/field_weather.s

@@ -1889,8 +1889,8 @@ _0807AA68: .4byte 0x000006ca
 _0807AA6C: .4byte 0x000006cb
 	thumb_func_end FieldWeather_StartFadingOutCreditsMap
 
-	thumb_func_start sub_807AA70
-sub_807AA70: @ 807AA70
+	thumb_func_start field_weather_is_fade_finished
+field_weather_is_fade_finished: @ 807AA70
 	ldr r0, _0807AA84 @ =gUnknown_2037F34
 	ldr r1, _0807AA88 @ =0x000006c6
 	adds r0, r1
@@ -1904,7 +1904,7 @@ sub_807AA70: @ 807AA70
 	.align 2, 0
 _0807AA84: .4byte gUnknown_2037F34
 _0807AA88: .4byte 0x000006c6
-	thumb_func_end sub_807AA70
+	thumb_func_end field_weather_is_fade_finished
 
 	thumb_func_start sub_807AA8C
 sub_807AA8C: @ 807AA8C

asm/fighting.s

@@ -13,14 +13,14 @@ unc_080B08A0: @ 80B08A0
 	movs r0, 0
 	ldrsh r1, [r5, r0]
 	adds r0, r4, 0
-	bl sub_8074FF8
+	bl SetAnimSpriteInitialXOffset
 	ldrh r0, [r5, 0x2]
 	ldrh r1, [r4, 0x22]
 	adds r0, r1
 	strh r0, [r4, 0x22]
 	movs r0, 0xF
 	strh r0, [r4, 0x2E]
-	ldr r0, _080B08D4 @ =sub_8074C44
+	ldr r0, _080B08D4 @ =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	ldr r1, _080B08D8 @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -30,7 +30,7 @@ unc_080B08A0: @ 80B08A0
 	bx r0
 	.align 2, 0
 _080B08D0: .4byte gBattleAnimArgs
-_080B08D4: .4byte sub_8074C44
+_080B08D4: .4byte WaitAnimForDuration
 _080B08D8: .4byte DestroyAnimSprite
 	thumb_func_end unc_080B08A0
 
@@ -110,19 +110,19 @@ sub_80B0954: @ 80B0954
 	bne _080B0978
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	b _080B0980
 	.align 2, 0
 _080B0974: .4byte gBattleAnimArgs
 _080B0978:
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 _080B0980:
 	ldr r0, _080B0998 @ =gBattleAnimArgs
 	ldrh r0, [r0, 0x4]
 	strh r0, [r5, 0x2E]
-	ldr r0, _080B099C @ =sub_8074C44
+	ldr r0, _080B099C @ =WaitAnimForDuration
 	str r0, [r5, 0x1C]
 	ldr r1, _080B09A0 @ =DestroyAnimSprite
 	adds r0, r5, 0
@@ -132,7 +132,7 @@ _080B0980:
 	bx r0
 	.align 2, 0
 _080B0998: .4byte gBattleAnimArgs
-_080B099C: .4byte sub_8074C44
+_080B099C: .4byte WaitAnimForDuration
 _080B09A0: .4byte DestroyAnimSprite
 	thumb_func_end sub_80B0954
 
@@ -188,7 +188,7 @@ _080B09E8:
 	strh r0, [r5, 0x22]
 	mov r0, r8
 	movs r1, 0x1
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	lsls r0, 16
 	asrs r1, r0, 16
 	lsrs r0, 31
@@ -197,7 +197,7 @@ _080B09E8:
 	lsrs r6, r1, 16
 	mov r0, r8
 	movs r1, 0
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	lsls r0, 16
 	asrs r0, 16
 	cmp r0, 0
@@ -267,7 +267,7 @@ _080B0A9C:
 	mov r1, r9
 	ldrh r0, [r1, 0x2]
 	strh r0, [r5, 0x2E]
-	ldr r0, _080B0B1C @ =gUnknown_83E7C08
+	ldr r0, _080B0B1C @ =gBasicHitSplatSpriteTemplate
 	movs r2, 0x20
 	ldrsh r1, [r5, r2]
 	movs r3, 0x22
@@ -315,7 +315,7 @@ _080B0B00:
 _080B0B10: .4byte gBattleAnimTarget
 _080B0B14: .4byte gBattlerPositions
 _080B0B18: .4byte 0xfff00000
-_080B0B1C: .4byte gUnknown_83E7C08
+_080B0B1C: .4byte gBasicHitSplatSpriteTemplate
 _080B0B20: .4byte gSprites
 _080B0B24: .4byte SpriteCallbackDummy
 _080B0B28: .4byte sub_80B0B2C
@@ -371,7 +371,7 @@ sub_80B0B80: @ 80B0B80
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	movs r0, 0x1E
 	strh r0, [r4, 0x2E]
 	ldr r0, _080B0BA0 @ =gBattleAnimArgs
@@ -480,7 +480,7 @@ sub_80B0C28: @ 80B0C28
 _080B0C54:
 	adds r0, r6, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	ldr r0, _080B0CA4 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -505,7 +505,7 @@ _080B0C72:
 	strh r0, [r6, 0x34]
 	strh r0, [r6, 0x36]
 	adds r0, r6, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldrh r0, [r4, 0xA]
 	strh r0, [r6, 0x38]
 	ldrh r0, [r4, 0x8]
@@ -527,7 +527,7 @@ _080B0CB0: .4byte sub_80B0CB4
 sub_80B0CB4: @ 80B0CB4
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B0CE0
@@ -559,14 +559,14 @@ sub_80B0CEC: @ 80B0CEC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	ldr r5, _080B0D18 @ =gBattleAnimArgs
 	ldrb r1, [r5, 0x4]
 	adds r0, r4, 0
 	bl StartSpriteAnim
 	ldrh r0, [r5, 0x6]
 	strh r0, [r4, 0x2E]
-	ldr r0, _080B0D1C @ =sub_8074C44
+	ldr r0, _080B0D1C @ =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	ldr r1, _080B0D20 @ =sub_80B0D24
 	adds r0, r4, 0
@@ -576,7 +576,7 @@ sub_80B0CEC: @ 80B0CEC
 	bx r0
 	.align 2, 0
 _080B0D18: .4byte gBattleAnimArgs
-_080B0D1C: .4byte sub_8074C44
+_080B0D1C: .4byte WaitAnimForDuration
 _080B0D20: .4byte sub_80B0D24
 	thumb_func_end sub_80B0CEC
 
@@ -594,7 +594,7 @@ sub_80B0D24: @ 80B0D24
 	strb r0, [r2]
 	movs r0, 0x14
 	strh r0, [r4, 0x2E]
-	ldr r0, _080B0D50 @ =sub_8074C44
+	ldr r0, _080B0D50 @ =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	ldr r1, _080B0D54 @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -603,7 +603,7 @@ sub_80B0D24: @ 80B0D24
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B0D50: .4byte sub_8074C44
+_080B0D50: .4byte WaitAnimForDuration
 _080B0D54: .4byte DestroyAnimSprite
 	thumb_func_end sub_80B0D24
 
@@ -612,7 +612,7 @@ sub_80B0D58: @ 80B0D58
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	ldr r0, _080B0D74 @ =gBattleAnimArgs
 	ldrh r0, [r0, 0x4]
 	strh r0, [r4, 0x2E]
@@ -674,14 +674,14 @@ sub_80B0DD4: @ 80B0DD4
 	push {lr}
 	movs r1, 0xF
 	strh r1, [r0, 0x2E]
-	ldr r1, _080B0DE8 @ =sub_8074C44
+	ldr r1, _080B0DE8 @ =WaitAnimForDuration
 	str r1, [r0, 0x1C]
 	ldr r1, _080B0DEC @ =DestroyAnimSprite
 	bl StoreSpriteCallbackInData6
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B0DE8: .4byte sub_8074C44
+_080B0DE8: .4byte WaitAnimForDuration
 _080B0DEC: .4byte DestroyAnimSprite
 	thumb_func_end sub_80B0DD4
 
@@ -695,7 +695,7 @@ sub_80B0DF0: @ 80B0DF0
 	bne _080B0E1C
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	ldr r1, _080B0E18 @ =gBattleAnimArgs
 	ldrh r0, [r1, 0x4]
 	strh r0, [r4, 0x30]
@@ -1052,7 +1052,7 @@ sub_80B107C: @ 80B107C
 	strh r0, [r5, 0x22]
 	ldr r0, _080B10D0 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	movs r1, 0x3
 	ands r1, r0
 	lsls r1, 2
@@ -1072,7 +1072,7 @@ _080B10D4: .4byte gBattleAnimTarget
 _080B10D8:
 	ldr r0, _080B1110 @ =gBattleAnimTarget
 	ldrb r0, [r0]
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	movs r1, 0x3
 	ands r1, r0
 	lsls r1, 2
@@ -1140,8 +1140,8 @@ sub_80B111C: @ 80B111C
 	lsrs r0, 24
 	strh r0, [r4, 0x36]
 	adds r0, r4, 0
-	bl obj_translate_based_on_private_1_2_3_4
-	ldr r1, _080B1180 @ =move_anim_8074EE0
+	bl InitAnimLinearTranslation
+	ldr r1, _080B1180 @ =DestroySpriteAndMatrix
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
 	ldr r0, _080B1184 @ =sub_807563C
@@ -1151,7 +1151,7 @@ _080B1178:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B1180: .4byte move_anim_8074EE0
+_080B1180: .4byte DestroySpriteAndMatrix
 _080B1184: .4byte sub_807563C
 	thumb_func_end sub_80B111C
 
@@ -1171,7 +1171,7 @@ sub_80B1188: @ 80B1188
 	adds r1, r5, 0
 	adds r1, 0x38
 	lsls r2, 8
-	bl sub_80765C0
+	bl StorePointerInVars
 	ldrh r0, [r4, 0x2]
 	strh r0, [r5, 0x3A]
 	ldrh r2, [r5, 0x4]
@@ -1214,7 +1214,7 @@ sub_80B11E4: @ 80B11E4
 	ldrsh r0, [r7, r2]
 	movs r2, 0x38
 	ldrsh r1, [r7, r2]
-	bl sub_80765C8
+	bl LoadPointerFromVars
 	adds r4, r0, 0
 	movs r1, 0x3A
 	ldrsh r0, [r7, r1]
@@ -1224,7 +1224,7 @@ sub_80B11E4: @ 80B11E4
 	adds r1, r7, 0
 	adds r1, 0x38
 	adds r2, r4, 0
-	bl sub_80765C0
+	bl StorePointerInVars
 	asrs r4, 8
 	strh r4, [r7, 0x22]
 	lsls r4, 16
@@ -1369,7 +1369,7 @@ _080B132C:
 	ldr r0, _080B1368 @ =gBattleAnimTarget
 _080B1332:
 	ldrb r0, [r0]
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	movs r1, 0x3
 	ands r1, r0
 	lsls r1, 2
@@ -1431,7 +1431,7 @@ _080B138C:
 	lsrs r0, 24
 	strh r0, [r5, 0x36]
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r1, _080B13CC @ =DestroyAnimSprite
 	adds r0, r5, 0
 	bl StoreSpriteCallbackInData6
@@ -1546,14 +1546,14 @@ sub_80B1484: @ 80B1484
 	bne _080B14A0
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	b _080B14A8
 	.align 2, 0
 _080B149C: .4byte gBattleAnimArgs
 _080B14A0:
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 _080B14A8:
 	bl IsContest
 	lsls r0, 24
@@ -1574,7 +1574,7 @@ _080B14BC:
 	movs r1, 0x1
 	bl StartSpriteAnim
 _080B14D2:
-	ldr r0, _080B14E8 @ =sub_8074F6C
+	ldr r0, _080B14E8 @ =RunStoredCallbackWhenAnimEnds
 	str r0, [r4, 0x1C]
 	ldr r1, _080B14EC @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -1584,7 +1584,7 @@ _080B14D2:
 	bx r0
 	.align 2, 0
 _080B14E4: .4byte gBattleAnimAttacker
-_080B14E8: .4byte sub_8074F6C
+_080B14E8: .4byte RunStoredCallbackWhenAnimEnds
 _080B14EC: .4byte DestroyAnimSprite
 	thumb_func_end sub_80B1484
 

asm/fire.s

@@ -24,7 +24,7 @@ sub_80AC90C: @ 80AC90C
 	ldr r1, _080AC944 @ =DestroyAnimSprite
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r1, _080AC948 @ =sub_8074AE0
+	ldr r1, _080AC948 @ =TranslateSpriteInGrowingCircleOverDuration
 	str r1, [r4, 0x1C]
 	adds r0, r4, 0
 	bl _call_via_r1
@@ -34,7 +34,7 @@ sub_80AC90C: @ 80AC90C
 	.align 2, 0
 _080AC940: .4byte gBattleAnimArgs
 _080AC944: .4byte DestroyAnimSprite
-_080AC948: .4byte sub_8074AE0
+_080AC948: .4byte TranslateSpriteInGrowingCircleOverDuration
 	thumb_func_end sub_80AC90C
 
 	thumb_func_start sub_80AC94C
@@ -45,7 +45,7 @@ sub_80AC94C: @ 80AC94C
 	movs r0, 0
 	ldrsh r1, [r5, r0]
 	adds r0, r4, 0
-	bl sub_8074FF8
+	bl SetAnimSpriteInitialXOffset
 	ldrh r0, [r5, 0x2]
 	ldrh r1, [r4, 0x22]
 	adds r0, r1
@@ -56,7 +56,7 @@ sub_80AC94C: @ 80AC94C
 	strh r0, [r4, 0x30]
 	ldrh r0, [r5, 0x6]
 	strh r0, [r4, 0x32]
-	ldr r0, _080AC988 @ =sub_8074D00
+	ldr r0, _080AC988 @ =TranslateSpriteLinearFixedPoint
 	str r0, [r4, 0x1C]
 	ldr r1, _080AC98C @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -66,7 +66,7 @@ sub_80AC94C: @ 80AC94C
 	bx r0
 	.align 2, 0
 _080AC984: .4byte gBattleAnimArgs
-_080AC988: .4byte sub_8074D00
+_080AC988: .4byte TranslateSpriteLinearFixedPoint
 _080AC98C: .4byte DestroyAnimSprite
 	thumb_func_end sub_80AC94C
 
@@ -74,7 +74,7 @@ _080AC98C: .4byte DestroyAnimSprite
 sub_80AC990: @ 80AC990
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_8074FCC
+	bl SetSpriteCoordsToAnimAttackerCoords
 	ldr r0, _080AC9C4 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -212,7 +212,7 @@ _080ACA92:
 	cmp r1, r0
 	bne _080ACAA4
 	adds r0, r2, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _080ACAA4:
 	pop {r0}
 	bx r0
@@ -222,7 +222,7 @@ _080ACAA4:
 sub_80ACAA8: @ 80ACAA8
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_8074FCC
+	bl SetSpriteCoordsToAnimAttackerCoords
 	ldr r0, _080ACACC @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -348,7 +348,7 @@ _080ACB9C:
 	b _080ACBAA
 _080ACBA4:
 	adds r0, r4, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _080ACBAA:
 	pop {r4}
 	pop {r0}
@@ -449,7 +449,7 @@ sub_80ACC60: @ 80ACC60
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080ACC80 @ =gBattleAnimArgs
 	ldrh r0, [r0, 0x4]
 	movs r1, 0
@@ -497,7 +497,7 @@ sub_80ACC88: @ 80ACC88
 	lsrs r0, 24
 	strh r0, [r5, 0x36]
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r0, _080ACCDC @ =sub_80ACCE0
 	str r0, [r5, 0x1C]
 _080ACCD2:
@@ -513,7 +513,7 @@ _080ACCDC: .4byte sub_80ACCE0
 sub_80ACCE0: @ 80ACCE0
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080ACD28
@@ -634,7 +634,7 @@ sub_80ACDA8: @ 80ACDA8
 	ldr r1, _080ACDE0 @ =DestroyAnimSprite
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080ACDE4 @ =sub_8074CD0
+	ldr r0, _080ACDE4 @ =TranslateSpriteLinear
 	str r0, [r4, 0x1C]
 	pop {r4}
 	pop {r0}
@@ -642,7 +642,7 @@ sub_80ACDA8: @ 80ACDA8
 	.align 2, 0
 _080ACDDC: .4byte gBattleAnimArgs
 _080ACDE0: .4byte DestroyAnimSprite
-_080ACDE4: .4byte sub_8074CD0
+_080ACDE4: .4byte TranslateSpriteLinear
 	thumb_func_end sub_80ACDA8
 
 	thumb_func_start sub_80ACDE8
@@ -650,7 +650,7 @@ sub_80ACDE8: @ 80ACDE8
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r1, _080ACE1C @ =gBattleAnimArgs
 	ldrh r0, [r1, 0x4]
 	strh r0, [r4, 0x30]
@@ -662,7 +662,7 @@ sub_80ACDE8: @ 80ACDE8
 	movs r1, 0x4
 	orrs r0, r1
 	strb r0, [r2]
-	ldr r0, _080ACE20 @ =sub_8074C44
+	ldr r0, _080ACE20 @ =WaitAnimForDuration
 	str r0, [r4, 0x1C]
 	ldr r1, _080ACE24 @ =sub_80ACE28
 	adds r0, r4, 0
@@ -672,7 +672,7 @@ sub_80ACDE8: @ 80ACDE8
 	bx r0
 	.align 2, 0
 _080ACE1C: .4byte gBattleAnimArgs
-_080ACE20: .4byte sub_8074C44
+_080ACE20: .4byte WaitAnimForDuration
 _080ACE24: .4byte sub_80ACE28
 	thumb_func_end sub_80ACDE8
 
@@ -753,7 +753,7 @@ sub_80ACEA4: @ 80ACEA4
 	ldr r0, _080ACF04 @ =gTasks
 	adds r4, r0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r5, 0
@@ -923,7 +923,7 @@ _080AD00C:
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8076440
+	bl SetBattlerSpriteYOffsetFromYScale
 	ldr r2, _080AD030 @ =gSprites
 	movs r0, 0x26
 	ldrsh r1, [r4, r0]
@@ -1635,7 +1635,7 @@ _080AD556:
 _080AD55C:
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r4, _080AD584 @ =gBattleAnimArgs
 	ldrb r1, [r4, 0x4]
 	adds r0, r5, 0
@@ -1659,7 +1659,7 @@ _080AD58E:
 	strh r0, [r5, 0x36]
 	ldr r0, _080AD5B0 @ =gBattleAnimTarget
 	ldrb r0, [r0]
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	movs r1, 0x3
 	ands r1, r0
 	lsls r1, 2
@@ -1787,7 +1787,7 @@ _080AD68C: .4byte sub_80AD690
 sub_80AD690: @ 80AD690
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	bne _080AD6E8
@@ -1889,7 +1889,7 @@ _080AD70C:
 	bls _080AD780
 	ldr r0, _080AD77C @ =gBattleAnimTarget
 	ldrb r0, [r0]
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	movs r1, 0x3
 	ands r1, r0
 	lsls r1, 2
@@ -1906,7 +1906,7 @@ _080AD77C: .4byte gBattleAnimTarget
 _080AD780:
 	ldr r0, _080AD7A4 @ =gBattleAnimTarget
 	ldrb r0, [r0]
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, 0x1
@@ -2005,12 +2005,12 @@ _080AD826:
 	adds r0, 0x1
 	strh r0, [r4, 0x22]
 	movs r0, 0x1
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x24]
 	movs r0, 0x3
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x26]

asm/hall_of_fame.s

@@ -509,7 +509,7 @@ _080F21B2:
 	movs r0, 0
 	movs r1, 0
 	bl DrawDialogueFrame
-	ldr r2, _080F2214 @ =gUnknown_8419F54
+	ldr r2, _080F2214 @ =gText_SavingDontTurnOffThePower2
 	movs r0, 0
 	str r0, [sp]
 	movs r0, 0x2
@@ -543,7 +543,7 @@ _080F21B2:
 _080F2208: .4byte 0x000001ff
 _080F220C: .4byte gDecompressionBuffer
 _080F2210: .4byte gUnknown_203AB38
-_080F2214: .4byte gUnknown_8419F54
+_080F2214: .4byte gText_SavingDontTurnOffThePower2
 _080F2218: .4byte gTasks
 _080F221C: .4byte sub_80F2220
 	thumb_func_end Task_Hof_InitTeamSaveData

asm/ice.s

@@ -365,7 +365,7 @@ sub_80AF2F0: @ 80AF2F0
 	ldr r1, _080AF328 @ =DestroyAnimSprite
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r1, _080AF32C @ =sub_8074AE0
+	ldr r1, _080AF32C @ =TranslateSpriteInGrowingCircleOverDuration
 	str r1, [r4, 0x1C]
 	adds r0, r4, 0
 	bl _call_via_r1
@@ -375,7 +375,7 @@ sub_80AF2F0: @ 80AF2F0
 	.align 2, 0
 _080AF324: .4byte gBattleAnimArgs
 _080AF328: .4byte DestroyAnimSprite
-_080AF32C: .4byte sub_8074AE0
+_080AF32C: .4byte TranslateSpriteInGrowingCircleOverDuration
 	thumb_func_end sub_80AF2F0
 
 	thumb_func_start sub_80AF330
@@ -383,7 +383,7 @@ sub_80AF330: @ 80AF330
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080AF364 @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	movs r1, 0x2
@@ -452,7 +452,7 @@ sub_80AF3B8: @ 80AF3B8
 	bne _080AF3D4
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	b _080AF40A
 	.align 2, 0
 _080AF3D0: .4byte gBattleAnimArgs
@@ -464,7 +464,7 @@ _080AF3D4:
 	adds r3, r4, 0
 	adds r3, 0x22
 	movs r1, 0x1
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldr r0, _080AF420 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -487,7 +487,7 @@ _080AF40A:
 	ldr r1, _080AF424 @ =sub_80AF42C
 	adds r0, r4, 0
 	bl StoreSpriteCallbackInData6
-	ldr r0, _080AF428 @ =sub_8074F50
+	ldr r0, _080AF428 @ =RunStoredCallbackWhenAffineAnimEnds
 	str r0, [r4, 0x1C]
 	pop {r4,r5}
 	pop {r0}
@@ -496,7 +496,7 @@ _080AF40A:
 _080AF41C: .4byte gBattleAnimTarget
 _080AF420: .4byte gBattleAnimAttacker
 _080AF424: .4byte sub_80AF42C
-_080AF428: .4byte sub_8074F50
+_080AF428: .4byte RunStoredCallbackWhenAffineAnimEnds
 	thumb_func_end sub_80AF3B8
 
 	thumb_func_start sub_80AF42C
@@ -526,7 +526,7 @@ sub_80AF42C: @ 80AF42C
 	cmp r0, 0x14
 	bne _080AF462
 	adds r0, r3, 0
-	bl move_anim_8074EE0
+	bl DestroySpriteAndMatrix
 _080AF462:
 	pop {r0}
 	bx r0
@@ -538,7 +538,7 @@ sub_80AF468: @ 80AF468
 	sub sp, 0x10
 	adds r5, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r6, _080AF4B0 @ =gBattleAnimArgs
 	ldrh r0, [r6, 0x8]
 	strh r0, [r5, 0x2E]
@@ -577,7 +577,7 @@ _080AF4B8:
 	adds r3, r5, 0
 	adds r3, 0x36
 	movs r1, 0x1
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 _080AF4CA:
 	ldr r0, _080AF4E8 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
@@ -616,7 +616,7 @@ _080AF504:
 	cmp r4, 0
 	bge _080AF504
 	adds r0, r5, 0
-	bl sub_8075804
+	bl InitAnimFastLinearTranslationWithSpeed
 	ldrh r0, [r5, 0x30]
 	movs r1, 0x1
 	eors r0, r1
@@ -628,7 +628,7 @@ _080AF526:
 	movs r0, 0x1
 	strh r0, [r5, 0x2E]
 	adds r0, r5, 0
-	bl sub_807578C
+	bl AnimFastTranslateLinear
 	movs r0, 0x20
 	ldrsh r1, [r5, r0]
 	movs r2, 0x24
@@ -814,7 +814,7 @@ sub_80AF690: @ 80AF690
 	movs r0, 0x1
 	strh r0, [r4, 0x2E]
 	adds r0, r4, 0
-	bl sub_807578C
+	bl AnimFastTranslateLinear
 	movs r1, 0x20
 	ldrsh r0, [r4, r1]
 	movs r2, 0x24
@@ -853,7 +853,7 @@ sub_80AF6D8: @ 80AF6D8
 	sub sp, 0x10
 	adds r5, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r1, _080AF71C @ =gBattleAnimArgs
 	ldrh r0, [r1, 0x8]
 	strh r0, [r5, 0x2E]
@@ -890,7 +890,7 @@ _080AF724:
 	adds r3, r5, 0
 	adds r3, 0x36
 	movs r1, 0x1
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 _080AF736:
 	ldr r0, _080AF758 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
@@ -921,7 +921,7 @@ _080AF76A:
 	adds r0, r1
 	strh r0, [r5, 0x36]
 	adds r0, r5, 0
-	bl sub_8075804
+	bl InitAnimFastLinearTranslationWithSpeed
 	adds r7, r5, 0
 	adds r7, 0x2E
 	adds r2, r7, 0
@@ -946,7 +946,7 @@ _080AF79E:
 	movs r0, 0x1
 	strh r0, [r5, 0x2E]
 	adds r0, r5, 0
-	bl sub_807578C
+	bl AnimFastTranslateLinear
 	movs r2, 0x20
 	ldrsh r1, [r5, r2]
 	movs r2, 0x24
@@ -1011,7 +1011,7 @@ _080AF818: .4byte sub_80AF81C
 sub_80AF81C: @ 80AF81C
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_807578C
+	bl AnimFastTranslateLinear
 	movs r1, 0x2E
 	ldrsh r0, [r4, r1]
 	cmp r0, 0
@@ -1082,7 +1082,7 @@ sub_80AF88C: @ 80AF88C
 	bne _080AF8B0
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	b _080AF8E6
 	.align 2, 0
 _080AF8AC: .4byte gBattleAnimArgs
@@ -1094,7 +1094,7 @@ _080AF8B0:
 	adds r3, r4, 0
 	adds r3, 0x22
 	movs r1, 0
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldr r0, _080AF8F4 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -1152,7 +1152,7 @@ sub_80AF914: @ 80AF914
 	bne _080AF938
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	b _080AF976
 	.align 2, 0
 _080AF934: .4byte gBattleAnimArgs
@@ -1164,7 +1164,7 @@ _080AF938:
 	adds r3, r5, 0
 	adds r3, 0x22
 	movs r1, 0
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldrb r0, [r4]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -1200,7 +1200,7 @@ _080AF984:
 	bne _080AF996
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	b _080AF9D2
 _080AF996:
 	ldr r4, _080AF9BC @ =gBattleAnimTarget
@@ -1210,7 +1210,7 @@ _080AF996:
 	adds r3, r5, 0
 	adds r3, 0x22
 	movs r1, 0
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldrb r0, [r4]
 	bl GetBattlerSide
 	lsls r0, 24
@@ -1279,7 +1279,7 @@ _080AFA10:
 	adds r0, r1
 	strh r0, [r5, 0x36]
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	movs r0, 0x40
 	strh r0, [r5, 0x38]
 	ldr r1, _080AFA48 @ =sub_80AFA4C
@@ -1299,7 +1299,7 @@ _080AFA48: .4byte sub_80AFA4C
 sub_80AFA4C: @ 80AFA4C
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	bne _080AFAD6
@@ -1328,7 +1328,7 @@ sub_80AFA4C: @ 80AFA4C
 	ldrh r0, [r4, 0x3C]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	movs r1, 0x3
 	ands r1, r0
 	lsls r1, 2
@@ -1343,7 +1343,7 @@ _080AFAA8:
 	ldrh r0, [r4, 0x3C]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	lsls r0, 24
 	lsrs r0, 24
 	adds r0, 0x1
@@ -1426,7 +1426,7 @@ _080AFB26:
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 	ldr r0, _080AFBB4 @ =gUnknown_83C2CE0
 	mov r1, sp
 	ldrb r1, [r1, 0x8]
@@ -1673,14 +1673,14 @@ sub_80AFD4C: @ 80AFD4C
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x22]
-	ldr r0, _080AFD7C @ =sub_8075DF4
+	ldr r0, _080AFD7C @ =TranslateAnimSpriteToTargetMonLocation
 	str r0, [r4, 0x1C]
 	pop {r4,r5}
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080AFD78: .4byte gBattleAnimAttacker
-_080AFD7C: .4byte sub_8075DF4
+_080AFD7C: .4byte TranslateAnimSpriteToTargetMonLocation
 	thumb_func_end sub_80AFD4C
 
 	thumb_func_start sub_80AFD80
@@ -1737,7 +1737,7 @@ _080AFDC2:
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 	ldr r0, _080AFE54 @ =gUnknown_83C2CE0
 	mov r1, sp
 	ldrb r1, [r1, 0x8]
@@ -2015,7 +2015,7 @@ _080B0008:
 	cmp r0, 0
 	bne _080B0064
 	movs r0, 0x1
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	ldr r2, _080B00CC @ =gSprites
 	lsls r0, 24
 	lsrs r0, 24
@@ -2105,7 +2105,7 @@ _080B00F8:
 	adds r0, r6
 	strh r0, [r5, 0x36]
 	ldrb r0, [r4]
-	bl sub_8076884
+	bl GetBattlerSpriteBGPriority
 	lsls r0, 24
 	lsrs r0, 16
 	ldrh r1, [r5, 0x3C]
@@ -2123,7 +2123,7 @@ _080B00F8:
 	strb r0, [r1]
 _080B012C:
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r0, _080B0144 @ =sub_80B0148
 	str r0, [r5, 0x1C]
 	pop {r3}
@@ -2159,7 +2159,7 @@ _080B0168:
 	b _080B0380
 _080B016A:
 	adds r0, r4, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	ldr r1, _080B0194 @ =gSineTable
 	movs r2, 0x38
 	ldrsh r0, [r4, r2]
@@ -2251,13 +2251,13 @@ _080B0202:
 	ands r0, r1
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	b _080B0380
 	.align 2, 0
 _080B022C: .4byte gSineTable
 _080B0230:
 	adds r0, r4, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	ldr r1, _080B028C @ =gSineTable
 	movs r2, 0x38
 	ldrsh r0, [r4, r2]
@@ -2397,7 +2397,7 @@ _080B032A:
 _080B0340: .4byte 0x0000fff0
 _080B0344:
 	adds r0, r4, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B0380
@@ -2420,7 +2420,7 @@ _080B0344:
 _080B0372:
 	adds r0, r4, 0
 	bl DestroySprite
-	ldr r1, _080B0388 @ =gUnknown_2037EE2
+	ldr r1, _080B0388 @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	subs r0, 0x1
 	strb r0, [r1]
@@ -2429,7 +2429,7 @@ _080B0380:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B0388: .4byte gUnknown_2037EE2
+_080B0388: .4byte gAnimVisualTaskCount
 	thumb_func_end sub_80B0148
 
 	thumb_func_start sub_80B038C
@@ -2610,7 +2610,7 @@ _080B04D0: .4byte gUnknown_83E652C
 _080B04D4:
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	lsls r0, 16
 	asrs r0, 16
 	movs r1, 0x6
@@ -2622,7 +2622,7 @@ _080B04D4:
 	lsrs r7, r1, 16
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	lsls r0, 16
 	asrs r0, 16
 	movs r1, 0x6
@@ -2634,7 +2634,7 @@ _080B04D4:
 _080B050A:
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	lsls r0, 16
 	asrs r0, 16
 	movs r1, 0x6
@@ -2646,7 +2646,7 @@ _080B050A:
 	lsrs r7, r1, 16
 	adds r0, r5, 0
 	movs r1, 0
-	bl sub_8076B2C
+	bl GetBattlerSpriteCoordAttr
 	lsls r0, 16
 	asrs r0, 16
 	movs r1, 0x6
@@ -2904,7 +2904,7 @@ _080B071A:
 	bl StartSpriteAffineAnim
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r6, _080B0780 @ =gBattleAnimArgs
 	ldrh r0, [r6, 0x8]
 	strh r0, [r5, 0x2E]
@@ -2938,7 +2938,7 @@ _080B0742:
 	ldrh r0, [r6, 0xA]
 	strh r0, [r5, 0x38]
 	adds r0, r5, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	ldr r0, _080B078C @ =sub_80B0790
 	str r0, [r5, 0x1C]
 	pop {r4-r6}
@@ -2956,14 +2956,14 @@ _080B078C: .4byte sub_80B0790
 sub_80B0790: @ 80B0790
 	push {r4,lr}
 	adds r4, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B07B2
 	adds r0, r4, 0
 	movs r1, 0x1
 	bl StartSpriteAnim
-	ldr r0, _080B07B8 @ =sub_8074F6C
+	ldr r0, _080B07B8 @ =RunStoredCallbackWhenAnimEnds
 	str r0, [r4, 0x1C]
 	ldr r1, _080B07BC @ =DestroyAnimSprite
 	adds r0, r4, 0
@@ -2973,7 +2973,7 @@ _080B07B2:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B07B8: .4byte sub_8074F6C
+_080B07B8: .4byte RunStoredCallbackWhenAnimEnds
 _080B07BC: .4byte DestroyAnimSprite
 	thumb_func_end sub_80B0790
 
@@ -2994,7 +2994,7 @@ sub_80B07C0: @ 80B07C0
 	strh r0, [r4, 0x4]
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	bl Random
 	movs r5, 0xFF
 	ands r5, r0

asm/item_menu.s

@@ -138,18 +138,18 @@ _08107EB0: .4byte gUnknown_203AD10
 _08107EB4: .4byte gUnknown_203ACFC
 	thumb_func_end sub_8107DB4
 
-	thumb_func_start ReturnToBagFromKeyItem
-ReturnToBagFromKeyItem: @ 8107EB8
+	thumb_func_start CB2_BagMenuFromStartMenu
+CB2_BagMenuFromStartMenu: @ 8107EB8
 	push {lr}
-	ldr r2, _08107EC8 @ =sub_80568A8
+	ldr r2, _08107EC8 @ =CB2_ReturnToStartMenu
 	movs r0, 0
 	movs r1, 0x3
 	bl sub_8107DB4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08107EC8: .4byte sub_80568A8
-	thumb_func_end ReturnToBagFromKeyItem
+_08107EC8: .4byte CB2_ReturnToStartMenu
+	thumb_func_end CB2_BagMenuFromStartMenu
 
 	thumb_func_start sub_8107ECC
 sub_8107ECC: @ 8107ECC

asm/link_rfu_3.s

@@ -3252,7 +3252,7 @@ _08117384:
 	lsls r0, 24
 	lsrs r0, 24
 	ldr r1, _081173BC @ =CB2_ReturnToField
-	bl sub_808B700
+	bl InitLinkPartnerTrainerCard
 _081173A2:
 	bl RunTasks
 	bl RunTextPrinters
@@ -5840,7 +5840,7 @@ _08118AD4:
 	bl sub_811BEDC
 	bl _081198DC
 _08118ADE:
-	ldr r0, _08118B00 @ =sub_806F1F0
+	ldr r0, _08118B00 @ =Task_StartMenuHandleInput
 	bl FuncIsActiveTask
 	lsls r0, 24
 	cmp r0, 0
@@ -5854,7 +5854,7 @@ _08118AEE:
 	movs r0, 0x4
 	bl _081198DA
 	.align 2, 0
-_08118B00: .4byte sub_806F1F0
+_08118B00: .4byte Task_StartMenuHandleInput
 _08118B04:
 	bl sub_811A0E0
 	movs r3, 0x2
@@ -6975,7 +6975,7 @@ _081194DC:
 	movs r0, 0x2F
 	bl sub_8118664
 _081194E4:
-	bl sub_80F7998
+	bl DestroyHelpMessageWindow_
 	b _081198DC
 	.align 2, 0
 _081194EC: .4byte gUnknown_8458B44
@@ -7171,7 +7171,7 @@ _08119670:
 _0811967A:
 	movs r0, 0x1
 	bl sub_811B258
-	bl sub_80F7998
+	bl DestroyHelpMessageWindow_
 	movs r0, 0x4
 	b _081198DA
 	.align 2, 0
@@ -8482,7 +8482,7 @@ _0811A0B0: .4byte gTasks+0x8
 sub_811A0B4: @ 811A0B4
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80F6E9C
+	bl LoadStdWindowFrameGfx
 	movs r0, 0
 	movs r1, 0x1
 	bl DrawDialogueFrame
@@ -8528,7 +8528,7 @@ sub_811A0F8: @ 811A0F8
 	beq _0811A130
 	b _0811A142
 _0811A10A:
-	bl sub_80F6E9C
+	bl LoadStdWindowFrameGfx
 	movs r0, 0
 	movs r1, 0x1
 	bl DrawDialogueFrame

asm/mail.s

@@ -204,7 +204,7 @@ _080BED8C:
 	movs r0, 0
 	movs r1, 0
 	bl SetGpuReg
-	ldr r0, _080BEDB0 @ =gUnknown_203AAC4
+	ldr r0, _080BEDB0 @ =gPlayerPcMenuManager
 	ldrb r0, [r0, 0x9]
 	cmp r0, 0
 	bne _080BEDB4
@@ -212,7 +212,7 @@ _080BED8C:
 	bl HelpSystem_SetSomeVariable2
 	b _080BF0F4
 	.align 2, 0
-_080BEDB0: .4byte gUnknown_203AAC4
+_080BEDB0: .4byte gPlayerPcMenuManager
 _080BEDB4:
 	movs r0, 0x1E
 	bl HelpSystem_SetSomeVariable2

asm/naming_screen.s

@@ -491,7 +491,7 @@ sub_809DD60: @ 809DD60
 	bl CreateTask
 	ldr r0, _0809DD84 @ =sub_809FB70
 	bl SetMainCallback2
-	bl sub_812B234
+	bl HelpSystem_BackupSomeVariable
 	movs r0, 0x3
 	bl HelpSystem_SetSomeVariable2
 	pop {r0}
@@ -868,7 +868,7 @@ _0809E06C:
 	ldr r0, [r4]
 	bl Free
 	str r5, [r4]
-	bl sub_812B248
+	bl HelpSystem_RestoreSomeVariable
 _0809E096:
 	movs r0, 0
 	pop {r4,r5}
@@ -4490,7 +4490,7 @@ sub_809FC90: @ 809FC90
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FCB4 @ =sub_80568A8
+	ldr r0, _0809FCB4 @ =CB2_ReturnToStartMenu
 	str r0, [sp, 0x4]
 	movs r0, 0
 	movs r3, 0
@@ -4500,7 +4500,7 @@ sub_809FC90: @ 809FC90
 	bx r0
 	.align 2, 0
 _0809FCB0: .4byte gSaveBlock2Ptr
-_0809FCB4: .4byte sub_80568A8
+_0809FCB4: .4byte CB2_ReturnToStartMenu
 	thumb_func_end sub_809FC90
 
 	thumb_func_start sub_809FCB8
@@ -4512,7 +4512,7 @@ sub_809FCB8: @ 809FCB8
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FCDC @ =sub_80568A8
+	ldr r0, _0809FCDC @ =CB2_ReturnToStartMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x1
 	movs r3, 0
@@ -4522,7 +4522,7 @@ sub_809FCB8: @ 809FCB8
 	bx r0
 	.align 2, 0
 _0809FCD8: .4byte gSaveBlock2Ptr
-_0809FCDC: .4byte sub_80568A8
+_0809FCDC: .4byte CB2_ReturnToStartMenu
 	thumb_func_end sub_809FCB8
 
 	thumb_func_start sub_809FCE0
@@ -4534,7 +4534,7 @@ sub_809FCE0: @ 809FCE0
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FD04 @ =sub_80568A8
+	ldr r0, _0809FD04 @ =CB2_ReturnToStartMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x2
 	movs r3, 0
@@ -4544,7 +4544,7 @@ sub_809FCE0: @ 809FCE0
 	bx r0
 	.align 2, 0
 _0809FD00: .4byte gSaveBlock2Ptr
-_0809FD04: .4byte sub_80568A8
+_0809FD04: .4byte CB2_ReturnToStartMenu
 	thumb_func_end sub_809FCE0
 
 	thumb_func_start sub_809FD08
@@ -4556,7 +4556,7 @@ sub_809FD08: @ 809FD08
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FD2C @ =sub_80568A8
+	ldr r0, _0809FD2C @ =CB2_ReturnToStartMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x3
 	movs r3, 0
@@ -4566,7 +4566,7 @@ sub_809FD08: @ 809FD08
 	bx r0
 	.align 2, 0
 _0809FD28: .4byte gSaveBlock2Ptr
-_0809FD2C: .4byte sub_80568A8
+_0809FD2C: .4byte CB2_ReturnToStartMenu
 	thumb_func_end sub_809FD08
 
 	thumb_func_start sub_809FD30
@@ -4578,7 +4578,7 @@ sub_809FD30: @ 809FD30
 	ldrb r2, [r1, 0x8]
 	movs r0, 0
 	str r0, [sp]
-	ldr r0, _0809FD54 @ =sub_80568A8
+	ldr r0, _0809FD54 @ =CB2_ReturnToStartMenu
 	str r0, [sp, 0x4]
 	movs r0, 0x4
 	movs r3, 0
@@ -4588,7 +4588,7 @@ sub_809FD30: @ 809FD30
 	bx r0
 	.align 2, 0
 _0809FD50: .4byte gSaveBlock2Ptr
-_0809FD54: .4byte sub_80568A8
+_0809FD54: .4byte CB2_ReturnToStartMenu
 	thumb_func_end sub_809FD30
 
 	.align 2, 0 @ Don't pad with nop.

asm/option_menu.s

@@ -26,14 +26,14 @@ sub_8088374: @ 8088374
 	bx r0
 	thumb_func_end sub_8088374
 
-	thumb_func_start sub_8088388
-sub_8088388: @ 8088388
+	thumb_func_start CB2_OptionsMenuFromStartMenu
+CB2_OptionsMenuFromStartMenu: @ 8088388
 	push {r4-r6,lr}
 	ldr r1, _08088418 @ =gMain
 	ldr r0, [r1, 0x8]
 	cmp r0, 0
 	bne _08088396
-	ldr r0, _0808841C @ =sub_80568A8
+	ldr r0, _0808841C @ =CB2_ReturnToStartMenu
 	str r0, [r1, 0x8]
 _08088396:
 	ldr r4, _08088420 @ =gUnknown_2039620
@@ -101,12 +101,12 @@ _080883FA:
 	bx r0
 	.align 2, 0
 _08088418: .4byte gMain
-_0808841C: .4byte sub_80568A8
+_0808841C: .4byte CB2_ReturnToStartMenu
 _08088420: .4byte gUnknown_2039620
 _08088424: .4byte gSaveBlock2Ptr
 _08088428: .4byte gUnknown_83CC304
 _0808842C: .4byte sub_8088454
-	thumb_func_end sub_8088388
+	thumb_func_end CB2_OptionsMenuFromStartMenu
 
 	thumb_func_start sub_8088430
 sub_8088430: @ 8088430

asm/overworld.s

@@ -3754,20 +3754,20 @@ _080568A0: .4byte gFieldCallback
 _080568A4: .4byte sub_807DDD0
 	thumb_func_end c2_8056854
 
-	thumb_func_start sub_80568A8
-sub_80568A8: @ 80568A8
+	thumb_func_start CB2_ReturnToStartMenu
+CB2_ReturnToStartMenu: @ 80568A8
 	push {lr}
 	bl sub_80569BC
 	ldr r1, _080568BC @ =gFieldCallback2
-	ldr r0, _080568C0 @ =sub_807E3BC
+	ldr r0, _080568C0 @ =FieldCB2_ReturnToStartMenuInit
 	str r0, [r1]
 	bl CB2_ReturnToField
 	pop {r0}
 	bx r0
 	.align 2, 0
 _080568BC: .4byte gFieldCallback2
-_080568C0: .4byte sub_807E3BC
-	thumb_func_end sub_80568A8
+_080568C0: .4byte FieldCB2_ReturnToStartMenuInit
+	thumb_func_end CB2_ReturnToStartMenu
 
 	thumb_func_start sub_80568C4
 sub_80568C4: @ 80568C4

asm/party_menu.s

@@ -3616,10 +3616,10 @@ sub_8120658: @ 8120658
 	beq _08120678
 	cmp r0, 0x5
 	beq _0812067E
-	ldr r1, _08120674 @ =gUnknown_8416285
+	ldr r1, _08120674 @ =gStartMenuText_Bag
 	b _08120686
 	.align 2, 0
-_08120674: .4byte gUnknown_8416285
+_08120674: .4byte gStartMenuText_Bag
 _08120678:
 	movs r0, 0xB6
 	lsls r0, 1
@@ -11978,7 +11978,7 @@ task_launch_hm_phase_2: @ 81248C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -12231,7 +12231,7 @@ sub_8124AB0: @ 8124AB0
 	str r0, [sp]
 	ldr r0, _08124AD4 @ =sub_811FB28
 	str r0, [sp, 0x4]
-	ldr r0, _08124AD8 @ =sub_80568A8
+	ldr r0, _08124AD8 @ =CB2_ReturnToStartMenu
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -12243,7 +12243,7 @@ sub_8124AB0: @ 8124AB0
 	bx r0
 	.align 2, 0
 _08124AD4: .4byte sub_811FB28
-_08124AD8: .4byte sub_80568A8
+_08124AD8: .4byte CB2_ReturnToStartMenu
 	thumb_func_end sub_8124AB0
 
 	thumb_func_start hm2_waterfall
@@ -16634,7 +16634,7 @@ CB2_PartyMenuFromStartMenu: @ 8126EB0
 	str r0, [sp]
 	ldr r0, _08126ED4 @ =sub_811FB28
 	str r0, [sp, 0x4]
-	ldr r0, _08126ED8 @ =sub_80568A8
+	ldr r0, _08126ED8 @ =CB2_ReturnToStartMenu
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -16646,7 +16646,7 @@ CB2_PartyMenuFromStartMenu: @ 8126EB0
 	bx r0
 	.align 2, 0
 _08126ED4: .4byte sub_811FB28
-_08126ED8: .4byte sub_80568A8
+_08126ED8: .4byte CB2_ReturnToStartMenu
 	thumb_func_end CB2_PartyMenuFromStartMenu
 
 	thumb_func_start sub_8126EDC
@@ -17272,15 +17272,15 @@ _081273D0:
 	bx r1
 	thumb_func_end sub_81273AC
 
-	thumb_func_start sub_81273D8
-sub_81273D8: @ 81273D8
+	thumb_func_start PartyMenuInit_FromPlayerPc
+PartyMenuInit_FromPlayerPc: @ 81273D8
 	push {lr}
 	sub sp, 0xC
 	movs r0, 0x6
 	str r0, [sp]
 	ldr r0, _081273FC @ =sub_811FB28
 	str r0, [sp, 0x4]
-	ldr r0, _08127400 @ =sub_80EC500
+	ldr r0, _08127400 @ =CB2_PlayerPC_ReturnFromPartyMenu
 	str r0, [sp, 0x8]
 	movs r0, 0
 	movs r1, 0
@@ -17292,8 +17292,8 @@ sub_81273D8: @ 81273D8
 	bx r0
 	.align 2, 0
 _081273FC: .4byte sub_811FB28
-_08127400: .4byte sub_80EC500
-	thumb_func_end sub_81273D8
+_08127400: .4byte CB2_PlayerPC_ReturnFromPartyMenu
+	thumb_func_end PartyMenuInit_FromPlayerPc
 
 	thumb_func_start sub_8127404
 sub_8127404: @ 8127404
@@ -17311,7 +17311,7 @@ sub_8127404: @ 8127404
 	movs r0, 0
 	strb r0, [r1]
 	ldr r2, _0812745C @ =gSaveBlock1Ptr
-	ldr r0, _08127460 @ =gUnknown_203AAC4
+	ldr r0, _08127460 @ =gPlayerPcMenuManager
 	ldrh r1, [r0]
 	adds r1, 0x6
 	ldrh r0, [r0, 0x2]
@@ -17337,7 +17337,7 @@ _08127450: .4byte gUnknown_203B0A0
 _08127454: .4byte gPlayerParty
 _08127458: .4byte gUnknown_203B0C0
 _0812745C: .4byte gSaveBlock1Ptr
-_08127460: .4byte gUnknown_203AAC4
+_08127460: .4byte gPlayerPcMenuManager
 _08127464: .4byte 0x00002cd0
 _08127468: .4byte gUnknown_8416D17
 _0812746C:
@@ -19373,7 +19373,7 @@ task_hm_without_phase_2: @ 81283FC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	beq _0812841A

asm/poison.s

@@ -20,7 +20,7 @@ sub_80B1620: @ 80B1620
 _080B1636:
 	adds r0, r5, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldrh r0, [r4, 0x4]
 	strh r0, [r5, 0x2E]
 	ldr r4, _080B1678 @ =gBattleAnimTarget
@@ -39,7 +39,7 @@ _080B1636:
 	ldr r0, _080B167C @ =0x0000ffe2
 	strh r0, [r5, 0x38]
 	adds r0, r5, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	ldr r0, _080B1680 @ =sub_80B1684
 	str r0, [r5, 0x1C]
 	pop {r4,r5}
@@ -56,7 +56,7 @@ _080B1680: .4byte sub_80B1684
 sub_80B1684: @ 80B1684
 	push {r4,lr}
 	adds r4, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B1698
@@ -84,7 +84,7 @@ sub_80B16A0: @ 80B16A0
 _080B16B8:
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080B1718 @ =gBattleAnimTarget
 	ldrb r0, [r0]
 	mov r6, sp
@@ -92,7 +92,7 @@ _080B16B8:
 	movs r1, 0x1
 	mov r2, sp
 	adds r3, r6, 0
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldr r0, _080B171C @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -117,7 +117,7 @@ _080B16E6:
 	ldr r0, _080B1720 @ =0x0000ffe2
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	ldr r0, _080B1724 @ =sub_80B1728
 	str r0, [r4, 0x1C]
 	add sp, 0x4
@@ -136,7 +136,7 @@ _080B1724: .4byte sub_80B1728
 sub_80B1728: @ 80B1728
 	push {r4,lr}
 	adds r4, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B173C
@@ -193,7 +193,7 @@ _080B1794: .4byte sub_80B1798
 sub_80B1798: @ 80B1798
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_8074D00
+	bl TranslateSpriteLinearFixedPoint
 	ldrh r0, [r4, 0x30]
 	ldrh r1, [r4, 0x38]
 	subs r0, r1
@@ -225,7 +225,7 @@ sub_80B17C4: @ 80B17C4
 	adds r3, r4, 0
 	adds r3, 0x22
 	movs r1, 0x1
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldr r0, _080B1828 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -280,7 +280,7 @@ sub_80B1838: @ 80B1838
 	bne _080B1854
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	b _080B188A
 	.align 2, 0
 _080B1850: .4byte gBattleAnimArgs
@@ -292,7 +292,7 @@ _080B1854:
 	adds r3, r4, 0
 	adds r3, 0x22
 	movs r1, 0x1
-	bl sub_8076D9C
+	bl SetAverageBattlerPositions
 	ldr r0, _080B1898 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -323,4 +323,40 @@ _080B1898: .4byte gBattleAnimAttacker
 _080B189C: .4byte sub_80B18A0
 	thumb_func_end sub_80B1838
 
+	thumb_func_start sub_80B18A0
+sub_80B18A0: @ 80B18A0
+	push {r4,lr}
+	adds r4, r0, 0
+	ldrh r0, [r4, 0x2E]
+	adds r0, 0xB
+	movs r1, 0xFF
+	ands r0, r1
+	strh r0, [r4, 0x2E]
+	movs r1, 0x2E
+	ldrsh r0, [r4, r1]
+	movs r1, 0x4
+	bl Sin
+	strh r0, [r4, 0x24]
+	ldrh r0, [r4, 0x30]
+	adds r0, 0x30
+	strh r0, [r4, 0x30]
+	lsls r0, 16
+	asrs r0, 24
+	negs r0, r0
+	strh r0, [r4, 0x26]
+	adds r0, r4, 0
+	adds r0, 0x3F
+	ldrb r1, [r0]
+	movs r0, 0x20
+	ands r0, r1
+	cmp r0, 0
+	beq _080B18DC
+	adds r0, r4, 0
+	bl DestroyAnimSprite
+_080B18DC:
+	pop {r4}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_80B18A0
+
 	.align 2, 0 @ Don't pad with nop.

asm/pokeball.s

@@ -290,7 +290,7 @@ _0804AB6C:
 	ldr r0, _0804ABC8 @ =0x0000ffd8
 	strh r0, [r4, 0x38]
 	adds r0, r4, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	mov r0, sp
 	ldrh r0, [r0]
 	strh r0, [r4, 0x6]
@@ -328,7 +328,7 @@ SpriteCB_TestBallThrow: @ 804ABD4
 	push {r7}
 	sub sp, 0x4
 	adds r7, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _0804AC74
@@ -1692,7 +1692,7 @@ SpriteCB_PlayerMonSendOut_1: @ 804B684
 	ldrh r0, [r4, 0x3A]
 	strh r0, [r4, 0x6]
 	adds r0, r4, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	ldr r0, _0804B6D0 @ =SpriteCB_PlayerMonSendOut_2
 	str r0, [r4, 0x1C]
 	pop {r4}
@@ -1754,7 +1754,7 @@ SpriteCB_PlayerMonSendOut_2: @ 804B6D4
 _0804B736:
 	ldrh r4, [r5, 0x2E]
 	adds r0, r5, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	movs r1, 0x3A
 	ldrsh r0, [r5, r1]
 	movs r1, 0x3
@@ -1825,7 +1825,7 @@ _0804B78E:
 	b _0804B834
 _0804B7C8:
 	adds r0, r5, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _0804B834
@@ -2580,13 +2580,13 @@ _0804BD80:
 _0804BD84: .4byte SpriteCallbackDummy
 	thumb_func_end sub_804BD6C
 
-	thumb_func_start DestroySpriteAndFreeResources_
-DestroySpriteAndFreeResources_: @ 804BD88
+	thumb_func_start DestroySpriteAndFreeResources2
+DestroySpriteAndFreeResources2: @ 804BD88
 	push {lr}
 	bl DestroySpriteAndFreeResources
 	pop {r0}
 	bx r0
-	thumb_func_end DestroySpriteAndFreeResources_
+	thumb_func_end DestroySpriteAndFreeResources2
 
 	thumb_func_start sub_804BD94
 sub_804BD94: @ 804BD94

asm/pokedex_screen.s

@@ -289,8 +289,8 @@ _081026D0:
 _08102758: .4byte gUnknown_84404C8
 	thumb_func_end sub_810250C
 
-	thumb_func_start sub_810275C
-sub_810275C: @ 810275C
+	thumb_func_start CB2_OpenPokedexFromStartMenu
+CB2_OpenPokedexFromStartMenu: @ 810275C
 	push {lr}
 	bl sub_810250C
 	movs r1, 0xC0
@@ -314,7 +314,7 @@ sub_810275C: @ 810275C
 	bx r0
 	.align 2, 0
 _08102794: .4byte sub_81024D4
-	thumb_func_end sub_810275C
+	thumb_func_end CB2_OpenPokedexFromStartMenu
 
 	thumb_func_start sub_8102798
 sub_8102798: @ 8102798
@@ -428,13 +428,13 @@ sub_8102858: @ 8102858
 	lsls r1, 7
 	movs r0, 0
 	bl SetGpuRegBits
-	ldr r0, _08102878 @ =sub_80568A8
+	ldr r0, _08102878 @ =CB2_ReturnToStartMenu
 	bl SetMainCallback2
 _08102874:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08102878: .4byte sub_80568A8
+_08102878: .4byte CB2_ReturnToStartMenu
 	thumb_func_end sub_8102858
 
 	thumb_func_start sub_810287C

asm/pokemon_jump_2.s

@@ -6157,7 +6157,7 @@ sub_814A8B8: @ 814A8B8
 	movs r6, 0
 	cmp r6, r10
 	bge _0814A922
-	ldr r0, _0814A938 @ =gUnknown_82349CC
+	ldr r0, _0814A938 @ =gMonFrontPicCoords
 	mov r9, r0
 	ldr r1, _0814A93C @ =gUnknown_203F3D8
 	mov r8, r1
@@ -6200,7 +6200,7 @@ _0814A922:
 	bx r0
 	.align 2, 0
 _0814A934: .4byte gUnknown_846D9D4
-_0814A938: .4byte gUnknown_82349CC
+_0814A938: .4byte gMonFrontPicCoords
 _0814A93C: .4byte gUnknown_203F3D8
 	thumb_func_end sub_814A8B8
 

asm/pokemon_storage_system.s

@@ -1417,7 +1417,7 @@ _0808C3E0:
 	adds r1, r5, 0
 	adds r1, 0x26
 	bl sub_808C72C
-	bl sub_80F6E9C
+	bl LoadStdWindowFrameGfx
 	movs r0, 0
 	movs r1, 0
 	bl DrawDialogueFrame
@@ -1455,7 +1455,7 @@ _0808C3E0:
 	.align 2, 0
 _0808C444: .4byte gUnknown_83CDA20
 _0808C448:
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	cmp r0, 0
 	bne _0808C454

asm/pokemon_summary_screen.s

@@ -10728,7 +10728,7 @@ sub_8139D90: @ 8139D90
 	lsls r0, 2
 	ldr r1, _08139DB8 @ =gSprites
 	adds r0, r1
-	bl DestroySpriteAndFreeResources_
+	bl DestroySpriteAndFreeResources2
 	pop {r0}
 	bx r0
 	.align 2, 0

asm/save_failed_screen.s

@@ -158,16 +158,16 @@ _080F5240:
 	adds r1, r0, 0
 	cmp r1, 0x1
 	bne _080F5260
-	ldr r0, _080F5258 @ =gUnknown_3005420
+	ldr r0, _080F5258 @ =gSaveSucceeded
 	strh r1, [r0]
 	ldr r0, _080F525C @ =gUnknown_8418E09
 	bl sub_80F5404
 	b _080F526C
 	.align 2, 0
-_080F5258: .4byte gUnknown_3005420
+_080F5258: .4byte gSaveSucceeded
 _080F525C: .4byte gUnknown_8418E09
 _080F5260:
-	ldr r0, _080F5274 @ =gUnknown_3005420
+	ldr r0, _080F5274 @ =gSaveSucceeded
 	movs r1, 0xFF
 	strh r1, [r0]
 	ldr r0, _080F5278 @ =gUnknown_8418CD9
@@ -178,7 +178,7 @@ _080F526C:
 	strb r0, [r1]
 	b _080F52D6
 	.align 2, 0
-_080F5274: .4byte gUnknown_3005420
+_080F5274: .4byte gSaveSucceeded
 _080F5278: .4byte gUnknown_8418CD9
 _080F527C: .4byte gUnknown_203AB50
 _080F5280:

asm/save_menu_util.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_80F7FCC
-sub_80F7FCC: @ 80F7FCC
+	thumb_func_start SaveStatToString
+SaveStatToString: @ 80F7FCC
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r3, r0, 24
@@ -144,6 +144,6 @@ _080F80D8:
 	bx r0
 	.align 2, 0
 _080F80E0: .4byte 0x00000827
-	thumb_func_end sub_80F7FCC
+	thumb_func_end SaveStatToString
 
 	.align 2, 0 @ Don't pad with nop.

asm/script_menu.s

@@ -1127,7 +1127,7 @@ _0809D1FA:
 	adds r1, r4, 0
 	adds r2, r7, 0
 	movs r3, 0x12
-	bl sub_812E6DC
+	bl Menu_PrintFormatIntlPlayerName
 	movs r0, 0x10
 	str r0, [sp]
 	mov r0, r9

asm/shop.s

@@ -386,7 +386,7 @@ sub_809AD8C: @ 809AD8C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_807AA70
+	bl field_weather_is_fade_finished
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/trade.s

@@ -8258,7 +8258,7 @@ _0805139C:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r3
-	ldr r2, _08051410 @ =gUnknown_82349CC
+	ldr r2, _08051410 @ =gMonFrontPicCoords
 	adds r0, r4, 0
 	adds r0, 0xF0
 	ldrh r0, [r0]
@@ -8282,7 +8282,7 @@ _0805139C:
 	.align 2, 0
 _08051408: .4byte gSprites
 _0805140C: .4byte 0x0000ff4c
-_08051410: .4byte gUnknown_82349CC
+_08051410: .4byte gMonFrontPicCoords
 _08051414:
 	ldr r5, [r7]
 	adds r6, r5, 0
@@ -9797,7 +9797,7 @@ _08052070:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r4
-	ldr r3, _08052120 @ =gUnknown_82349CC
+	ldr r3, _08052120 @ =gMonFrontPicCoords
 	adds r2, 0xF2
 	ldrh r0, [r2]
 	lsls r0, 2
@@ -9864,7 +9864,7 @@ _08052070:
 	b _080522AC
 	.align 2, 0
 _0805211C: .4byte gSprites
-_08052120: .4byte gUnknown_82349CC
+_08052120: .4byte gMonFrontPicCoords
 _08052124: .4byte 0x000fffff
 _08052128:
 	movs r1, 0xAA
@@ -10434,7 +10434,7 @@ _0805278C:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r3
-	ldr r2, _08052800 @ =gUnknown_82349CC
+	ldr r2, _08052800 @ =gMonFrontPicCoords
 	adds r0, r4, 0
 	adds r0, 0xF0
 	ldrh r0, [r0]
@@ -10458,7 +10458,7 @@ _0805278C:
 	.align 2, 0
 _080527F8: .4byte gSprites
 _080527FC: .4byte 0x0000ff4c
-_08052800: .4byte gUnknown_82349CC
+_08052800: .4byte gMonFrontPicCoords
 _08052804:
 	ldr r5, [r7]
 	adds r6, r5, 0
@@ -12022,7 +12022,7 @@ _080534CC:
 	adds r1, r0
 	lsls r1, 2
 	adds r1, r4
-	ldr r3, _0805357C @ =gUnknown_82349CC
+	ldr r3, _0805357C @ =gMonFrontPicCoords
 	adds r2, 0xF2
 	ldrh r0, [r2]
 	lsls r0, 2
@@ -12089,7 +12089,7 @@ _080534CC:
 	b _08053708
 	.align 2, 0
 _08053578: .4byte gSprites
-_0805357C: .4byte gUnknown_82349CC
+_0805357C: .4byte gMonFrontPicCoords
 _08053580: .4byte 0x000fffff
 _08053584:
 	movs r1, 0xAA
@@ -13401,7 +13401,7 @@ _080540DC:
 	movs r0, 0x32
 	strb r0, [r1]
 	ldr r4, _080540FC @ =gStringVar4
-	ldr r1, _08054100 @ =gUnknown_8419F54
+	ldr r1, _08054100 @ =gText_SavingDontTurnOffThePower2
 _080540EA:
 	adds r0, r4, 0
 	bl StringExpandPlaceholders
@@ -13412,7 +13412,7 @@ _080540EA:
 	b _08054396
 	.align 2, 0
 _080540FC: .4byte gStringVar4
-_08054100: .4byte gUnknown_8419F54
+_08054100: .4byte gText_SavingDontTurnOffThePower2
 _08054104:
 	bl InUnionRoom
 	cmp r0, 0

asm/trainer_card.s

@@ -785,7 +785,7 @@ _0808967C:
 	.align 2, 0
 _0808968C: .4byte gMain
 _08089690:
-	bl sub_80F6E9C
+	bl LoadStdWindowFrameGfx
 	ldr r1, _080896A0 @ =gMain
 	movs r0, 0x87
 	lsls r0, 3
@@ -4723,8 +4723,8 @@ sub_808B66C: @ 808B66C
 _0808B694: .4byte sub_808B21C
 	thumb_func_end sub_808B66C
 
-	thumb_func_start sub_808B698
-sub_808B698: @ 808B698
+	thumb_func_start InitTrainerCard
+InitTrainerCard: @ 808B698
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	ldr r5, _0808B6C0 @ =gUnknown_20397A4
@@ -4770,10 +4770,10 @@ _0808B6F0: .4byte gUnknown_20397A4
 _0808B6F4: .4byte 0x00007bcf
 _0808B6F8: .4byte 0x0000045c
 _0808B6FC: .4byte sub_80895B8
-	thumb_func_end sub_808B698
+	thumb_func_end InitTrainerCard
 
-	thumb_func_start sub_808B700
-sub_808B700: @ 808B700
+	thumb_func_start InitLinkPartnerTrainerCard
+InitLinkPartnerTrainerCard: @ 808B700
 	push {r4-r6,lr}
 	adds r4, r0, 0
 	adds r6, r1, 0
@@ -4822,7 +4822,7 @@ _0808B764: .4byte gTrainerCards
 _0808B768: .4byte gLinkPlayers
 _0808B76C: .4byte 0x00007bcf
 _0808B770: .4byte sub_80895B8
-	thumb_func_end sub_808B700
+	thumb_func_end InitLinkPartnerTrainerCard
 
 	thumb_func_start sub_808B774
 sub_808B774: @ 808B774
@@ -5057,7 +5057,7 @@ _0808B948: .4byte 0x00000457
 	thumb_func_start sub_808B94C
 sub_808B94C: @ 808B94C
 	push {lr}
-	bl sub_808B698
+	bl InitTrainerCard
 	ldr r0, _0808B95C @ =sub_80895B8
 	bl SetMainCallback2
 	pop {r0}
@@ -5076,7 +5076,7 @@ sub_808B960: @ 808B960
 	bl memcpy
 	movs r0, 0
 	adds r1, r4, 0
-	bl sub_808B700
+	bl InitLinkPartnerTrainerCard
 	ldr r0, _0808B98C @ =sub_80895B8
 	bl SetMainCallback2
 	pop {r4}
@@ -5098,7 +5098,7 @@ sub_808B990: @ 808B990
 	bl memcpy
 	movs r0, 0
 	adds r1, r4, 0
-	bl sub_808B700
+	bl InitLinkPartnerTrainerCard
 	ldr r0, _0808B9BC @ =sub_80895B8
 	bl SetMainCallback2
 	pop {r4}

asm/water.s

@@ -197,7 +197,7 @@ _080AAD10:
 	lsrs r0, 24
 	strh r0, [r6, 0x36]
 	adds r0, r6, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r0, _080AADAC @ =SpriteCallbackDummy
 	bl CreateInvisibleSpriteWithCallback
 	adds r4, r0, 0
@@ -273,7 +273,7 @@ sub_80AADB8: @ 80AADB8
 	movs r0, 0x1
 	strh r0, [r5, 0x2E]
 	adds r0, r5, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	mov r1, r8
 	lsrs r6, r1, 8
 	movs r0, 0x2E
@@ -329,14 +329,14 @@ sub_80AAE40: @ 80AAE40
 	negs r1, r1
 	ands r1, r2
 	strb r1, [r3]
-	ldr r1, _080AAE60 @ =sub_8074F6C
+	ldr r1, _080AAE60 @ =RunStoredCallbackWhenAnimEnds
 	str r1, [r0, 0x1C]
 	ldr r1, _080AAE64 @ =sub_80AAE68
 	bl StoreSpriteCallbackInData6
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080AAE60: .4byte sub_8074F6C
+_080AAE60: .4byte RunStoredCallbackWhenAnimEnds
 _080AAE64: .4byte sub_80AAE68
 	thumb_func_end sub_80AAE40
 
@@ -345,15 +345,15 @@ sub_80AAE68: @ 80AAE68
 	push {lr}
 	movs r1, 0xA
 	strh r1, [r0, 0x2E]
-	ldr r1, _080AAE7C @ =sub_8074C44
+	ldr r1, _080AAE7C @ =WaitAnimForDuration
 	str r1, [r0, 0x1C]
-	ldr r1, _080AAE80 @ =move_anim_8074EE0
+	ldr r1, _080AAE80 @ =DestroySpriteAndMatrix
 	bl StoreSpriteCallbackInData6
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080AAE7C: .4byte sub_8074C44
-_080AAE80: .4byte move_anim_8074EE0
+_080AAE7C: .4byte WaitAnimForDuration
+_080AAE80: .4byte DestroySpriteAndMatrix
 	thumb_func_end sub_80AAE68
 
 	thumb_func_start sub_80AAE84
@@ -361,7 +361,7 @@ sub_80AAE84: @ 80AAE84
 	push {r4-r7,lr}
 	adds r5, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080AAEAC @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -406,7 +406,7 @@ _080AAEBA:
 	adds r0, r7
 	strh r0, [r5, 0x36]
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	ldr r0, _080AAF18 @ =sub_80AAF1C
 	str r0, [r5, 0x1C]
 	adds r2, r5, 0
@@ -447,7 +447,7 @@ sub_80AAF1C: @ 80AAF1C
 	strb r0, [r2]
 _080AAF3E:
 	adds r0, r4, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080AAF50
@@ -569,7 +569,7 @@ sub_80AB024: @ 80AB024
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	movs r0, 0x1E
 	strh r0, [r5, 0x2E]
 	ldrh r0, [r5, 0x20]
@@ -590,7 +590,7 @@ sub_80AB024: @ 80AB024
 	lsrs r0, 24
 	strh r0, [r5, 0x36]
 	adds r0, r5, 0
-	bl obj_translate_based_on_private_1_2_3_4
+	bl InitAnimLinearTranslation
 	movs r0, 0x2E
 	ldrsh r1, [r5, r0]
 	movs r0, 0xD2
@@ -634,7 +634,7 @@ _080AB0A8: .4byte sub_80AB0AC
 sub_80AB0AC: @ 80AB0AC
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80755E0
+	bl AnimTranslateLinear
 	lsls r0, 24
 	cmp r0, 0
 	beq _080AB0C0
@@ -861,7 +861,7 @@ _080AB256:
 	movs r7, 0x3
 _080AB260:
 	adds r0, r6, 0
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r0, _080AB2B8 @ =gBattleAnimAttacker
 	ldrb r0, [r0]
 	bl GetBattlerSide
@@ -912,7 +912,7 @@ sub_80AB2CC: @ 80AB2CC
 	push {r4,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	ldr r0, _080AB2FC @ =gBattleAnimArgs
 	ldrh r1, [r0, 0x8]
 	strh r1, [r4, 0x2E]
@@ -948,14 +948,14 @@ sub_80AB308: @ 80AB308
 	beq _080AB324
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	b _080AB32C
 	.align 2, 0
 _080AB320: .4byte gBattleAnimArgs
 _080AB324:
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 _080AB32C:
 	ldr r0, _080AB33C @ =gBattleAnimArgs
 	ldrh r0, [r0, 0x4]
@@ -1054,7 +1054,7 @@ sub_80AB38C: @ 80AB38C
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 	b _080AB42E
 	.align 2, 0
 _080AB3FC: .4byte 0x00003f42
@@ -1064,7 +1064,7 @@ _080AB408:
 	mov r0, sp
 	ldrb r0, [r0, 0x9]
 	ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap
-	bl sub_807543C
+	bl AnimLoadCompressedBgTilemap
 	b _080AB42E
 	.align 2, 0
 _080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap
@@ -1084,7 +1084,7 @@ _080AB42E:
 	ldr r1, _080AB45C @ =gFile_graphics_battle_anims_backgrounds_water_sheet
 	mov r2, sp
 	ldrh r2, [r2, 0xA]
-	bl sub_80753B4
+	bl AnimLoadCompressedBgGfx
 	ldr r0, _080AB460 @ =gBattleAnimArgs
 	movs r1, 0
 	ldrsh r0, [r0, r1]
@@ -1904,7 +1904,7 @@ sub_80ABA78: @ 80ABA78
 	strh r0, [r4, 0x4]
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8075114
+	bl InitSpritePosToAnimTarget
 	bl Random
 	movs r5, 0xFF
 	ands r5, r0
@@ -1991,7 +1991,7 @@ sub_80ABB28: @ 80ABB28
 	ldr r0, _080ABB78 @ =gTasks
 	adds r4, r0
 	movs r0, 0
-	bl GetAnimBankSpriteId
+	bl GetAnimBattlerSpriteId
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r4, 0x26]
@@ -2138,7 +2138,7 @@ _080ABC66:
 	ldrh r0, [r4, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8076440
+	bl SetBattlerSpriteYOffsetFromYScale
 	ldr r2, _080ABC84 @ =gSprites
 	movs r0, 0x26
 	ldrsh r1, [r4, r0]
@@ -2727,7 +2727,7 @@ _080AC0AE:
 	ldr r1, [r0]
 	adds r0, r2, 0
 	bl _call_via_r1
-	ldr r1, _080AC144 @ =gUnknown_2037EE2
+	ldr r1, _080AC144 @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
@@ -2748,7 +2748,7 @@ _080AC0F8:
 	ldr r1, [r0]
 	adds r0, r2, 0
 	bl _call_via_r1
-	ldr r1, _080AC144 @ =gUnknown_2037EE2
+	ldr r1, _080AC144 @ =gAnimVisualTaskCount
 	ldrb r0, [r1]
 	adds r0, 0x1
 	strb r0, [r1]
@@ -2769,7 +2769,7 @@ _080AC128:
 	.align 2, 0
 _080AC13C: .4byte gBattleAnimArgs
 _080AC140: .4byte sub_80B94B4
-_080AC144: .4byte gUnknown_2037EE2
+_080AC144: .4byte gAnimVisualTaskCount
 _080AC148:
 	movs r2, 0x1A
 	ldrsh r0, [r4, r2]
@@ -3287,7 +3287,7 @@ sub_80AC504: @ 80AC504
 	strh r1, [r0, 0x36]
 	ldrh r1, [r6, 0x1A]
 	strh r1, [r0, 0x38]
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	adds r5, 0x1C
 	adds r4, r5
 	ldr r0, _080AC56C @ =sub_80AC570
@@ -3309,7 +3309,7 @@ _080AC56C: .4byte sub_80AC570
 sub_80AC570: @ 80AC570
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080AC5CA
@@ -3344,7 +3344,7 @@ sub_80AC570: @ 80AC570
 	mvns r1, r1
 	strh r1, [r6, 0x38]
 	adds r0, r6, 0
-	bl sub_8075068
+	bl InitAnimArcTranslation
 	ldr r0, _080AC5D4 @ =sub_80AC5D8
 	str r0, [r6, 0x1C]
 _080AC5CA:
@@ -3360,7 +3360,7 @@ _080AC5D4: .4byte sub_80AC5D8
 sub_80AC5D8: @ 80AC5D8
 	push {r4-r6,lr}
 	adds r5, r0, 0
-	bl AnimateBallThrow
+	bl TranslateAnimHorizontalArc
 	lsls r0, 24
 	cmp r0, 0
 	beq _080AC614
@@ -3498,7 +3498,7 @@ sub_80AC6D8: @ 80AC6D8
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	movs r1, 0x1
-	bl sub_8075160
+	bl InitSpritePosToAnimAttacker
 	ldr r5, _080AC714 @ =gBattleAnimTarget
 	ldrb r0, [r5]
 	movs r1, 0x2

common_syms/help_system_812B1E0.txt

@@ -1,2 +1,2 @@
 gUnknown_3005E9C
-gUnknown_3005EA0
+gSomeVariableBackup

common_syms/save.txt

@@ -9,4 +9,4 @@ gSaveUnusedVar
 gSaveFileStatus
 gGameContinueCallback
 gRamSaveSectionLocations
-gUnknown_3005420
+gSaveSucceeded

data/battle_anim.s

@@ -242,21 +242,3 @@ gUnknown_83ADE18:: @ 83ADE18
 
 gUnknown_83ADF5C:: @ 83ADF5C
 	.incbin "baserom.gba", 0x3ADF5C, 0xC0
-
-gUnknown_83AE01C:: @ 83AE01C
-	.incbin "baserom.gba", 0x3AE01C, 0x20
-
-gUnknown_83AE03C:: @ 83AE03C
-	.incbin "baserom.gba", 0x3AE03C, 0x10
-
-gUnknown_83AE04C:: @ 83AE04C
-	.incbin "baserom.gba", 0x3AE04C, 0x4
-
-gUnknown_83AE050:: @ 83AE050
-	.incbin "baserom.gba", 0x3AE050, 0x4
-
-gUnknown_83AE054:: @ 83AE054
-	.incbin "baserom.gba", 0x3AE054, 0x30
-
-gUnknown_83AE084:: @ 0x83AE084
-	.incbin "baserom.gba", 0x3AE084, 0x10

data/data.s

@@ -59,7 +59,7 @@ gUnknown_823499C:: @ 823499C
 gUnknown_82349BC:: @ 82349BC
 	.incbin "baserom.gba", 0x2349BC, 0x10
 
-gUnknown_82349CC:: @ 82349CC
+gMonFrontPicCoords:: @ 82349CC
 	.incbin "baserom.gba", 0x2349CC, 0x6E0
 
 gMonFrontPicTable:: @ 82350AC
@@ -68,7 +68,7 @@ gMonFrontPicTable:: @ 82350AC
 gUnknown_8235194:: @ 8235194
 	.incbin "baserom.gba", 0x235194, 0xCD8
 
-gUnknown_8235E6C:: @ 8235E6C
+gMonBackPicCoords:: @ 8235E6C
 	.incbin "baserom.gba", 0x235E6C, 0x6E0
 
 gMonBackPicTable:: @ 823654C

data/data_835B488.s

@@ -843,13 +843,19 @@ gUnknown_83E4410:: @ 83E4410
 	.incbin "baserom.gba", 0x3E4410, 0x1488
 
 gUnknown_83E5898:: @ 83E5898
-	.incbin "baserom.gba", 0x3E5898, 0x248
+	.incbin "baserom.gba", 0x3E5898, 0xC0
+
+gUnknown_83E5958:: @ 83E5958
+	.incbin "baserom.gba", 0x3E5958, 0x188
 
 gUnknown_83E5AE0:: @ 83E5AE0
 	.incbin "baserom.gba", 0x3E5AE0, 0xA8
 
 gUnknown_83E5B88:: @ 83E5B88
-	.incbin "baserom.gba", 0x3E5B88, 0x2A4
+	.incbin "baserom.gba", 0x3E5B88, 0x1C0
+
+gUnknown_83E5D48:: @ 83E5D48
+	.incbin "baserom.gba", 0x3E5D48, 0xE4
 
 gUnknown_83E5E2C:: @ 83E5E2C
 	.incbin "baserom.gba", 0x3E5E2C, 0x18
@@ -900,58 +906,9 @@ gUnknown_83E652C:: @ 83E652C
 	.incbin "baserom.gba", 0x3E652C, 0x78
 
 gUnknown_83E65A4:: @ 83E65A4
-	.incbin "baserom.gba", 0x3E65A4, 0xA4C
+	.incbin "baserom.gba", 0x3E65A4, 0x544
 
-gUnknown_83E6FF0:: @ 83E6FF0
-	.incbin "baserom.gba", 0x3E6FF0, 0x1C
-
-gUnknown_83E700C:: @ 83E700C
-	.incbin "baserom.gba", 0x3E700C, 0x20
-
-gUnknown_83E702C:: @ 83E702C
-	.incbin "baserom.gba", 0x3E702C, 0x18
-
-gUnknown_83E7044:: @ 83E7044
-	.incbin "baserom.gba", 0x3E7044, 0xD0
-
-gUnknown_83E7114:: @ 83E7114
-	.incbin "baserom.gba", 0x3E7114, 0x35C
-
-gUnknown_83E7470:: @ 83E7470
-	.incbin "baserom.gba", 0x3E7470, 0x68
-
-gUnknown_83E74D8:: @ 83E74D8
-	.incbin "baserom.gba", 0x3E74D8, 0x18
-
-gUnknown_83E74F0:: @ 83E74F0
-	.incbin "baserom.gba", 0x3E74F0, 0x178
-
-gUnknown_83E7668:: @ 83E7668
-	.incbin "baserom.gba", 0x3E7668, 0x78
-
-gUnknown_83E76E0:: @ 83E76E0
-	.incbin "baserom.gba", 0x3E76E0, 0x528
-
-gUnknown_83E7C08:: @ 83E7C08
-	.incbin "baserom.gba", 0x3E7C08, 0x30
-
-gUnknown_83E7C38:: @ 83E7C38
-	.incbin "baserom.gba", 0x3E7C38, 0x60
-
-gUnknown_83E7C98:: @ 83E7C98
-	.incbin "baserom.gba", 0x3E7C98, 0x30
-
-gUnknown_83E7CC8:: @ 83E7CC8
-	.incbin "baserom.gba", 0x3E7CC8, 0x2
-
-gUnknown_83E7CCA:: @ 83E7CCA
-	.incbin "baserom.gba", 0x3E7CCA, 0x4
-
-gUnknown_83E7CCE:: @ 83E7CCE
-	.incbin "baserom.gba", 0x3E7CCE, 0x6
-
-gUnknown_83E7CD4:: @ 83E7CD4
-	.incbin "baserom.gba", 0x3E7CD4, 0x28
+	.section .rodata.83E7CFC
 
 gUnknown_83E7CFC:: @ 83E7CFC
 	.incbin "baserom.gba", 0x3E7CFC, 0x14

data/data_83FECCC.s

@@ -139,37 +139,6 @@ gUnknown_84020E6:: @ 84020E6
 gUnknown_84020F8:: @ 84020F8
 	.incbin "baserom.gba", 0x4020F8, 0xE4
 
-gUnknown_84021DC:: @ 84021DC
-	.incbin "baserom.gba", 0x4021DC, 0xC
-
-gUnknown_84021E8:: @ 84021E8
-	.incbin "baserom.gba", 0x4021E8, 0x18
-
-gUnknown_8402200:: @ 8402200
-	.incbin "baserom.gba", 0x402200, 0x3
-
-gUnknown_8402203:: @ 8402203
-	.incbin "baserom.gba", 0x402203, 0x5
-
-gUnknown_8402208:: @ 8402208
-	.incbin "baserom.gba", 0x402208, 0x18
-
-gUnknown_8402220:: @ 8402220
-	.incbin "baserom.gba", 0x402220, 0x8
-
-gUnknown_8402228:: @ 8402228
-	.incbin "baserom.gba", 0x402228, 0x20
-
-gUnknown_8402248:: @ 8402248
-	.incbin "baserom.gba", 0x402248, 0x8
-
-gUnknown_8402250:: @ 8402250
-	.incbin "baserom.gba", 0x402250, 0x8
-
-gUnknown_8402258:: @ 8402258
-	.incbin "baserom.gba", 0x402258, 0x8
-
-
 	.section .rodata.battle_anim_special
 
 gUnknown_840BF3C:: @ 840BF3C

data/graphics.s

@@ -1624,15 +1624,15 @@ gFile_graphics_battle_anims_backgrounds_00_tilemap:: @ 8D1CFD4
 	.incbin "graphics/battle_anims/backgrounds/00.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_metal_shine_sheet:: @ 8D1D224
+gMetalShineGfx:: @ 8D1D224
 	.incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_metal_shine_palette:: @ 8D1D360
+gMetalShinePalette:: @ 8D1D360
 	.incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_metal_shine_tilemap:: @ 8D1D388
+gMetalShineTilemap:: @ 8D1D388
 	.incbin "graphics/battle_anims/masks/metal_shine.bin.lz"
 
 	.align 2
@@ -2412,47 +2412,47 @@ gFile_graphics_battle_anims_sprites_243_palette:: @ 8D2D8CC
 	.incbin "graphics/battle_anims/sprites/243.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat_sheet:: @ 8D2D8F4
+gBattleStatMask_Gfx:: @ 8D2D8F4
 	.incbin "graphics/battle_anims/masks/stat.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap:: @ 8D2DB04
+gBattleStatMask1_Tilemap:: @ 8D2DB04
 	.incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap:: @ 8D2DC20
+gBattleStatMask2_Tilemap:: @ 8D2DC20
 	.incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat1_palette:: @ 8D2DD3C
+gBattleStatMask1_Pal:: @ 8D2DD3C
 	.incbin "graphics/battle_anims/masks/stat1.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat2_palette:: @ 8D2DD5C
+gBattleStatMask2_Pal:: @ 8D2DD5C
 	.incbin "graphics/battle_anims/masks/stat2.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat3_palette:: @ 8D2DD7C
+gBattleStatMask3_Pal:: @ 8D2DD7C
 	.incbin "graphics/battle_anims/masks/stat3.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat4_palette:: @ 8D2DD9C
+gBattleStatMask4_Pal:: @ 8D2DD9C
 	.incbin "graphics/battle_anims/masks/stat4.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat5_palette:: @ 8D2DDBC
+gBattleStatMask5_Pal:: @ 8D2DDBC
 	.incbin "graphics/battle_anims/masks/stat5.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat6_palette:: @ 8D2DDDC
+gBattleStatMask6_Pal:: @ 8D2DDDC
 	.incbin "graphics/battle_anims/masks/stat6.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat7_palette:: @ 8D2DDFC
+gBattleStatMask7_Pal:: @ 8D2DDFC
 	.incbin "graphics/battle_anims/masks/stat7.gbapal.lz"
 
 	.align 2
-gFile_graphics_battle_anims_masks_stat8_palette:: @ 8D2DE1C
+gBattleStatMask8_Pal:: @ 8D2DE1C
 	.incbin "graphics/battle_anims/masks/stat8.gbapal.lz"
 
 	.align 2
@@ -13554,7 +13554,7 @@ gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0
 	.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"
 
 	.align 2
-gFile_graphics_battle_anims_sprites_261_palette:: @ 8E799FC
+gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC
 	.incbin "graphics/battle_anims/sprites/261.gbapal.lz"
 
 	.align 2

data/map_event_scripts.inc

@@ -774,7 +774,7 @@ EventScript_1A4EAE:: @ 81A4EAE
 	return
 
 EventScript_1A4EAF:: @ 81A4EAF
-	special sub_806F67C
+	special Field_AskSaveTheGame
 	waitstate
 	return
 
@@ -4447,21 +4447,33 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
 gUnknown_81C555B:: @ 81C555B
 	.incbin "baserom.gba", 0x1C555B, 0x6E
 
-gUnknown_81C55C9:: @ 81C55C9
-	.incbin "baserom.gba", 0x1C55C9, 0x21
+gText_WouldYouLikeToSaveTheGame:: @ 81C55C9
+	.string "Would you like to save the game?$"
 
-gUnknown_81C55EA:: @ 81C55EA
-	.incbin "baserom.gba", 0x1C55EA, 0x3B
+gText_AlreadySaveFile_WouldLikeToOverwrite:: @ 81C55EA
+	.string "There is already a saved file.\n"
+	.string "Is it okay to overwrite it?$"
 
-gUnknown_81C5625:: @ 81C5625
-	.incbin "baserom.gba", 0x1C5625, 0x22
+gText_SavingDontTurnOffThePower:: @ 81C5625
+	.string "SAVING…\n"
+	.string "DON'T TURN OFF THE POWER.$"
 
-gUnknown_81C5647:: @ 81C5647
-	.incbin "baserom.gba", 0x1C5647, 0x23
+gText_PlayerSavedTheGame:: @ 81C5647
+	.string "{PLAYER} saved the game.$"
+
+gUnknown_81C565A::
+    .string "セーブに　しっぱい　しました‥$"
 
 @ 0xE5
-gUnknown_81C566A:: @ 81C566A
-	.incbin "baserom.gba", 0x1C566A, 0xE5
+gText_DifferentGameFile:: @ 81C566A
+	.string "WARNING!\p"
+	.string "There is a different game file that\n"
+	.string "is already saved.\p"
+	.string "If you save now, the other file's\n"
+	.string "adventure, including items and\l"
+	.string "POKéMON, will be entirely lost.\p"
+	.string "Are you sure you want to save now\n"
+	.string "and overwrite the other save file?$"
 
 gOtherText_NewName:: @ 81C574F
 	.string "NEW NAME$"

data/maps/PalletTown_PlayersHouse_2F/scripts.inc

@@ -36,7 +36,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
 	goto_if_eq EventScript_1A7AE0
 	lockall
 	setvar VAR_0x8004, 32
-	special sub_812B220
+	special Special_SetSomeVariable
 	setvar VAR_0x8004, 1
 	special sub_80CA86C
 	playse SE_PC_ON
@@ -47,7 +47,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
 	releaseall
 	end
 
-gUnknown_8168D17:: @ 8168D17
+EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
 	setvar VAR_0x8004, 1
 	playse SE_PC_OFF
 	special sub_80CA9A8

data/specials.inc

@@ -102,7 +102,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_8081128
-	def_special sub_806F67C
+	def_special Field_AskSaveTheGame
 	def_special nullsub_56
 	def_special sub_80FEE44
 	def_special sub_80BDA7C
@@ -390,9 +390,9 @@ gSpecials:: @ 815FD60
 	def_special TakePokemonFromRoute5Daycare
 	def_special ScrSpecial_SeaGallopFerry
 	def_special sub_80CC48C
-	def_special sub_812B220
-	def_special sub_812B234
-	def_special sub_812B248
+	def_special Special_SetSomeVariable
+	def_special HelpSystem_BackupSomeVariable
+	def_special HelpSystem_RestoreSomeVariable
 	def_special ValidateReceivedWonderCard
 	def_special sub_810B810
 	def_special sub_811999C

data/start_menu.s

@@ -1,28 +0,0 @@
-	.section .rodata
-	.align 2
-gUnknown_83A7344:: @ 83A7344
-	.incbin "baserom.gba", 0x3A7344, 0x48
-
-gUnknown_83A738C:: @ 83A738C
-	.incbin "baserom.gba", 0x3A738C, 0x8
-
-gUnknown_83A7394:: @ 83A7394
-	.incbin "baserom.gba", 0x3A7394, 0x24
-
-gUnknown_83A73B8:: @ 83A73B8
-	.incbin "baserom.gba", 0x3A73B8, 0x4
-
-gUnknown_83A73BC:: @ 83A73BC
-	.incbin "baserom.gba", 0x3A73BC, 0x10
-
-gUnknown_83A73CC:: @ 83A73CC
-	.incbin "baserom.gba", 0x3A73CC, 0x8
-
-gUnknown_83A73D4:: @ 83A73D4
-	.incbin "baserom.gba", 0x3A73D4, 0x4
-
-gUnknown_83A73D8:: @ 83A73D8
-	.incbin "baserom.gba", 0x3A73D8, 0x4
-
-gUnknown_83A73DC:: @ 83A73DC
-	.incbin "baserom.gba", 0x3A73DC, 0x284

data/tileset_anims.s

@@ -1,5 +1,8 @@
 	.section .rodata
 	.align 2
+gUnknown_83A73E0:: @ 83A73E0
+	.incbin "baserom.gba", 0x3A73E0, 0x280
+
 gUnknown_83A7660:: @ 83A7660
 	.incbin "baserom.gba", 0x3A7660, 0x2FF4
 

graphics/battle_anims/sprites/unk_83E6C18.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 148 139
+148 148 255
+189 197 255
+222 222 255
+238 238 255
+238 246 255
+255 255 255
+238 246 255
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+205 213 255
+205 205 255
+230 230 255

include/battle.h

@@ -820,9 +820,6 @@ extern struct BattleSpriteData *gBattleSpritesDataPtr;
 extern u8 *gLinkBattleSendBuffer;
 extern u8 *gLinkBattleRecvBuffer;
 
-extern u8 *gUnknown_0202305C;
-extern u8 *gUnknown_02023060;
-
 // Move this somewhere else
 
 #include "sprite.h"
@@ -836,7 +833,7 @@ struct MonSpritesGfx
     u8 field_F4[0x80];
     u8 *barFontGfx;
     void *field_178;
-    void *field_17C;
+    u16 *field_17C;
 };
 
 extern u16 gBattle_BG0_X;

include/battle_anim.h

@@ -1,19 +1,9 @@
 #ifndef GUARD_BATTLE_ANIM_H
 #define GUARD_BATTLE_ANIM_H
 
-#include "global.h"
-
-#ifndef BATTLE_BANKS_COUNT
-#define BATTLE_BANKS_COUNT 4
-#endif // BATTLE_BANKS_COUNT
-
-enum
-{
-    ANIM_BANK_ATTACKER,
-    ANIM_BANK_TARGET,
-    ANIM_BANK_ATK_PARTNER,
-    ANIM_BANK_DEF_PARTNER,
-};
+#include "battle.h"
+#include "constants/battle_anim.h"
+#include "task.h"
 
 enum
 {
@@ -60,11 +50,39 @@ extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT];
 extern u8 gAnimMoveTurn;
 extern u8 gBattleAnimAttacker;
 extern u8 gBattleAnimTarget;
-extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_02038440;
 extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u16 gAnimMovePower;
 extern s32 gAnimMoveDmg;
+extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT];
+extern u8 gUnknown_2037F24;
+
+extern struct OamData gOamData_83ACA40;
+extern struct OamData gOamData_83AC9C8;
+extern struct OamData gOamData_83ACA38;
+extern struct OamData gOamData_83AC9D0;
+extern struct OamData gOamData_83AC9F8;
+extern struct OamData gOamData_83AC9D8;
+extern struct OamData gOamData_83ACB58;
+extern struct OamData gOamData_83ACAF8;
+extern struct OamData gOamData_83ACB60;
+extern struct OamData gOamData_83ACA30;
+extern struct OamData gOamData_83ACA98;
+extern struct OamData gOamData_83ACA90;
+extern struct OamData gOamData_83ACAF0;
+extern struct OamData gOamData_83ACB10;
+extern struct OamData gOamData_83ACB18;
+extern struct OamData gOamData_83ACB38;
+extern struct OamData gOamData_83ACA18;
+extern struct OamData gOamData_83ACB20;
+extern struct OamData gOamData_83ACB50;
+extern struct OamData gOamData_83ACAB8;
+extern struct OamData gOamData_83ACA00;
+extern struct OamData gOamData_83ACBC0;
+extern struct OamData gOamData_83ACB00;
+extern struct OamData gOamData_83AC9E0;
+extern struct OamData gOamData_83ACA20;
+extern struct OamData gOamData_83ACA80;
+extern struct OamData gOamData_83ACAA0;
 
 void ClearBattleAnimationVars(void);
 void DoMoveAnim(u16 move);
@@ -80,25 +98,22 @@ s8 BattleAnimAdjustPanning2(s8 pan);
 s16 sub_80A52EC(s16 a);
 s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
 bool8 IsBattlerSpriteVisible(u8 battlerId);
+s16 KeepPanInRange(s16 a, s32 oldPan);
+void sub_80730C0(u16, const u16 *, s32, u8);
 
-// battle_anim_80FE840.s
+// battle_intro.c
 void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);
-void sub_8118FBC(u8 arg0, u8 arg1, u8 arg2, u8 bankIdentity, u8 arg4, void *arg5, u16 *arg6, u16 arg7);
-void HandleIntroSlide(u8 terrainId);
+s32 GetAnimBgAttribute(u8 bgId, u8 attributeId);
+void HandleIntroSlide(u8 terrain);
+void sub_80BC41C(u8 taskId);
+void sub_80BCEF4(s32 bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 tilesOffset);
 
-// battle_anim_80A5C6C.s
-void sub_80A6EEC(struct Sprite *sprite);
-void sub_80A68D4(struct Sprite *sprite);
-void sub_80A6F3C(struct Sprite *sprite);
-void sub_80A8278(void);
-void sub_80A6B30(struct BattleAnimBgData *);
-void sub_80A6B90(struct BattleAnimBgData *, u32 arg1);
-u8 sub_80A82E4(u8 bank);
-bool8 AnimateBallThrow(struct Sprite *sprite);
-
-// battle_anim_special
+// battle_anim_special.s
 void sub_80F1720(u8 battler, struct Pokemon *mon);
 
+// battle_anim_effects_1.s
+void AnimMoveTwisterParticle(struct Sprite *sprite);
+
 enum
 {
     BATTLER_COORD_X,
@@ -119,24 +134,24 @@ enum
     BATTLER_COORD_ATTR_RAW_BOTTOM,
 };
 
-u8 GetBattlerSpriteCoord(u8 bank, u8 attributeId);
+u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId);
 
-bool8 IsBankSpritePresent(u8 bank);
+bool8 IsBankSpritePresent(u8 battlerId);
 void sub_80A6C68(u8 arg0);
-u8 GetAnimBankSpriteId(u8 wantedBank);
+u8 GetAnimBattlerSpriteId(u8 wantedBank);
 bool8 IsDoubleBattle(void);
 u8 sub_80A6D94(void);
 u8 sub_80A8364(u8);
-void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
+void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite *));
 void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
-u8 GetBattlerSpriteDefault_Y(u8 bank);
-u8 sub_80A82E4(u8 bank);
-u8 GetSubstituteSpriteDefault_Y(u8 bank);
+u8 GetBattlerSpriteDefault_Y(u8 battlerId);
+u8 sub_80A82E4(u8 battlerId);
+u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
 u8 GetGhostSpriteDefault_Y(u8 battlerId);
-void sub_8072E48(u8 battlerId, u8);
+void MoveBattlerSpriteToBG(u8 battlerId, u8);
 void sub_8073128(u8);
 
-// battle_anim_80A9C70.s
+// battle_anim_status_effects.s
 #define STAT_ANIM_PLUS1  15
 #define STAT_ANIM_PLUS2  39
 #define STAT_ANIM_MINUS1 22
@@ -147,25 +162,114 @@ void sub_8073128(u8);
 #define STAT_ANIM_MULTIPLE_MINUS2 58
 void LaunchStatusAnimation(u8 bank, u8 statusAnimId);
 
-// battle_anim_8170478.s
+// battle_anim_special.s
 u8 ItemIdToBallId(u16 itemId);
 u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId);
-u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId);
+u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId);
 
-// battle_anim_mons.s
-void TranslateMonSpriteLinear(struct Sprite * sprite);
-void TranslateMonSpriteLinearFixedPoint(struct Sprite * sprite);
-void InitSpriteDataForLinearTranslation(struct Sprite * sprite);
-void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 b);
-void ResetSpriteRotScale(u8 spriteId);
-void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
-bool8 IsContest(void);
-void sub_80759DC(u8 spriteId);
+// battle_anim_mons.c
+u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType);
+u8 GetBattlerSpriteCoord2(u8 battlerId, u8 coordType);
+u8 GetBattlerSpriteDefault_Y(u8 battlerId);
+u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
+u8 GetGhostSpriteDefault_Y(u8 battlerId);
+u8 GetBattlerYCoordWithElevation(u8 battlerId);
+u8 GetAnimBattlerSpriteId(u8 animBattler);
+void StoreSpriteCallbackInData6(struct Sprite *sprite, SpriteCallback callback);
+void TranslateSpriteInCircleOverDuration(struct Sprite *sprite);
+void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *sprite);
+void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite);
+void WaitAnimForDuration(struct Sprite *sprite);
+void sub_8074C80(struct Sprite *sprite);
+void TranslateSpriteLinear(struct Sprite *sprite);
+void TranslateSpriteLinearFixedPoint(struct Sprite *sprite);
+void TranslateMonSpriteLinear(struct Sprite *sprite);
+void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite);
+void TranslateSpriteLinearAndFlicker(struct Sprite *sprite);
+void DestroySpriteAndMatrix(struct Sprite *sprite);
+void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite);
+void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite);
+void DestroyAnimSpriteAndDisableBlend(struct Sprite *sprite);
+void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
+void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite);
+void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset);
+void InitAnimArcTranslation(struct Sprite *sprite);
+bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
+bool8 TranslateAnimVerticalArc(struct Sprite *sprite);
+void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
+void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets);
+void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets);
+u8 GetBattlerSide(u8 battlerId);
+u8 GetBattlerPosition(u8 battlerId);
+u8 GetBattlerAtPosition(u8 position);
 bool8 IsBattlerSpritePresent(u8 battlerId);
-u8 GetBattlerSpriteSubpriority(u8 battlerId);
+bool8 IsDoubleBattle(void);
+void sub_80752A0(struct BattleAnimBgData *animBgData);
+void sub_80752C8(struct BattleAnimBgData *animBgData, u32 arg1);
+void sub_8075300(struct BattleAnimBgData *animBgData, u8 unused);
+void sub_8075358(u32 bgId);
+void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset);
+void InitAnimBgTilemapBuffer(u32 bgId, const void *src);
+void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src);
+u8 sub_8075454(void);
+void sub_8075458(bool8 arg0);
+void sub_8075490(struct Sprite *sprite);
+void InitSpriteDataForLinearTranslation(struct Sprite *sprite);
+void InitAnimLinearTranslation(struct Sprite *sprite);
 void StartAnimLinearTranslation(struct Sprite *sprite);
 void sub_80755B8(struct Sprite *sprite);
-u8 sub_80768B0(u8 battlerId);
+bool8 AnimTranslateLinear(struct Sprite *sprite);
+void sub_807563C(struct Sprite *sprite);
+void sub_8075678(struct Sprite *sprite);
+void sub_80756A4(struct Sprite *sprite);
+void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite);
+bool8 AnimFastTranslateLinear(struct Sprite *sprite);
+void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite);
+void sub_8075830(struct Sprite *sprite);
+void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
+void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode);
+void ResetSpriteRotScale(u8 spriteId);
+void SetBattlerSpriteYOffsetFromRotation(u8 spriteId);
+void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation);
+void sub_8075AD8(struct Sprite *sprite);
+u16 ArcTan2Neg(s16 a, s16 b);
+void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
+u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7);
+u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4);
+u8 sub_8075D80(u8 a1);
+void sub_8075D9C(struct Sprite *sprite);
+void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
+void sub_8075E80(struct Sprite *sprite);
+void sub_8075F0C(struct Sprite *sprite);
+s16 CloneBattlerSpriteWithBlend(u8 animBattler);
+void obj_delete_but_dont_free_vram(struct Sprite *sprite);
+void sub_8076048(u8 taskId);
+void AnimTask_BlendMonInAndOut(u8 task);
+void sub_8076288(u8 taskId);
+void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds);
+bool8 RunAffineAnimFromTaskData(struct Task *task);
+void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
+void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId);
+void StorePointerInVars(s16 *lo, s16 *hi, const void *ptr);
+void *LoadPointerFromVars(s16 lo, s16 hi);
+void sub_80765D4(struct Task *task, u8 spriteId, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7);
+u8 sub_8076640(struct Task *task);
+void AnimTask_GetFrustrationPowerLevel(u8 taskId);
+void sub_80767F0(void);
+u8 GetBattlerSpriteSubpriority(u8 battlerId);
+u8 GetBattlerSpriteBGPriority(u8 battlerId);
+u8 GetBattlerSpriteBGPriorityRank(u8 battlerId);
+u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10);
+void DestroySpriteAndFreeResources_(struct Sprite *sprite);
+s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr);
+void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y);
+u8 sub_8076E34(s32 battlerId, u8 spriteId, s32 species);
+void sub_8076ED8(struct Sprite *sprite);
+void sub_8076F58(struct Sprite *sprite);
+void sub_8076FD0(struct Sprite *sprite);
+void sub_8077030(u8 taskId);
+void sub_807729C(struct Sprite *sprite);
+void sub_8077350(struct Sprite *sprite);
 
 // battle_anim_mon_movement.c
 void AnimTask_ShakeMon(u8 taskId);
@@ -182,4 +286,102 @@ void sub_8099980(u8 taskId);
 void sub_8099A78(u8 taskId);
 void sub_8099BD4(u8 taskId);
 
+// normal.c
+extern const struct SpriteTemplate gUnknown_83E7C98;
+
+u32 UnpackSelectedBattleAnimPalettes(s16 selector);
+void sub_80B9BDC(u8 taskId);
+void sub_80B9CE4(u8 taskId);
+void sub_80B9E58(u8 taskId);
+void sub_80B9F6C(u8 taskId);
+void sub_80BA0E8(u8 taskId);
+void sub_80BA47C(u8 taskId);
+
+// ground.c
+void sub_80B8E94(u8 taskId);
+void sub_80B90EC(u8 taskId);
+void sub_80B94B4(u8 taskId);
+void AnimTask_IsPowerOver99(u8 taskId);
+void sub_80B9800(u8 taskId);
+
+// dragon.c
+void sub_80B75E0(u8 taskId);
+
+// ghost.c
+void sub_80B54E8(u8 taskId);
+void sub_80B58AC(u8 taskId);
+void sub_80B5AAC(u8 taskId);
+void sub_80B6020(u8 taskId);
+void sub_80B63B4(u8 taskId);
+void sub_80B68C8(u8 taskId);
+void sub_80B6BBC(u8 taskId);
+
+// rock.c
+void AnimTask_LoadSandstormBackground(u8 taskId);
+void sub_80B4BD0(u8 taskId);
+void AnimTask_GetSeismicTossDamageLevel(u8 taskId);
+void sub_80B5188(u8 taskId);
+void sub_80B51EC(u8 taskId);
+
+// psychic.c
+void sub_80B3418(u8 taskId);
+void sub_80B3480(u8 taskId);
+void sub_80B3584(u8 taskId);
+void sub_80B3834(u8 taskId);
+void sub_80B3A58(u8 taskId);
+void sub_80B3C78(u8 taskId);
+
+// dark.c
+void sub_80B78E0(u8 taskId);
+void sub_80B79DC(u8 taskId);
+void sub_80B7A80(u8 taskId);
+void sub_80B7DA4(u8 taskId);
+void sub_80B8070(u8 taskId);
+void sub_80B85B8(u8 taskId);
+void sub_80B8664(u8 taskId);
+void AnimTask_MetallicShine(u8 taskId);
+void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId);
+void sub_80B8B38(u8 taskId);
+
+// flying.c
+void sub_80B194C(u8 taskId);
+void sub_80B1D3C(struct Sprite *sprite);
+void sub_80B2868(u8 taskId);
+
+// water.s
+extern const union AnimCmd *const gUnknown_83E5958[];
+
+// fire.s
+extern const union AnimCmd *const gUnknown_83E5D48[];
+
+// battle_anim_utility_funcs.c
+void sub_80BA7F8(u8 taskId);
+void sub_80BA83C(u8 taskId);
+void AnimTask_SetCamouflageBlend(u8 taskId);
+void AnimTask_BlendParticle(u8 taskId);
+void sub_80BAB38(u8 taskId);
+void sub_80BAB98(u8 taskId);
+void sub_80BACEC(u8 taskId);
+void sub_80BB088(u8 taskId);
+void sub_80BB660(u8 taskId);
+void sub_80BB7DC(u8 taskId);
+void sub_80BB82C(u8 taskId);
+void AnimTask_GetAttackerSide(u8 taskId);
+void AnimTask_GetTargetSide(u8 taskId);
+void AnimTask_GetTargetIsAttackerPartner(u8 taskId);
+void sub_80BB9B0(u8 taskId);
+void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette);
+void AnimTask_GetBattleTerrain(u8 taskId);
+void sub_80BBE10(u8 taskId);
+void sub_80BBE3C(u8 taskId);
+void sub_80BBE6C(u8 taskId);
+void sub_80BBF08(u8 taskId);
+void sub_80BBFA4(u8 taskId);
+void AnimTask_IsContest(u8 taskId);
+void sub_80BC060(u8 taskId);
+void AnimTask_IsTargetSameSide(u8 taskId);
+void sub_80BC0DC(u8 taskId);
+void sub_80BC0FC(u8 taskId);
+void sub_80BC12C(u8 taskId);
+
 #endif // GUARD_BATTLE_ANIM_H

include/battle_main.h

@@ -49,7 +49,7 @@ void CB2_QuitRecordedBattle(void);
 void sub_8038528(struct Sprite* sprite);
 void sub_8038A04(void); // unused
 void VBlankCB_Battle(void);
-void sub_8038B74(struct Sprite *sprite);
+void sub_801182C(struct Sprite *sprite);
 void sub_8011A1C(void);
 u32 sub_80391E0(u8 arrayId, u8 caseId);
 u32 sub_80397C4(u32 setId, u32 tableId);
@@ -67,7 +67,7 @@ void EndBounceEffect(u8 bank, bool8 b);
 void sub_8039E44(struct Sprite *sprite);
 void sub_8039E60(struct Sprite *sprite);
 void sub_8039E84(struct Sprite *sprite);
-void sub_8039E9C(struct Sprite *sprite);
+void sub_801236C(struct Sprite *sprite);
 void BeginBattleIntro(void);
 void SwitchInClearSetData(void);
 void FaintClearSetData(void);

include/bg.h

@@ -59,13 +59,13 @@ enum BgTileAllocMode
 
 struct BgTemplate
 {
-    u32 bg:2;                   // 0x1, 0x2 -> 0x3
-    u32 charBaseIndex:2;        // 0x4, 0x8 -> 0xC
-    u32 mapBaseIndex:5;         // 0x10, 0x20, 0x40, 0x80, 0x100 -> 0x1F0
-    u32 screenSize:2;           // 0x200, 0x400 -> 0x600
-    u32 paletteMode:1;          // 0x800
-    u32 priority:2;             // 0x1000, 0x2000 > 0x3000
-    u32 baseTile:10;
+    u16 bg:2;                   // 0x1, 0x2 -> 0x3
+    u16 charBaseIndex:2;        // 0x4, 0x8 -> 0xC
+    u16 mapBaseIndex:5;         // 0x10, 0x20, 0x40, 0x80, 0x100 -> 0x1F0
+    u16 screenSize:2;           // 0x200, 0x400 -> 0x600
+    u16 paletteMode:1;          // 0x800
+    u16 priority:2;             // 0x1000, 0x2000 > 0x3000
+    u16 baseTile:10;
 };
 
 void ResetBgs(void);

include/data.h

@@ -31,6 +31,8 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[];
 extern const struct CompressedSpriteSheet gTrainerFrontPicTable[];
 extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[];
+extern const struct MonCoords gMonFrontPicCoords[];
+extern const struct MonCoords gMonBackPicCoords[];
 
 extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
 extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;

include/event_scripts.h

@@ -1158,4 +1158,14 @@ extern const u8 EventScript_ItemfinderDigUpUnderfootItem[];
 // new_game
 extern const u8 EventScript_ResetAllMapFlags[];
 
+// player_pc
+extern const u8 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC[];
+
+// start_menu
+extern const u8 gText_WouldYouLikeToSaveTheGame[];
+extern const u8 gText_AlreadySaveFile_WouldLikeToOverwrite[];
+extern const u8 gText_SavingDontTurnOffThePower[];
+extern const u8 gText_PlayerSavedTheGame[];
+extern const u8 gText_DifferentGameFile[];
+
 #endif //GUARD_EVENT_SCRIPTS_H

include/field_fadetransition.h

@@ -15,6 +15,7 @@ void sub_807DF64(void);
 void sub_807DC18(void);
 void FieldCallback_ReturnToEventScript2(void);
 void sub_807DC00(void);
+void FadeTransition_FadeInOnReturnToStartMenu(void);
 
 bool32 sub_807E418(void);
 

include/field_weather.h

@@ -13,7 +13,7 @@ void DoCurrentWeather(void);
 void SetSav1WeatherFromCurrMapHeader(void);
 void sub_807B0C4(u16 *, u16 *, u32);
 void PlayRainStoppingSoundEffect(void);
-bool8 sub_807AA70(void);
+bool8 field_weather_is_fade_finished(void);
 void SetWeatherScreenFadeOut(void);
 void sub_807B070(void);
 u8 GetCurrentWeather(void);

include/fieldmap.h

@@ -26,4 +26,6 @@ u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8
 const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection);
 struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
 
+void save_serialize_map(void);
+
 #endif //GUARD_FIELDMAP_H

include/gba/defines.h

@@ -77,8 +77,6 @@
 #define RGB_BLACK RGB(0, 0, 0)
 #define RGB_WHITE RGB(31, 31, 31)
 
-#define WIN_RANGE(a, b) (((a) << 8) | (b))
-
 #define NAKED __attribute__((naked))
 #define UNUSED __attribute__((unused))
 

include/gba/io_reg.h

@@ -538,6 +538,40 @@
 #define BGCNT_AFF512x512        0x8000
 #define BGCNT_AFF1024x1024      0xC000
 
+// WININ/OUT
+#define WININ_WIN0_BG0      (1 << 0)
+#define WININ_WIN0_BG1      (1 << 1)
+#define WININ_WIN0_BG2      (1 << 2)
+#define WININ_WIN0_BG3      (1 << 3)
+#define WININ_WIN0_BG_ALL   (WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3)
+#define WININ_WIN0_OBJ      (1 << 4)
+#define WININ_WIN0_CLR      (1 << 5)
+#define WININ_WIN1_BG0      (1 << 8)
+#define WININ_WIN1_BG1      (1 << 9)
+#define WININ_WIN1_BG2      (1 << 10)
+#define WININ_WIN1_BG3      (1 << 11)
+#define WININ_WIN1_BG_ALL   (WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3)
+#define WININ_WIN1_OBJ      (1 << 12)
+#define WININ_WIN1_CLR      (1 << 13)
+
+#define WINOUT_WIN01_BG0    (1 << 0)
+#define WINOUT_WIN01_BG1    (1 << 1)
+#define WINOUT_WIN01_BG2    (1 << 2)
+#define WINOUT_WIN01_BG3    (1 << 3)
+#define WINOUT_WIN01_BG_ALL (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3)
+#define WINOUT_WIN01_OBJ    (1 << 4)
+#define WINOUT_WIN01_CLR    (1 << 5)
+#define WINOUT_WINOBJ_BG0   (1 << 8)
+#define WINOUT_WINOBJ_BG1   (1 << 9)
+#define WINOUT_WINOBJ_BG2   (1 << 10)
+#define WINOUT_WINOBJ_BG3   (1 << 11)
+#define WINOUT_WINOBJ_BG_ALL (WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WINOBJ_BG3)
+#define WINOUT_WINOBJ_OBJ   (1 << 12)
+#define WINOUT_WINOBJ_CLR   (1 << 13)
+
+#define WIN_RANGE(a, b) (((a) << 8) | (b))
+#define WIN_RANGE2(a, b) ((b) | ((a) << 8))
+
 // BLDCNT
 // Bits 0-5 select layers for the 1st target
 #define BLDCNT_TGT1_BG0      (1 << 0)
@@ -558,9 +592,11 @@
 #define BLDCNT_TGT2_BG3      (1 << 11)
 #define BLDCNT_TGT2_OBJ      (1 << 12)
 #define BLDCNT_TGT2_BD       (1 << 13)
+#define BLDCNT_TGT2_ALL      (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD)
 
 // BLDALPHA
 #define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1))
+#define BLDALPHA_BLEND2(target1, target2) ((target1) | ((target2) << 8))
 
 // SOUNDCNT_H
 #define SOUND_CGB_MIX_QUARTER 0x0000

include/gba/macro.h

@@ -121,10 +121,31 @@
     }                                                     \
 }
 
+#define DmaFillLarge(dmaNum, value, dest, size, block, bit) \
+{                                                           \
+    void *_dest = (void *)dest;                                     \
+    u32 _size = size;                                       \
+    while (1)                                               \
+    {                                                       \
+        DmaFill##bit(dmaNum, value, _dest, (block));       \
+        _dest += (block);                                   \
+        _size -= (block);                                   \
+        if (_size <= (block))                               \
+        {                                                   \
+            DmaFill##bit(dmaNum, value, _dest, _size);     \
+            break;                                          \
+        }                                                   \
+    }                                                       \
+}
+
 #define DmaCopyLarge16(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 16)
 
 #define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32)
 
+#define DmaFillLarge16(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 16)
+
+#define DmaFillLarge32(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 32)
+
 #define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16)
 #define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32)
 
@@ -139,4 +160,14 @@
 #define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16)
 #define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32)
 
+#define DmaFillDefvars(dmaNum, value, dest, size, bit) \
+{                                                      \
+    void *_dest = (void *)dest;                                \
+    u32 _size = size;                                  \
+    DmaFill##bit(dmaNum, value, _dest, _size);         \
+}
+
+#define DmaFill16Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 16)
+#define DmaFill32Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 32)
+
 #endif // GUARD_GBA_MACRO_H

include/global.h

@@ -76,6 +76,18 @@ extern u8 gStringVar2[];
 extern u8 gStringVar3[];
 extern u8 gStringVar4[];
 
+struct Coords8
+{
+    s8 x;
+    s8 y;
+};
+
+struct UCoords8
+{
+    u8 x;
+    u8 y;
+};
+
 struct Coords16
 {
     s16 x;
@@ -88,6 +100,18 @@ struct UCoords16
     u16 y;
 };
 
+struct Coords32
+{
+    s32 x;
+    s32 y;
+};
+
+struct UCoords32
+{
+    u32 x;
+    u32 y;
+};
+
 struct Time
 {
     /*0x00*/ s16 days;

include/graphics.h

@@ -961,6 +961,36 @@ extern const u8 gFile_graphics_items_icon_palettes_sapphire_palette[];
 extern const u8 gFile_graphics_items_icons_return_to_field_arrow_sheet[];
 extern const u8 gFile_graphics_items_icon_palettes_return_to_field_arrow_palette[];
 
+// battle_anim_utility_funcs
+extern const u32 gFile_graphics_battle_anims_masks_curse_sheet[];
+extern const u32 gFile_graphics_battle_anims_masks_curse_tilemap[];
+extern const u32 gBattleStatMask_Gfx[];
+extern const u32 gBattleStatMask1_Pal[];
+extern const u32 gBattleStatMask2_Pal[];
+extern const u32 gBattleStatMask3_Pal[];
+extern const u32 gBattleStatMask4_Pal[];
+extern const u32 gBattleStatMask5_Pal[];
+extern const u32 gBattleStatMask6_Pal[];
+extern const u32 gBattleStatMask7_Pal[];
+extern const u32 gBattleStatMask8_Pal[];
+extern const u32 gBattleStatMask1_Tilemap[];
+extern const u32 gBattleStatMask2_Tilemap[];
+
+// dark
+extern const u32 gMetalShineGfx[];
+extern const u32 gMetalShinePalette[];
+extern const u32 gMetalShineTilemap[];
+
+// ghost
+extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_sheet[];
+extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_palette[];
+extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap[];
+
+// rock
+extern const u32 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap[];
+extern const u32 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet[];
+extern const u32 gBattleAnimSpritePal_FlyingDirt[];
+
 // title_screen
 extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[];
 extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[];
@@ -974,6 +1004,7 @@ extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[];
 extern const u16 gGraphics_TitleScreen_FirePals[];
 extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
 
+// battle_gfx_sfx_util
 extern const u32 gHealthboxSinglesPlayerGfx[];
 extern const u32 gHealthboxSinglesOpponentGfx[];
 extern const u32 gHealthboxDoublesPlayerGfx[];
@@ -983,7 +1014,6 @@ extern const u32 gBlankGfxCompressed[];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u32 gFile_graphics_interface_hp_numbers[];
-
 extern const u32 gGhostFrontPic[];
 extern const u32 gGhostPalette[];
 extern const u32 gSubstituteDollGfx[];

include/help_system.h

@@ -29,7 +29,7 @@ extern bool8 gHelpSystemEnabled;
 extern u8 gUnknown_203F175;
 
 // help_system_812B1E0
-void sub_812B1E0(u8);
+void HelpSystem_SetSomeVariable(u8);
 void HelpSystem_SetSomeVariable2(u8);
 bool8 sub_812B40C(void);
 bool8 sub_812B45C(void);
@@ -89,5 +89,7 @@ void HelpSystem_FillPanel3(void);
 void PrintListMenuItems(void);
 void PlaceListMenuCursor(void);
 bool8 MoveCursor(u8 by, u8 dirn);
+void HelpSystem_BackupSomeVariable(void);
+void HelpSystem_RestoreSomeVariable(void);
 
 #endif //GUARD_HELP_SYSTEM_H

include/item.h

@@ -77,5 +77,6 @@ u16 GetPcItemQuantity(u16 *);
 void ItemPcCompaction(void);
 void RemoveItemFromPC(u16 itemId, u16 quantity);
 void SortAndCompactBagPocket(struct BagPocket * pocket);
+u8 CountItemsInPC(void);
 
 #endif // GUARD_ITEM_H

include/item_menu.h

@@ -28,7 +28,7 @@ void sub_81AAC70(void);
 void sub_8108CF0(void);
 void sub_81089BC(void);
 void sub_810B108(u8);
-void ReturnToBagFromKeyItem(void);
+void CB2_BagMenuFromStartMenu(void);
 void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);
 void ItemMenu_StartFadeToExitCallback(u8 taskId);
 void sub_8108CB4(void);
@@ -38,5 +38,6 @@ void sub_810A1F8(u8 taskId);
 void sub_8107ECC(void);
 void sub_8108DC8(u8 pocketId);
 void sub_81089F4(u8 pocketId);
+void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback);
 
 #endif //GUARD_ITEM_MENU_H

include/link_rfu.h

@@ -41,5 +41,6 @@ u32 GetRfuRecvQueueLength(void);
 void sub_80F8DC0(void);
 void sub_80FBB20(void);
 bool8 sub_80FA484(bool32 a0);
+void var_800D_set_xB(void);
 
 #endif //GUARD_LINK_RFU_H

include/load_save.h

@@ -26,5 +26,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 void ApplyNewEncryptionKeyToBagItems(u32 encryptionKey);
 void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey);
 void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey);
+void sav2_gender2_inplace_and_xFE(void);
+void sub_804C1C0(void);
 
 #endif // GUARD_LOAD_SAVE_H

include/mailbox_pc.h

@@ -1,12 +1,14 @@
 #ifndef GUARD_MAILBOX_PC_H
 #define GUARD_MAILBOX_PC_H
 
+#include "player_pc.h"
+
 bool8 MailboxPC_InitBuffers(u8 num);
 u8 MailboxPC_GetAddWindow(u8 winIdx);
 void MailboxPC_RemoveWindow(u8 winIdx);
 u8 MailboxPC_GetWindowId(u8 winIdx);
-u8 MailboxPC_InitListMenu(struct PlayerPC_Unk_203AAC4 * playerPcStruct);
-void MailboxPC_AddScrollIndicatorArrows(struct PlayerPC_Unk_203AAC4 * playerPcStruct);
+u8 MailboxPC_InitListMenu(struct PlayerPCItemPageStruct * playerPcStruct);
+void MailboxPC_AddScrollIndicatorArrows(struct PlayerPCItemPageStruct * playerPcStruct);
 void MailboxPC_DestroyListMenuBuffer(void);
 
 #endif //GUARD_MAILBOX_PC_H

include/menu.h

@@ -21,7 +21,7 @@ struct MenuAction
 void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const u8 * color, s8 speed, const u8 * str);
 void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str);
 void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing);
-void sub_812E6DC(u8 windowId, const u8 * src, u16 x, u16 y);
+void Menu_PrintFormatIntlPlayerName(u8 windowId, const u8 * src, u16 x, u16 y);
 void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
 bool8 IsBlendTaskActive(void);
 u8 sub_812EA78(u16 species, u32 personality, u8 a2);

include/new_game.h

@@ -3,6 +3,8 @@
 
 #include "global.h"
 
+extern bool8 gDifferentSaveFile;
+
 void SetTrainerId(u32 trainerId, u8 *dst);
 void CopyTrainerId(u8 *dst, u8 *src);
 void NewGameInitData(void);

include/new_menu_helpers.h

@@ -26,7 +26,7 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed
 void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress);
 void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress);
 void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed);
-void sub_80F6E9C(void);
+void LoadStdWindowFrameGfx(void);
 void DrawDialogueFrame(u8 windowId, bool8 transfer);
 void DrawStdWindowFrame(u8 windowId, bool8 copyNow);
 void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
@@ -41,12 +41,12 @@ void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callb
 void DisplayYesNoMenuDefaultYes(void);
 void DisplayYesNoMenuDefaultNo(void);
 u8 GetTextSpeedSetting(void);
-u8 sub_80F78E0(u8 height);
+u8 CreateStartMenuWindow(u8 height);
 u8 GetStartMenuWindowId(void);
 void RemoveStartMenuWindow(void);
 u16 GetStdWindowBaseTileNum(void);
-void sub_80F7974(const u8 * text);
-void sub_80F7998(void);
+void DrawHelpMessageWindowWithText(const u8 * text);
+void DestroyHelpMessageWindow_(void);
 void sub_80F79A4(void);
 void SetDefaultFontsPointer(void);
 

include/option_menu.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_OPTION_MENU_H
+#define GUARD_OPTION_MENU_H
+
+void CB2_OptionsMenuFromStartMenu(void);
+
+#endif //GUARD_OPTION_MENU_H

include/overworld.h

@@ -18,11 +18,6 @@ struct LinkPlayerMapObject
     u8 mode;
 };
 
-struct UCoords32
-{
-    u32 x, y;
-};
-
 struct CreditsOverworldCmd
 {
     s16 unk_0;
@@ -43,6 +38,7 @@ extern MainCallback gFieldCallback;
 extern struct WarpData gUnknown_2031DBC;
 
 extern u8 gUnknown_2031DE0;
+extern u8 gUnknown_300502C;
 
 void IncrementGameStat(u8 index);
 
@@ -113,7 +109,6 @@ u32 sub_8054C04(void);
 extern u8 gDisableMapMusicChangeOnMapLoad;
 extern u8 gUnknown_2036E28;
 
-extern void (*gFieldCallback)(void);
 extern bool8 (* gFieldCallback2)(void);
 
 void SetLastHealLocationWarp(u8 healLocaionId);
@@ -144,4 +139,6 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd
 
 bool32 sub_8058318(void);
 
+void CB2_ReturnToStartMenu(void);
+
 #endif //GUARD_OVERWORLD_H

include/party_menu.h

@@ -83,5 +83,7 @@ void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
 bool8 IsMultiBattle(void);
 void sub_8126EDC(void);
 void sub_812256C(u8 *partyCount, u8 *icons, u8 side);
+void PartyMenuInit_FromPlayerPc(void);
+void CB2_PartyMenuFromStartMenu(void);
 
 #endif // GUARD_PARTY_MENU_H

include/player_pc.h

@@ -6,14 +6,16 @@
 
 // Exported type declarations
 
-struct PlayerPC_Unk_203AAC4
+struct PlayerPCItemPageStruct
 {
     u16 selectedRow;
     u16 scrollOffset;
-    u8 unk_4;
-    u8 unk_5;
-    u8 filler_6[4];
-    u8 unk_A;
+    u8 pageItems;
+    u8 count;
+    u8 filler_6[3];
+    u8 unk_9;
+    u8 scrollIndicatorId;
+    u8 filler_B[5];
 };
 
 // Exported RAM declarations

include/pokedex_screen.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_POKEDEX_SCREEN_H
+#define GUARD_POKEDEX_SCREEN_H
+
+void CB2_OpenPokedexFromStartMenu(void);
+
+#endif //GUARD_POKEDEX_SCREEN_H

include/pokemon_icon.h

@@ -18,5 +18,6 @@ void sub_8097070(struct Sprite *);
 u16 GetUnownLetterByPersonality(u32 personality);
 void sub_809718C(void);
 u8 CreateMonIcon(u16 species, void (*callback)(void), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
+u8 UpdateMonIconFrame(struct Sprite *sprite);
 
 #endif // GUARD_POKEMON_ICON_H

include/quest_log.h

@@ -28,14 +28,18 @@ u8 sub_8112CAC(void);
 bool8 sub_81119D4(void (*func)(void));
 void sub_8111F38(u16, u16);
 void sub_8111134(void);
-void sub_8112EDC(u8 a0);
-u8 sub_8112EB4(void);
-void sub_8113018(const u8 * text, u8 mode);
+void DestroyHelpMessageWindow(u8 a0);
+u8 CreateHelpMessageWindow(void);
+void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
 void MapNamePopupWindowIdSetDummy(void);
 void sub_8111CF0(void);
 void sub_811089C(void);
 void sub_8113044(void);
 void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId);
+void sub_8112450(void);
+void sub_8112364(void);
+u8 sub_8112CAC(void);
+void sub_81138F8(void);
 
 extern u8 gUnknown_203ADFA;
 

include/rom6.h

@@ -1,17 +0,0 @@
-#ifndef GUARD_ROM6_H
-#define GUARD_ROM6_H
-
-#include "global.h"
-
-void sub_81357FC(u8, void(void));
-u8 GetLeadMonIndex(void);
-u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y);
-void sub_813BADC(bool8);
-bool8 sub_813B9C0(void);
-void UpdateMirageRnd(u16 days);
-void UpdateBirchState(u16 days);
-void UpdateFrontierManiac(u16 days);
-void UpdateFrontierGambler(u16 days);
-void SetShoalItemFlag(u16 days);
-
-#endif //GUARD_ROM6_H

include/save.h

@@ -84,7 +84,7 @@ extern u16 gSaveUnusedVar;
 extern u16 gSaveFileStatus;
 extern void (*gGameContinueCallback)(void);
 extern struct SaveBlockChunk gRamSaveSectionLocations[0xE];
-extern u16 gUnknown_3005420;
+extern u16 gSaveSucceeded;
 
 extern struct SaveSection gSaveDataBuffer;