diff options
author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-20 01:04:58 -0800 |
---|---|---|
committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-20 01:04:58 -0800 |
commit | 236f91e6f0e30197d44fa8352350f4cbf9218a59 (patch) | |
tree | 871fb766a4c76af36ffcd4bc9012c912d29272f2 | |
parent | bdbc89bcea6eda0b0083b627ba83d822cec3ebf0 (diff) |
decompile sprite
96 files changed, 4771 insertions, 7685 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 2c3b04c6f..6df441371 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -16,7 +16,7 @@ sub_800F1E8: @ 800F1E8 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r2, _0800F220 @ =gUnknown_202063C + ldr r2, _0800F220 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -32,7 +32,7 @@ sub_800F1E8: @ 800F1E8 bx r0 .align 2, 0 _0800F21C: .4byte gUnknown_824EFF0 -_0800F220: .4byte gUnknown_202063C +_0800F220: .4byte gSprites _0800F224: .4byte sub_800F228 thumb_func_end sub_800F1E8 @@ -865,7 +865,7 @@ _0800F850: ldr r1, [r4] adds r1, 0x7E strb r0, [r1] - ldr r3, _0800F8EC @ =gUnknown_202063C + ldr r3, _0800F8EC @ =gSprites ldr r0, [r4] adds r0, 0x7D ldrb r1, [r0] @@ -902,7 +902,7 @@ _0800F8DC: .4byte 0x00007fff _0800F8E0: .4byte gUnknown_82482E8 _0800F8E4: .4byte gUnknown_2023FE8 _0800F8E8: .4byte gUnknown_8248300 -_0800F8EC: .4byte gUnknown_202063C +_0800F8EC: .4byte gSprites _0800F8F0: movs r1, 0x12 ldrsh r0, [r5, r1] @@ -1041,7 +1041,7 @@ _0800FA08: bl PlaySE adds r0, r7, 0 bl DestroyTask - ldr r4, _0800FAD0 @ =gUnknown_202063C + ldr r4, _0800FAD0 @ =gSprites ldr r5, _0800FAD4 @ =gUnknown_2023FE8 ldr r0, [r5] adds r0, 0x7D @@ -1137,7 +1137,7 @@ _0800FAC4: pop {r0} bx r0 .align 2, 0 -_0800FAD0: .4byte gUnknown_202063C +_0800FAD0: .4byte gSprites _0800FAD4: .4byte gUnknown_2023FE8 _0800FAD8: .4byte 0x000003ff _0800FADC: .4byte 0xfffffc00 diff --git a/asm/battle_2.s b/asm/battle_2.s index c5baa1bf9..1f7b7bb78 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -166,7 +166,7 @@ _0800FEA6: bl ResetTasks bl sub_800FAE0 bl FreeAllSpritePalettes - ldr r1, _0800FF68 @ =gUnknown_3003E58 + ldr r1, _0800FF68 @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] ldr r0, _0800FF6C @ =sub_80116F4 @@ -198,7 +198,7 @@ _0800FF58: .4byte gUnknown_202297E _0800FF5C: .4byte gUnknown_2022980 _0800FF60: .4byte gUnknown_2022982 _0800FF64: .4byte gUnknown_2022B50 -_0800FF68: .4byte gUnknown_3003E58 +_0800FF68: .4byte gReservedSpritePaletteCount _0800FF6C: .4byte sub_80116F4 _0800FF70: .4byte gUnknown_2022B4C _0800FF74: .4byte sub_8010BA0 @@ -3609,7 +3609,7 @@ _08011A9C: movs r1, 0x37 bl SetGpuReg bl FreeAllSpritePalettes - ldr r1, _08011B7C @ =gUnknown_3003E58 + ldr r1, _08011B7C @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] ldr r0, _08011B80 @ =sub_80116F4 @@ -3656,7 +3656,7 @@ _08011B6C: .4byte gUnknown_202297E _08011B70: .4byte gUnknown_2022980 _08011B74: .4byte gUnknown_2022982 _08011B78: .4byte gUnknown_8D004D8 -_08011B7C: .4byte gUnknown_3003E58 +_08011B7C: .4byte gReservedSpritePaletteCount _08011B80: .4byte sub_80116F4 _08011B84: .4byte sub_800F6FC _08011B88: .4byte gUnknown_3005090 @@ -4498,7 +4498,7 @@ _08012186: movs r2, 0x2 orrs r0, r2 strb r0, [r1] - ldr r2, _080121DC @ =gUnknown_202063C + ldr r2, _080121DC @ =gSprites lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -4509,7 +4509,7 @@ _08012186: _080121D0: .4byte gUnknown_2024018 _080121D4: .4byte SpriteCB_HealthBoxBounce _080121D8: .4byte gUnknown_3004FF0 -_080121DC: .4byte gUnknown_202063C +_080121DC: .4byte gSprites _080121E0: ldr r0, _0801224C @ =gUnknown_2023D44 adds r0, r4, r0 @@ -4528,7 +4528,7 @@ _080121E0: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r2, _08012254 @ =gUnknown_202063C + ldr r2, _08012254 @ =gSprites lsls r3, r5, 4 adds r0, r3, r5 lsls r0, 2 @@ -4569,7 +4569,7 @@ _0801223C: .align 2, 0 _0801224C: .4byte gUnknown_2023D44 _08012250: .4byte gUnknown_2024018 -_08012254: .4byte gUnknown_202063C +_08012254: .4byte gSprites thumb_func_end dp11b_obj_instanciate thumb_func_start dp11b_obj_free @@ -4593,7 +4593,7 @@ dp11b_obj_free: @ 8012258 ands r0, r1 cmp r0, 0 beq _080122FA - ldr r2, _080122A8 @ =gUnknown_202063C + ldr r2, _080122A8 @ =gSprites ldrb r1, [r3, 0x2] lsls r0, r1, 4 adds r0, r1 @@ -4612,7 +4612,7 @@ dp11b_obj_free: @ 8012258 b _080122E6 .align 2, 0 _080122A4: .4byte gUnknown_2024018 -_080122A8: .4byte gUnknown_202063C +_080122A8: .4byte gSprites _080122AC: ldr r6, _08012300 @ =gUnknown_2024018 ldr r0, [r6] @@ -4626,7 +4626,7 @@ _080122AC: ands r0, r1 cmp r0, 0 beq _080122FA - ldr r2, _08012304 @ =gUnknown_202063C + ldr r2, _08012304 @ =gSprites ldrb r1, [r3, 0x3] lsls r0, r1, 4 adds r0, r1 @@ -4645,7 +4645,7 @@ _080122AC: _080122E6: ands r0, r2 strb r0, [r1] - ldr r0, _08012304 @ =gUnknown_202063C + ldr r0, _08012304 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -4659,7 +4659,7 @@ _080122FA: bx r0 .align 2, 0 _08012300: .4byte gUnknown_2024018 -_08012304: .4byte gUnknown_202063C +_08012304: .4byte gSprites thumb_func_end dp11b_obj_free thumb_func_start SpriteCB_HealthBoxBounce @@ -4683,7 +4683,7 @@ _08012324: movs r2, 0x32 ldrsh r1, [r4, r2] bl Sin - ldr r2, _08012350 @ =gUnknown_202063C + ldr r2, _08012350 @ =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -4701,7 +4701,7 @@ _08012324: pop {r0} bx r0 .align 2, 0 -_08012350: .4byte gUnknown_202063C +_08012350: .4byte gSprites thumb_func_end SpriteCB_HealthBoxBounce thumb_func_start sub_8012354 diff --git a/asm/battle_anim.s b/asm/battle_anim.s index d311aaee9..c27ed0062 100644 --- a/asm/battle_anim.s +++ b/asm/battle_anim.s @@ -1022,7 +1022,7 @@ _08072C88: lsls r0, 3 adds r2, r0, r1 strh r4, [r2, 0x8] - ldr r1, _08072CE8 @ =gUnknown_202063C + ldr r1, _08072CE8 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1047,7 +1047,7 @@ _08072CD8: .4byte gUnknown_2037F1B _08072CDC: .4byte gUnknown_2023D44 _08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal _08072CE4: .4byte gUnknown_3005090 -_08072CE8: .4byte gUnknown_202063C +_08072CE8: .4byte gSprites _08072CEC: .4byte gUnknown_2022978 _08072CF0: .4byte gUnknown_202297A _08072CF4: @@ -1106,7 +1106,7 @@ _08072D3E: lsls r0, 3 adds r2, r0, r1 strh r4, [r2, 0x8] - ldr r1, _08072DA4 @ =gUnknown_202063C + ldr r1, _08072DA4 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1133,7 +1133,7 @@ _08072D94: .4byte gUnknown_3005090 _08072D98: .4byte gUnknown_2037F14 _08072D9C: .4byte gUnknown_2023D44 _08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal -_08072DA4: .4byte gUnknown_202063C +_08072DA4: .4byte gSprites _08072DA8: .4byte gUnknown_2022978 _08072DAC: .4byte gUnknown_202297A _08072DB0: @@ -1189,7 +1189,7 @@ sub_8072DF0: @ 8072DF0 ands r0, r1 cmp r0, 0 beq _08072E30 - ldr r2, _08072E38 @ =gUnknown_202063C + ldr r2, _08072E38 @ =gSprites ldr r0, _08072E3C @ =gUnknown_2023D44 adds r0, r4, r0 ldrb r1, [r0] @@ -1207,7 +1207,7 @@ _08072E30: b _08072E42 .align 2, 0 _08072E34: .4byte gUnknown_2024018 -_08072E38: .4byte gUnknown_202063C +_08072E38: .4byte gSprites _08072E3C: .4byte gUnknown_2023D44 _08072E40: movs r0, 0 @@ -1272,7 +1272,7 @@ _08072E5E: adds r2, r7, r2 ldrb r0, [r2] ldr r5, _08072F70 @ =gUnknown_2022978 - ldr r3, _08072F74 @ =gUnknown_202063C + ldr r3, _08072F74 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1351,7 +1351,7 @@ _08072F64: .4byte 0x01000800 _08072F68: .4byte 0x01000400 _08072F6C: .4byte gUnknown_2023D44 _08072F70: .4byte gUnknown_2022978 -_08072F74: .4byte gUnknown_202063C +_08072F74: .4byte gSprites _08072F78: .4byte gUnknown_202297A _08072F7C: .4byte gUnknown_20373F8 _08072F80: .4byte 0x04000008 @@ -1405,7 +1405,7 @@ _08072F84: adds r2, r7, r2 ldrb r0, [r2] ldr r5, _080730A8 @ =gUnknown_202297C - ldr r3, _080730AC @ =gUnknown_202063C + ldr r3, _080730AC @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1485,7 +1485,7 @@ _0807309C: .4byte 0x01000800 _080730A0: .4byte 0x01000400 _080730A4: .4byte gUnknown_2023D44 _080730A8: .4byte gUnknown_202297C -_080730AC: .4byte gUnknown_202063C +_080730AC: .4byte gSprites _080730B0: .4byte gUnknown_202297E _080730B4: .4byte gUnknown_20373F8 _080730B8: .4byte 0x05000120 @@ -1604,7 +1604,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174 ldrb r6, [r5, 0x14] mov r0, sp bl sub_80752A0 - ldr r0, _080731F4 @ =gUnknown_202063C + ldr r0, _080731F4 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1653,7 +1653,7 @@ task_pA_ma0A_obj_to_bg_pal: @ 8073174 b _08073232 .align 2, 0 _080731F0: .4byte gUnknown_3005090 -_080731F4: .4byte gUnknown_202063C +_080731F4: .4byte gSprites _080731F8: .4byte gUnknown_2022978 _080731FC: .4byte gUnknown_202297A _08073200: .4byte gUnknown_20377F8 @@ -1727,7 +1727,7 @@ _0807327E: ldrb r0, [r3] cmp r0, 0xFF beq _080732A4 - ldr r2, _080732DC @ =gUnknown_202063C + ldr r2, _080732DC @ =gSprites ldr r0, _080732E0 @ =gUnknown_2023D44 adds r0, r5, r0 ldrb r1, [r0] @@ -1747,7 +1747,7 @@ _080732A4: ldrb r0, [r3, 0x1] cmp r0, 0xFF beq _080732E4 - ldr r3, _080732DC @ =gUnknown_202063C + ldr r3, _080732DC @ =gSprites ldr r2, _080732E0 @ =gUnknown_2023D44 movs r1, 0x2 adds r0, r5, 0 @@ -1768,7 +1768,7 @@ _080732A4: .align 2, 0 _080732D4: .4byte gUnknown_2037F1B _080732D8: .4byte gUnknown_2037F14 -_080732DC: .4byte gUnknown_202063C +_080732DC: .4byte gSprites _080732E0: .4byte gUnknown_2023D44 _080732E4: movs r4, 0 @@ -1915,7 +1915,7 @@ _080733CE: _080733F4: adds r0, r4, 0 bl sub_8072E48 - ldr r2, _08073478 @ =gUnknown_202063C + ldr r2, _08073478 @ =gSprites ldr r0, _0807347C @ =gUnknown_2023D44 adds r0, r4, r0 ldrb r1, [r0] @@ -1953,7 +1953,7 @@ _08073416: _08073442: adds r0, r4, 0 bl sub_8072E48 - ldr r2, _08073478 @ =gUnknown_202063C + ldr r2, _08073478 @ =gSprites ldr r0, _0807347C @ =gUnknown_2023D44 adds r0, r4, r0 ldrb r1, [r0] @@ -1977,7 +1977,7 @@ _08073464: bx r0 .align 2, 0 _08073474: .4byte gUnknown_2037F1B -_08073478: .4byte gUnknown_202063C +_08073478: .4byte gSprites _0807347C: .4byte gUnknown_2023D44 _08073480: .4byte gUnknown_2037ED4 thumb_func_end sub_807339C @@ -2020,7 +2020,7 @@ _080734B6: lsls r0, 24 cmp r0, 0 beq _080734E0 - ldr r2, _08073518 @ =gUnknown_202063C + ldr r2, _08073518 @ =gSprites ldr r0, _0807351C @ =gUnknown_2023D44 adds r0, r6, r0 ldrb r1, [r0] @@ -2045,7 +2045,7 @@ _080734E0: lsls r0, 24 cmp r0, 0 beq _08073520 - ldr r2, _08073518 @ =gUnknown_202063C + ldr r2, _08073518 @ =gSprites ldr r0, _0807351C @ =gUnknown_2023D44 adds r0, r4, r0 ldrb r1, [r0] @@ -2062,7 +2062,7 @@ _080734E0: b _08073522 .align 2, 0 _08073514: .4byte gUnknown_2037F1B -_08073518: .4byte gUnknown_202063C +_08073518: .4byte gSprites _0807351C: .4byte gUnknown_2023D44 _08073520: movs r5, 0 @@ -3878,7 +3878,7 @@ ScriptCmd_invisible: @ 80742A4 lsrs r2, r0, 24 cmp r2, 0xFF beq _080742CC - ldr r1, _080742DC @ =gUnknown_202063C + ldr r1, _080742DC @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -3897,7 +3897,7 @@ _080742CC: bx r0 .align 2, 0 _080742D8: .4byte gUnknown_2037ED4 -_080742DC: .4byte gUnknown_202063C +_080742DC: .4byte gSprites thumb_func_end ScriptCmd_invisible thumb_func_start ScriptCmd_visible @@ -3911,7 +3911,7 @@ ScriptCmd_visible: @ 80742E0 lsrs r2, r0, 24 cmp r2, 0xFF beq _0807430A - ldr r1, _0807431C @ =gUnknown_202063C + ldr r1, _0807431C @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -3931,7 +3931,7 @@ _0807430A: bx r0 .align 2, 0 _08074318: .4byte gUnknown_2037ED4 -_0807431C: .4byte gUnknown_202063C +_0807431C: .4byte gSprites thumb_func_end ScriptCmd_visible thumb_func_start sub_8074320 @@ -3981,7 +3981,7 @@ _0807437C: lsrs r2, r0, 24 cmp r2, 0xFF beq _080743C2 - ldr r1, _080743B8 @ =gUnknown_202063C + ldr r1, _080743B8 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -4006,7 +4006,7 @@ _080743AC: bl sub_8073128 b _080743C2 .align 2, 0 -_080743B8: .4byte gUnknown_202063C +_080743B8: .4byte gSprites _080743BC: movs r0, 0x1 bl sub_8073128 @@ -4065,7 +4065,7 @@ _08074424: beq _0807444C cmp r4, 0x2 bne _0807444C - ldr r1, _08074454 @ =gUnknown_202063C + ldr r1, _08074454 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -4082,7 +4082,7 @@ _0807444C: pop {r0} bx r0 .align 2, 0 -_08074454: .4byte gUnknown_202063C +_08074454: .4byte gSprites thumb_func_end sub_80743C8 thumb_func_start sub_8074458 diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s index b904a785d..8dc72c43d 100644 --- a/asm/battle_anim_8074480.s +++ b/asm/battle_anim_8074480.s @@ -1276,7 +1276,7 @@ sub_8074DC4: @ 8074DC4 ble _08074E08 subs r0, r1, 0x1 strh r0, [r3, 0x2E] - ldr r2, _08074E04 @ =gUnknown_202063C + ldr r2, _08074E04 @ =gSprites movs r4, 0x34 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -1299,7 +1299,7 @@ sub_8074DC4: @ 8074DC4 strh r1, [r0, 0x26] b _08074E0E .align 2, 0 -_08074E04: .4byte gUnknown_202063C +_08074E04: .4byte gSprites _08074E08: adds r0, r3, 0 bl SetCallbackToStoredInData @@ -1328,7 +1328,7 @@ sub_8074E14: @ 8074E14 ldrh r2, [r4, 0x36] adds r0, r2 strh r0, [r4, 0x36] - ldr r3, _08074E60 @ =gUnknown_202063C + ldr r3, _08074E60 @ =gSprites movs r0, 0x38 ldrsh r2, [r4, r0] lsls r0, r2, 4 @@ -1350,7 +1350,7 @@ sub_8074E14: @ 8074E14 strh r0, [r1, 0x26] b _08074E6A .align 2, 0 -_08074E60: .4byte gUnknown_202063C +_08074E60: .4byte gSprites _08074E64: adds r0, r4, 0 bl SetCallbackToStoredInData @@ -2777,7 +2777,7 @@ obj_id_set_rotscale: @ 8075858 orrs r1, r0 str r1, [sp] _08075894: - ldr r1, _080758D4 @ =gUnknown_202063C + ldr r1, _080758D4 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -2791,7 +2791,7 @@ _08075894: movs r2, 0x1 movs r3, 0x2 bl ObjAffineSet - ldr r0, _080758D8 @ =gUnknown_2021BCC + ldr r0, _080758D8 @ =gOamMatrices lsls r4, 3 adds r4, r0 ldrh r0, [r5] @@ -2808,8 +2808,8 @@ _08075894: bx r0 .align 2, 0 _080758D0: .4byte 0xffff0000 -_080758D4: .4byte gUnknown_202063C -_080758D8: .4byte gUnknown_2021BCC +_080758D4: .4byte gSprites +_080758D8: .4byte gOamMatrices thumb_func_end obj_id_set_rotscale thumb_func_start sub_80758DC @@ -2825,7 +2825,7 @@ sub_80758E0: @ 80758E0 lsrs r0, 24 lsls r1, 24 lsrs r5, r1, 24 - ldr r2, _08075978 @ =gUnknown_202063C + ldr r2, _08075978 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2897,7 +2897,7 @@ _0807595C: pop {r0} bx r0 .align 2, 0 -_08075978: .4byte gUnknown_202063C +_08075978: .4byte gSprites _0807597C: .4byte gUnknown_2024018 thumb_func_end sub_80758E0 @@ -2913,7 +2913,7 @@ sub_8075980: @ 8075980 adds r1, r2, 0 movs r3, 0 bl obj_id_set_rotscale - ldr r1, _080759D8 @ =gUnknown_202063C + ldr r1, _080759D8 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -2945,7 +2945,7 @@ sub_8075980: @ 8075980 pop {r0} bx r0 .align 2, 0 -_080759D8: .4byte gUnknown_202063C +_080759D8: .4byte gSprites thumb_func_end sub_8075980 thumb_func_start sub_80759DC @@ -2953,7 +2953,7 @@ sub_80759DC: @ 80759DC push {lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _08075A14 @ =gUnknown_202063C + ldr r2, _08075A14 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2961,7 +2961,7 @@ sub_80759DC: @ 80759DC ldrb r0, [r2, 0x3] lsls r0, 26 lsrs r0, 27 - ldr r1, _08075A18 @ =gUnknown_2021BCC + ldr r1, _08075A18 @ =gOamMatrices lsls r0, 3 adds r0, r1 ldrh r1, [r0, 0x4] @@ -2979,8 +2979,8 @@ _08075A08: pop {r0} bx r0 .align 2, 0 -_08075A14: .4byte gUnknown_202063C -_08075A18: .4byte gUnknown_2021BCC +_08075A14: .4byte gSprites +_08075A18: .4byte gOamMatrices thumb_func_end sub_80759DC thumb_func_start sub_8075A1C @@ -3056,7 +3056,7 @@ _08075A98: movs r2, 0x1 movs r3, 0x2 bl ObjAffineSet - ldr r0, _08075AD4 @ =gUnknown_2021BCC + ldr r0, _08075AD4 @ =gOamMatrices lsls r4, 3 adds r4, r0 ldrh r0, [r5] @@ -3076,7 +3076,7 @@ _08075AC2: bx r0 .align 2, 0 _08075AD0: .4byte 0xffff0000 -_08075AD4: .4byte gUnknown_2021BCC +_08075AD4: .4byte gOamMatrices thumb_func_end sub_8075A1C thumb_func_start sub_8075AD8 @@ -3728,7 +3728,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: @ 8075FBC cmp r1, 0xFF beq _08076026 movs r6, 0 - ldr r2, _08076018 @ =gUnknown_202063C + ldr r2, _08076018 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r1, r0, 2 @@ -3764,7 +3764,7 @@ _08075FD8: asrs r0, 16 b _0807602A .align 2, 0 -_08076018: .4byte gUnknown_202063C +_08076018: .4byte gSprites _0807601C: adds r0, r6, 0x1 lsls r0, 16 @@ -3970,7 +3970,7 @@ _08076190: adds r0, r4 lsls r0, 3 adds r0, r1 - ldr r2, _080761C0 @ =gUnknown_202063C + ldr r2, _080761C0 @ =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -3989,7 +3989,7 @@ _080761B6: bx r0 .align 2, 0 _080761BC: .4byte gUnknown_3005090 -_080761C0: .4byte gUnknown_202063C +_080761C0: .4byte gSprites _080761C4: .4byte 0x00000101 thumb_func_end sub_807616C @@ -4297,7 +4297,7 @@ _08076408: strh r0, [r4, 0x16] b _08076436 _08076410: - ldr r2, _08076430 @ =gUnknown_202063C + ldr r2, _08076430 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -4313,7 +4313,7 @@ _08076410: movs r0, 0 b _08076438 .align 2, 0 -_08076430: .4byte gUnknown_202063C +_08076430: .4byte gSprites _08076434: strh r2, [r4, 0x16] _08076436: @@ -4336,7 +4336,7 @@ sub_8076440: @ 8076440 lsrs r0, 15 movs r1, 0x40 subs r5, r1, r0 - ldr r1, _0807648C @ =gUnknown_202063C + ldr r1, _0807648C @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4345,7 +4345,7 @@ sub_8076440: @ 8076440 lsls r1, 26 lsrs r1, 27 lsls r0, r5, 8 - ldr r2, _08076490 @ =gUnknown_2021BCC + ldr r2, _08076490 @ =gOamMatrices lsls r1, 3 adds r1, r2 movs r2, 0x6 @@ -4364,8 +4364,8 @@ _0807647C: pop {r0} bx r0 .align 2, 0 -_0807648C: .4byte gUnknown_202063C -_08076490: .4byte gUnknown_2021BCC +_0807648C: .4byte gSprites +_08076490: .4byte gOamMatrices thumb_func_end sub_8076440 thumb_func_start sub_8076494 @@ -4382,7 +4382,7 @@ sub_8076494: @ 8076494 lsrs r0, 15 movs r1, 0x40 subs r5, r1, r0 - ldr r1, _080764E4 @ =gUnknown_202063C + ldr r1, _080764E4 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4391,7 +4391,7 @@ sub_8076494: @ 8076494 lsls r1, 26 lsrs r1, 27 lsls r0, r5, 8 - ldr r2, _080764E8 @ =gUnknown_2021BCC + ldr r2, _080764E8 @ =gOamMatrices lsls r1, 3 adds r1, r2 movs r2, 0x6 @@ -4410,8 +4410,8 @@ _080764D4: pop {r0} bx r0 .align 2, 0 -_080764E4: .4byte gUnknown_202063C -_080764E8: .4byte gUnknown_2021BCC +_080764E4: .4byte gSprites +_080764E8: .4byte gOamMatrices thumb_func_end sub_8076494 thumb_func_start sub_80764EC @@ -4419,7 +4419,7 @@ sub_80764EC: @ 80764EC push {r4-r6,lr} lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _08076548 @ =gUnknown_202063C + ldr r1, _08076548 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -4462,7 +4462,7 @@ _08076508: lsrs r1, r0, 16 b _0807655E .align 2, 0 -_08076548: .4byte gUnknown_202063C +_08076548: .4byte gSprites _0807654C: .4byte gUnknown_2023D44 _08076550: .4byte gUnknown_2023BCE _08076554: .4byte gUnknown_2024018 @@ -4644,7 +4644,7 @@ _08076672: bl sub_8076440 b _080766AC _0807669C: - ldr r2, _080766B4 @ =gUnknown_202063C + ldr r2, _080766B4 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -4659,7 +4659,7 @@ _080766AE: pop {r1} bx r1 .align 2, 0 -_080766B4: .4byte gUnknown_202063C +_080766B4: .4byte gSprites thumb_func_end sub_8076640 thumb_func_start sub_80766B8 @@ -4705,7 +4705,7 @@ sub_80766EC: @ 80766EC lsls r0, 24 cmp r0, 0 beq _0807672C - ldr r2, _080767E4 @ =gUnknown_202063C + ldr r2, _080767E4 @ =gSprites ldr r1, _080767E8 @ =gUnknown_2023D44 ldrb r0, [r6] adds r0, r1 @@ -4732,7 +4732,7 @@ _0807672C: lsls r0, 24 cmp r0, 0 beq _08076764 - ldr r2, _080767E4 @ =gUnknown_202063C + ldr r2, _080767E4 @ =gSprites ldr r1, _080767E8 @ =gUnknown_2023D44 mov r3, r8 ldrb r0, [r3] @@ -4760,7 +4760,7 @@ _08076764: lsls r0, 24 cmp r0, 0 beq _0807679C - ldr r2, _080767E4 @ =gUnknown_202063C + ldr r2, _080767E4 @ =gSprites ldr r1, _080767E8 @ =gUnknown_2023D44 ldrb r0, [r6] eors r0, r5 @@ -4788,7 +4788,7 @@ _0807679C: lsls r0, 24 cmp r0, 0 beq _080767D4 - ldr r2, _080767E4 @ =gUnknown_202063C + ldr r2, _080767E4 @ =gSprites ldr r1, _080767E8 @ =gUnknown_2023D44 mov r3, r8 ldrb r0, [r3] @@ -4816,7 +4816,7 @@ _080767D4: bx r0 .align 2, 0 _080767E0: .4byte gUnknown_2037F1B -_080767E4: .4byte gUnknown_202063C +_080767E4: .4byte gSprites _080767E8: .4byte gUnknown_2023D44 _080767EC: .4byte gUnknown_2037F1A thumb_func_end sub_80766EC @@ -4829,7 +4829,7 @@ sub_80767F0: @ 80767F0 ldrb r0, [r0] cmp r5, r0 bge _0807684A - ldr r6, _08076854 @ =gUnknown_202063C + ldr r6, _08076854 @ =gSprites _080767FE: lsls r0, r5, 24 lsrs r4, r0, 24 @@ -4874,7 +4874,7 @@ _0807684A: bx r0 .align 2, 0 _08076850: .4byte gUnknown_2023BCC -_08076854: .4byte gUnknown_202063C +_08076854: .4byte gSprites _08076858: .4byte gUnknown_2023D44 thumb_func_end sub_80767F0 @@ -5643,7 +5643,7 @@ sub_8076E34: @ 8076E34 sub sp, 0x4 lsls r6, r1, 24 lsrs r6, 24 - ldr r0, _08076ECC @ =nullsub_8 + ldr r0, _08076ECC @ =SpriteCallbackDummy mov r10, r0 bl CreateInvisibleSpriteWithCallback mov r8, r0 @@ -5651,7 +5651,7 @@ sub_8076E34: @ 8076E34 lsls r0, 24 lsrs r0, 24 mov r8, r0 - ldr r0, _08076ED0 @ =gUnknown_202063C + ldr r0, _08076ED0 @ =gSprites mov r9, r0 mov r0, r8 lsls r3, r0, 4 @@ -5709,8 +5709,8 @@ sub_8076E34: @ 8076E34 pop {r1} bx r1 .align 2, 0 -_08076ECC: .4byte nullsub_8 -_08076ED0: .4byte gUnknown_202063C +_08076ECC: .4byte SpriteCallbackDummy +_08076ED0: .4byte gSprites _08076ED4: .4byte 0xfffffc00 thumb_func_end sub_8076E34 @@ -5913,7 +5913,7 @@ _08077064: strh r1, [r5, 0xA] strh r6, [r5, 0xC] strh r6, [r5, 0xE] - ldr r4, _080770CC @ =gUnknown_202063C + ldr r4, _080770CC @ =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -5960,7 +5960,7 @@ _080770C0: .align 2, 0 _080770C4: .4byte gUnknown_3005090 _080770C8: .4byte gUnknown_2037F1A -_080770CC: .4byte gUnknown_202063C +_080770CC: .4byte gSprites _080770D0: .4byte 0x00002771 _080770D4: movs r0, 0x3 @@ -6022,7 +6022,7 @@ _08077146: adds r0, r4, 0 adds r1, r5, 0 bl sub_80771E4 - ldr r2, _08077178 @ =gUnknown_202063C + ldr r2, _08077178 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6043,12 +6043,12 @@ _08077146: strh r1, [r4, 0xE] b _080771B6 .align 2, 0 -_08077178: .4byte gUnknown_202063C +_08077178: .4byte gSprites _0807717C: adds r0, r4, 0 adds r1, r5, 0 bl sub_80771E4 - ldr r3, _080771C0 @ =gUnknown_202063C + ldr r3, _080771C0 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6079,7 +6079,7 @@ _080771B6: strh r0, [r4, 0xC] b _080771D8 .align 2, 0 -_080771C0: .4byte gUnknown_202063C +_080771C0: .4byte gSprites _080771C4: movs r2, 0x12 ldrsh r0, [r4, r2] @@ -6113,7 +6113,7 @@ sub_80771E4: @ 80771E4 asrs r0, 16 cmp r0, 0 blt _08077254 - ldr r5, _08077260 @ =gUnknown_202063C + ldr r5, _08077260 @ =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -6161,7 +6161,7 @@ _08077254: pop {r0} bx r0 .align 2, 0 -_08077260: .4byte gUnknown_202063C +_08077260: .4byte gSprites _08077264: .4byte sub_8077268 thumb_func_end sub_80771E4 diff --git a/asm/battle_anim_8078178.s b/asm/battle_anim_8078178.s index e67c77dd0..f9bad22dd 100644 --- a/asm/battle_anim_8078178.s +++ b/asm/battle_anim_8078178.s @@ -42,7 +42,7 @@ sub_8078178: @ 8078178 strh r0, [r1, 0xA] movs r5, 0 lsls r0, r6, 4 - ldr r7, _08078230 @ =gUnknown_202063C + ldr r7, _08078230 @ =gSprites adds r0, r6 lsls r0, 2 adds r6, r0, r7 @@ -93,7 +93,7 @@ _08078220: .4byte sub_80782BC _08078224: .4byte gUnknown_83AD048 _08078228: .4byte gUnknown_83AD950 _0807822C: .4byte gUnknown_3005090 -_08078230: .4byte gUnknown_202063C +_08078230: .4byte gSprites _08078234: .4byte gUnknown_83BF574 _08078238: movs r0, 0xF8 @@ -101,7 +101,7 @@ _08078238: strh r0, [r1, 0xA] movs r5, 0 lsls r0, r6, 4 - ldr r7, _080782B4 @ =gUnknown_202063C + ldr r7, _080782B4 @ =gSprites adds r0, r6 lsls r0, 2 adds r6, r0, r7 @@ -146,7 +146,7 @@ _0807828E: cmp r5, 0x9 bls _0807824A _08078298: - ldr r0, _080782B4 @ =gUnknown_202063C + ldr r0, _080782B4 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -160,7 +160,7 @@ _08078298: pop {r1} bx r1 .align 2, 0 -_080782B4: .4byte gUnknown_202063C +_080782B4: .4byte gSprites _080782B8: .4byte gUnknown_83BF574 thumb_func_end sub_8078178 @@ -390,7 +390,7 @@ _0807843A: ldr r1, _080784C4 @ =0xffff0000 cmp r0, r1 bne _08078484 - ldr r1, _080784C8 @ =gUnknown_202063C + ldr r1, _080784C8 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -404,7 +404,7 @@ _08078484: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080784C8 @ =gUnknown_202063C + ldr r1, _080784C8 @ =gSprites adds r0, r1 ldr r1, _080784CC @ =gUnknown_83BF554 bl SetSubspriteTables @@ -427,7 +427,7 @@ _080784B8: .4byte 0xfffa0000 _080784BC: .4byte gUnknown_83BF55C _080784C0: .4byte 0x0000271a _080784C4: .4byte 0xffff0000 -_080784C8: .4byte gUnknown_202063C +_080784C8: .4byte gSprites _080784CC: .4byte gUnknown_83BF554 _080784D0: .4byte gUnknown_3005090 _080784D4: .4byte sub_80784D8 @@ -629,7 +629,7 @@ sub_807862C: @ 807862C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08078670 @ =gUnknown_202063C + ldr r0, _08078670 @ =gSprites adds r4, r0 adds r0, r4, 0 bl FreeSpriteOamMatrix @@ -638,7 +638,7 @@ sub_807862C: @ 807862C b _0807868E .align 2, 0 _0807866C: .4byte gUnknown_3005090 -_08078670: .4byte gUnknown_202063C +_08078670: .4byte gSprites _08078674: cmp r0, 0x27 bne _0807868E diff --git a/asm/battle_anim_80989F8.s b/asm/battle_anim_80989F8.s index 2128e322f..b63d133e2 100644 --- a/asm/battle_anim_80989F8.s +++ b/asm/battle_anim_80989F8.s @@ -23,7 +23,7 @@ sub_80989F8: @ 80989F8 .align 2, 0 _08098A18: .4byte gUnknown_2037F02 _08098A1C: - ldr r1, _08098A60 @ =gUnknown_202063C + ldr r1, _08098A60 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -57,7 +57,7 @@ _08098A58: pop {r0} bx r0 .align 2, 0 -_08098A60: .4byte gUnknown_202063C +_08098A60: .4byte gSprites _08098A64: .4byte gUnknown_3005090 _08098A68: .4byte sub_8098A6C thumb_func_end sub_80989F8 @@ -78,7 +78,7 @@ sub_8098A6C: @ 8098A6C adds r7, r1, 0 cmp r5, 0 bne _08098B12 - ldr r2, _08098AAC @ =gUnknown_202063C + ldr r2, _08098AAC @ =gSprites movs r6, 0x8 ldrsh r1, [r3, r6] lsls r0, r1, 4 @@ -95,7 +95,7 @@ sub_8098A6C: @ 8098A6C b _08098AB2 .align 2, 0 _08098AA8: .4byte gUnknown_3005090 -_08098AAC: .4byte gUnknown_202063C +_08098AAC: .4byte gSprites _08098AB0: strh r5, [r1, 0x24] _08098AB2: @@ -240,7 +240,7 @@ _08098BA2: _08098BAC: .4byte gUnknown_2023D44 _08098BB0: .4byte gUnknown_2037F1A _08098BB4: - ldr r1, _08098BF8 @ =gUnknown_202063C + ldr r1, _08098BF8 @ =gSprites lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -275,7 +275,7 @@ _08098BF2: pop {r0} bx r0 .align 2, 0 -_08098BF8: .4byte gUnknown_202063C +_08098BF8: .4byte gSprites _08098BFC: .4byte gUnknown_2037F02 _08098C00: .4byte gUnknown_3005090 _08098C04: .4byte sub_8098C08 @@ -299,7 +299,7 @@ sub_8098C08: @ 8098C08 mov r12, r1 cmp r0, 0 bne _08098CC0 - ldr r2, _08098C50 @ =gUnknown_202063C + ldr r2, _08098C50 @ =gSprites movs r7, 0x8 ldrsh r1, [r3, r7] lsls r0, r1, 4 @@ -319,7 +319,7 @@ sub_8098C08: @ 8098C08 b _08098C56 .align 2, 0 _08098C4C: .4byte gUnknown_3005090 -_08098C50: .4byte gUnknown_202063C +_08098C50: .4byte gSprites _08098C54: strh r5, [r4, 0x24] _08098C56: @@ -406,7 +406,7 @@ sub_8098CD0: @ 8098CD0 .align 2, 0 _08098CF0: .4byte gUnknown_2037F02 _08098CF4: - ldr r0, _08098D48 @ =gUnknown_202063C + ldr r0, _08098D48 @ =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -449,7 +449,7 @@ _08098D42: pop {r0} bx r0 .align 2, 0 -_08098D48: .4byte gUnknown_202063C +_08098D48: .4byte gSprites _08098D4C: .4byte gUnknown_3005090 _08098D50: .4byte sub_8098D54 thumb_func_end sub_8098CD0 @@ -477,7 +477,7 @@ _08098D72: ands r0, r1 cmp r0, 0 beq _08098DB4 - ldr r2, _08098DB0 @ =gUnknown_202063C + ldr r2, _08098DB0 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -502,9 +502,9 @@ _08098D72: b _08098DDE .align 2, 0 _08098DAC: .4byte gUnknown_3005090 -_08098DB0: .4byte gUnknown_202063C +_08098DB0: .4byte gSprites _08098DB4: - ldr r3, _08098E40 @ =gUnknown_202063C + ldr r3, _08098E40 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -575,7 +575,7 @@ _08098DDE: strh r0, [r1, 0x26] b _08098E7C .align 2, 0 -_08098E40: .4byte gUnknown_202063C +_08098E40: .4byte gSprites _08098E44: movs r6, 0x8 ldrsh r0, [r4, r6] @@ -629,7 +629,7 @@ sub_8098E90: @ 8098E90 bl GetAnimBankSpriteId lsls r0, 24 lsrs r0, 24 - ldr r2, _08098EE4 @ =gUnknown_202063C + ldr r2, _08098EE4 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -659,7 +659,7 @@ sub_8098E90: @ 8098E90 bx r0 .align 2, 0 _08098EE0: .4byte gUnknown_2037F02 -_08098EE4: .4byte gUnknown_202063C +_08098EE4: .4byte gSprites _08098EE8: .4byte gUnknown_3005090 _08098EEC: .4byte sub_8098EF0 thumb_func_end sub_8098E90 @@ -684,7 +684,7 @@ sub_8098EF0: @ 8098EF0 lsls r1, 16 asrs r1, 16 mov r12, r2 - ldr r7, _08098F80 @ =gUnknown_202063C + ldr r7, _08098F80 @ =gSprites cmp r0, r1 bne _08098F42 movs r0, 0 @@ -739,7 +739,7 @@ _08098F74: bx r0 .align 2, 0 _08098F7C: .4byte gUnknown_3005090 -_08098F80: .4byte gUnknown_202063C +_08098F80: .4byte gSprites thumb_func_end sub_8098EF0 thumb_func_start sub_8098F84 @@ -826,7 +826,7 @@ sub_8099004: @ 8099004 movs r2, 0xA ldrsh r1, [r5, r2] bl Sin - ldr r2, _08099078 @ =gUnknown_202063C + ldr r2, _08099078 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -868,7 +868,7 @@ _0809906E: bx r0 .align 2, 0 _08099074: .4byte gUnknown_3005090 -_08099078: .4byte gUnknown_202063C +_08099078: .4byte gSprites thumb_func_end sub_8099004 thumb_func_start sub_809907C @@ -1055,7 +1055,7 @@ _080991DC: ldrh r0, [r5, 0x4] movs r3, 0 strh r0, [r6, 0x2E] - ldr r0, _08099248 @ =gUnknown_202063C + ldr r0, _08099248 @ =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -1098,7 +1098,7 @@ _080991DC: _0809923C: .4byte gUnknown_2023D44 _08099240: .4byte gUnknown_2037F1B _08099244: .4byte gUnknown_2037F02 -_08099248: .4byte gUnknown_202063C +_08099248: .4byte gSprites _0809924C: cmp r0, 0x2 bne _08099252 @@ -1133,7 +1133,7 @@ sub_8099270: @ 8099270 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080992AC @ =gUnknown_202063C + ldr r0, _080992AC @ =gSprites adds r3, r1, r0 ldrh r0, [r2, 0x2E] movs r6, 0x2E @@ -1155,7 +1155,7 @@ _080992A4: bl DestroyAnimSprite b _080992DA .align 2, 0 -_080992AC: .4byte gUnknown_202063C +_080992AC: .4byte gSprites _080992B0: subs r0, 0x1 strh r0, [r2, 0x2E] @@ -1226,7 +1226,7 @@ _08099328: ldrh r0, [r2, 0x8] movs r4, 0 strh r0, [r5, 0x2E] - ldr r0, _08099388 @ =gUnknown_202063C + ldr r0, _08099388 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -1266,7 +1266,7 @@ _08099328: _0809937C: .4byte gUnknown_2037F1B _08099380: .4byte gUnknown_2023D44 _08099384: .4byte gUnknown_2037F02 -_08099388: .4byte gUnknown_202063C +_08099388: .4byte gSprites _0809938C: .4byte DestroyAnimSprite _08099390: .4byte sub_8074E14 thumb_func_end sub_80992E0 @@ -1318,7 +1318,7 @@ _080993E8: ldr r5, _08099444 @ =gUnknown_2037F02 ldrh r0, [r5, 0x8] strh r0, [r6, 0x2E] - ldr r0, _08099448 @ =gUnknown_202063C + ldr r0, _08099448 @ =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -1359,7 +1359,7 @@ _080993E8: _0809943C: .4byte gUnknown_2037F1B _08099440: .4byte gUnknown_2023D44 _08099444: .4byte gUnknown_2037F02 -_08099448: .4byte gUnknown_202063C +_08099448: .4byte gSprites _0809944C: .4byte DestroyAnimSprite _08099450: ldr r1, _08099464 @ =sub_809946C @@ -1379,7 +1379,7 @@ _08099468: .4byte sub_8074E14 thumb_func_start sub_809946C sub_809946C: @ 809946C push {r4,lr} - ldr r4, _08099498 @ =gUnknown_202063C + ldr r4, _08099498 @ =gSprites movs r1, 0x38 ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -1400,7 +1400,7 @@ sub_809946C: @ 809946C pop {r0} bx r0 .align 2, 0 -_08099498: .4byte gUnknown_202063C +_08099498: .4byte gSprites thumb_func_end sub_809946C thumb_func_start sub_809949C @@ -1489,7 +1489,7 @@ sub_8099530: @ 8099530 ldrh r2, [r5, 0x1E] adds r0, r2 strh r0, [r5, 0x1E] - ldr r2, _0809958C @ =gUnknown_202063C + ldr r2, _0809958C @ =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -1521,7 +1521,7 @@ _08099580: bx r0 .align 2, 0 _08099588: .4byte gUnknown_3005090 -_0809958C: .4byte gUnknown_202063C +_0809958C: .4byte gSprites _08099590: .4byte sub_8099594 thumb_func_end sub_8099530 @@ -1552,7 +1552,7 @@ _080995BC: ldrh r1, [r4, 0x20] adds r2, r1 strh r2, [r4, 0x20] - ldr r3, _080995F8 @ =gUnknown_202063C + ldr r3, _080995F8 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1577,7 +1577,7 @@ _080995F0: pop {r0} bx r0 .align 2, 0 -_080995F8: .4byte gUnknown_202063C +_080995F8: .4byte gSprites thumb_func_end sub_8099594 thumb_func_start sub_80995FC @@ -1686,7 +1686,7 @@ sub_80996B8: @ 80996B8 lsls r1, 3 adds r1, r0 ldrb r2, [r1, 0x8] - ldr r3, _08099700 @ =gUnknown_202063C + ldr r3, _08099700 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -1713,7 +1713,7 @@ _080996F6: bx r0 .align 2, 0 _080996FC: .4byte gUnknown_3005090 -_08099700: .4byte gUnknown_202063C +_08099700: .4byte gSprites thumb_func_end sub_80996B8 thumb_func_start sub_8099704 @@ -1815,7 +1815,7 @@ sub_8099788: @ 8099788 ldrsh r0, [r4, r1] cmp r0, 0 bne _080997E0 - ldr r0, _080997DC @ =gUnknown_202063C + ldr r0, _080997DC @ =gSprites lsls r2, r7, 4 adds r1, r2, r7 lsls r1, 2 @@ -1826,14 +1826,14 @@ sub_8099788: @ 8099788 b _08099826 .align 2, 0 _080997D8: .4byte gUnknown_3005090 -_080997DC: .4byte gUnknown_202063C +_080997DC: .4byte gSprites _080997E0: ldrb r0, [r4, 0x12] bl GetBankSide lsls r0, 24 cmp r0, 0 bne _08099808 - ldr r1, _08099804 @ =gUnknown_202063C + ldr r1, _08099804 @ =gSprites lsls r2, r7, 4 adds r0, r2, r7 lsls r0, 2 @@ -1846,9 +1846,9 @@ _080997E0: bge _08099824 b _08099822 .align 2, 0 -_08099804: .4byte gUnknown_202063C +_08099804: .4byte gSprites _08099808: - ldr r1, _080998A8 @ =gUnknown_202063C + ldr r1, _080998A8 @ =gSprites lsls r2, r7, 4 adds r0, r2, r7 lsls r0, 2 @@ -1934,7 +1934,7 @@ _0809989C: pop {r0} bx r0 .align 2, 0 -_080998A8: .4byte gUnknown_202063C +_080998A8: .4byte gSprites _080998AC: .4byte gUnknown_3005090 thumb_func_end sub_8099788 @@ -2428,7 +2428,7 @@ _08099C3A: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x16] - ldr r2, _08099CB0 @ =gUnknown_202063C + ldr r2, _08099CB0 @ =gSprites movs r0, 0x16 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -2459,7 +2459,7 @@ _08099C3A: .align 2, 0 _08099CA8: .4byte gUnknown_3005090 _08099CAC: .4byte gUnknown_2037EE8 -_08099CB0: .4byte gUnknown_202063C +_08099CB0: .4byte gSprites _08099CB4: .4byte sub_8099CB8 thumb_func_end sub_8099BD4 @@ -2495,7 +2495,7 @@ sub_8099CB8: @ 8099CB8 beq _08099D2A cmp r1, 0 beq _08099D14 - ldr r2, _08099D10 @ =gUnknown_202063C + ldr r2, _08099D10 @ =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -2508,9 +2508,9 @@ sub_8099CB8: @ 8099CB8 b _08099D28 .align 2, 0 _08099D0C: .4byte gUnknown_3005090 -_08099D10: .4byte gUnknown_202063C +_08099D10: .4byte gSprites _08099D14: - ldr r2, _08099D50 @ =gUnknown_202063C + ldr r2, _08099D50 @ =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -2531,7 +2531,7 @@ _08099D2A: ldrsh r4, [r3, r2] cmp r4, 0 beq _08099D54 - ldr r2, _08099D50 @ =gUnknown_202063C + ldr r2, _08099D50 @ =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -2542,9 +2542,9 @@ _08099D2A: strh r1, [r0, 0x26] b _08099D64 .align 2, 0 -_08099D50: .4byte gUnknown_202063C +_08099D50: .4byte gSprites _08099D54: - ldr r2, _08099D9C @ =gUnknown_202063C + ldr r2, _08099D9C @ =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -2560,7 +2560,7 @@ _08099D64: asrs r4, r0, 16 cmp r4, 0 bne _08099D96 - ldr r2, _08099D9C @ =gUnknown_202063C + ldr r2, _08099D9C @ =gSprites movs r0, 0x16 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -2582,7 +2582,7 @@ _08099D96: pop {r0} bx r0 .align 2, 0 -_08099D9C: .4byte gUnknown_202063C +_08099D9C: .4byte gSprites thumb_func_end sub_8099CB8 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 1d5e34fbd..143d2fb8a 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -1590,7 +1590,7 @@ sub_80A2F0C: @ 80A2F0C bl GetAnimBankSpriteId lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080A2F38 @ =gUnknown_202063C + ldr r1, _080A2F38 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -1604,7 +1604,7 @@ sub_80A2F0C: @ 80A2F0C bl DestroyAnimVisualTask b _080A2F62 .align 2, 0 -_080A2F38: .4byte gUnknown_202063C +_080A2F38: .4byte gSprites _080A2F3C: adds r0, r2, 0 movs r1, 0x1 @@ -1654,7 +1654,7 @@ sub_80A2F74: @ 80A2F74 ldrh r0, [r4, 0x1C] adds r1, r0 strh r1, [r4, 0x1C] - ldr r2, _080A2FF8 @ =gUnknown_202063C + ldr r2, _080A2FF8 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1699,7 +1699,7 @@ _080A2FEC: bx r0 .align 2, 0 _080A2FF4: .4byte gUnknown_3005090 -_080A2FF8: .4byte gUnknown_202063C +_080A2FF8: .4byte gSprites _080A2FFC: .4byte gUnknown_2037F1B _080A3000: .4byte sub_80A3004 thumb_func_end sub_80A2F74 @@ -1731,7 +1731,7 @@ sub_80A3004: @ 80A3004 lsrs r4, 24 adds r0, r4, 0 bl sub_8075980 - ldr r1, _080A305C @ =gUnknown_202063C + ldr r1, _080A305C @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1746,7 +1746,7 @@ sub_80A3004: @ 80A3004 _080A3050: .4byte gUnknown_2037F02 _080A3054: .4byte 0x0000ffff _080A3058: .4byte gUnknown_3005090 -_080A305C: .4byte gUnknown_202063C +_080A305C: .4byte gSprites _080A3060: ldr r1, _080A3094 @ =gUnknown_3005090 lsls r2, r3, 2 @@ -3058,7 +3058,7 @@ _080A3A28: adds r0, r6, 0 bl DestroyAnimVisualTask _080A3A60: - ldr r4, _080A3B20 @ =gUnknown_202063C + ldr r4, _080A3B20 @ =gSprites movs r0, 0xC ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -3149,7 +3149,7 @@ _080A3A60: _080A3B14: .4byte gUnknown_3005090 _080A3B18: .4byte gUnknown_2037F1B _080A3B1C: .4byte gUnknown_83E2FF0 -_080A3B20: .4byte gUnknown_202063C +_080A3B20: .4byte gSprites _080A3B24: .4byte sub_80A3B28 thumb_func_end sub_80A39C0 @@ -3168,7 +3168,7 @@ sub_80A3B28: @ 80A3B28 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080A3B70 @ =gUnknown_202063C + ldr r1, _080A3B70 @ =gSprites adds r4, r0, r1 movs r1, 0x8 ldrsh r5, [r6, r1] @@ -3193,7 +3193,7 @@ _080A3B5A: b _080A3EFC .align 2, 0 _080A3B6C: .4byte gUnknown_3005090 -_080A3B70: .4byte gUnknown_202063C +_080A3B70: .4byte gSprites _080A3B74: cmp r5, 0x5 bne _080A3B7A @@ -3684,7 +3684,7 @@ sub_80A3F24: @ 80A3F24 ble _080A3FBA movs r0, 0 strh r0, [r6, 0x24] - ldr r0, _080A3FC4 @ =gUnknown_202063C + ldr r0, _080A3FC4 @ =gSprites mov r8, r0 movs r2, 0xC ldrsh r1, [r6, r2] @@ -3750,7 +3750,7 @@ _080A3FBA: pop {r0} bx r0 .align 2, 0 -_080A3FC4: .4byte gUnknown_202063C +_080A3FC4: .4byte gSprites _080A3FC8: .4byte gUnknown_83E2FF0 _080A3FCC: .4byte gUnknown_3005090 _080A3FD0: .4byte sub_80A3FD4 @@ -4750,7 +4750,7 @@ sub_80A4738: @ 80A4738 adds r0, r2, 0 ands r0, r1 strb r0, [r3] - ldr r4, _080A4790 @ =gUnknown_202063C + ldr r4, _080A4790 @ =gSprites movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -4774,7 +4774,7 @@ sub_80A4738: @ 80A4738 strb r2, [r0] b _080A47CA .align 2, 0 -_080A4790: .4byte gUnknown_202063C +_080A4790: .4byte gSprites _080A4794: adds r1, r5, 0 adds r1, 0x3E @@ -4782,7 +4782,7 @@ _080A4794: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r3, _080A47D8 @ =gUnknown_202063C + ldr r3, _080A47D8 @ =gSprites movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -4811,7 +4811,7 @@ _080A47CA: strh r0, [r5, 0x34] b _080A47E0 .align 2, 0 -_080A47D8: .4byte gUnknown_202063C +_080A47D8: .4byte gSprites _080A47DC: adds r0, r1, 0x1 strh r0, [r5, 0x32] @@ -4825,7 +4825,7 @@ _080A47E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080A4818 @ =gUnknown_202063C + ldr r4, _080A4818 @ =gSprites adds r0, r4 bl DestroySprite movs r0, 0x30 @@ -4842,7 +4842,7 @@ _080A4810: pop {r0} bx r0 .align 2, 0 -_080A4818: .4byte gUnknown_202063C +_080A4818: .4byte gSprites thumb_func_end sub_80A4738 thumb_func_start sub_80A481C @@ -6911,7 +6911,7 @@ _080A579E: _080A57C4: movs r0, 0x8 strh r0, [r4, 0xE] - ldr r2, _080A57F4 @ =gUnknown_202063C + ldr r2, _080A57F4 @ =gSprites movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -6934,7 +6934,7 @@ _080A57EA: strh r0, [r4, 0x14] b _080A58A8 .align 2, 0 -_080A57F4: .4byte gUnknown_202063C +_080A57F4: .4byte gSprites _080A57F8: ldrh r2, [r4, 0xE] movs r3, 0xE @@ -6954,7 +6954,7 @@ _080A5812: ands r0, r2 cmp r0, 0 beq _080A5834 - ldr r2, _080A5830 @ =gUnknown_202063C + ldr r2, _080A5830 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6966,9 +6966,9 @@ _080A5812: adds r1, r2 b _080A5848 .align 2, 0 -_080A5830: .4byte gUnknown_202063C +_080A5830: .4byte gSprites _080A5834: - ldr r2, _080A5850 @ =gUnknown_202063C + ldr r2, _080A5850 @ =gSprites movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -6984,9 +6984,9 @@ _080A5848: strh r0, [r4, 0x14] b _080A58D4 .align 2, 0 -_080A5850: .4byte gUnknown_202063C +_080A5850: .4byte gSprites _080A5854: - ldr r2, _080A586C @ =gUnknown_202063C + ldr r2, _080A586C @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6999,7 +6999,7 @@ _080A5854: strh r0, [r4, 0xE] b _080A58A8 .align 2, 0 -_080A586C: .4byte gUnknown_202063C +_080A586C: .4byte gSprites _080A5870: ldrh r1, [r4, 0xE] movs r2, 0xE @@ -7012,7 +7012,7 @@ _080A5870: _080A5880: movs r0, 0x3 strh r0, [r4, 0xE] - ldr r2, _080A58B0 @ =gUnknown_202063C + ldr r2, _080A58B0 @ =gSprites movs r3, 0x8 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -7037,7 +7037,7 @@ _080A58A8: strh r0, [r4, 0xC] b _080A58E6 .align 2, 0 -_080A58B0: .4byte gUnknown_202063C +_080A58B0: .4byte gSprites _080A58B4: movs r3, 0xE ldrsh r0, [r4, r3] @@ -7048,7 +7048,7 @@ _080A58B4: adds r2, r0 _080A58C2: strh r2, [r4, 0x10] - ldr r3, _080A58DC @ =gUnknown_202063C + ldr r3, _080A58DC @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -7062,7 +7062,7 @@ _080A58D4: strh r0, [r4, 0xE] b _080A58E6 .align 2, 0 -_080A58DC: .4byte gUnknown_202063C +_080A58DC: .4byte gSprites _080A58E0: adds r0, r2, 0 bl DestroyAnimVisualTask @@ -8225,7 +8225,7 @@ _080A6194: cmp r0, 0 bne _080A6232 movs r2, 0 - ldr r3, _080A61E0 @ =gUnknown_202063C + ldr r3, _080A61E0 @ =gSprites movs r5, 0x14 adds r5, r3 mov r12, r5 @@ -8258,7 +8258,7 @@ _080A61CA: b _080A6214 .align 2, 0 _080A61DC: .4byte gUnknown_2037AB8 -_080A61E0: .4byte gUnknown_202063C +_080A61E0: .4byte gSprites _080A61E4: .4byte gUnknown_83E3734 _080A61E8: .4byte gUnknown_83E3764 _080A61EC: @@ -8522,7 +8522,7 @@ sub_80A63B4: @ 80A63B4 lsls r1, 17 adds r0, r1 lsrs r3, r0, 16 - ldr r2, _080A644C @ =gUnknown_202063C + ldr r2, _080A644C @ =gSprites movs r0, 0x8 ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -8557,7 +8557,7 @@ _080A640C: movs r0, 0 strh r0, [r6, 0xE] movs r5, 0 - ldr r7, _080A644C @ =gUnknown_202063C + ldr r7, _080A644C @ =gSprites movs r1, 0x1C adds r1, r7 mov r9, r1 @@ -8565,7 +8565,7 @@ _080A640C: .align 2, 0 _080A6444: .4byte gUnknown_3005090 _080A6448: .4byte 0x00002771 -_080A644C: .4byte gUnknown_202063C +_080A644C: .4byte gSprites _080A6450: .4byte gUnknown_20371F8 _080A6454: lsls r2, r0, 4 @@ -10013,7 +10013,7 @@ _080A6F38: sub_80A6F3C: @ 80A6F3C push {r4,lr} adds r4, r0, 0 - ldr r3, _080A6F88 @ =gUnknown_202063C + ldr r3, _080A6F88 @ =gSprites movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -10049,7 +10049,7 @@ _080A6F7A: pop {r0} bx r0 .align 2, 0 -_080A6F88: .4byte gUnknown_202063C +_080A6F88: .4byte gSprites thumb_func_end sub_80A6F3C thumb_func_start sub_80A6F8C @@ -10275,7 +10275,7 @@ _080A7126: ldrh r0, [r1, 0x8] adds r0, 0xB0 strh r0, [r1, 0x8] - ldr r1, _080A715C @ =gUnknown_202063C + ldr r1, _080A715C @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -10285,7 +10285,7 @@ _080A7126: b _080A718A .align 2, 0 _080A7158: .4byte gUnknown_3005090 -_080A715C: .4byte gUnknown_202063C +_080A715C: .4byte gSprites _080A7160: cmp r0, 0x1 bne _080A7176 @@ -10302,7 +10302,7 @@ _080A7176: ldrh r0, [r1, 0x8] subs r0, 0xB0 strh r0, [r1, 0x8] - ldr r1, _080A71C4 @ =gUnknown_202063C + ldr r1, _080A71C4 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -10337,7 +10337,7 @@ _080A71AA: bl DestroyAnimVisualTask b _080A71D0 .align 2, 0 -_080A71C4: .4byte gUnknown_202063C +_080A71C4: .4byte gSprites _080A71C8: .4byte gUnknown_3005090 _080A71CC: adds r0, r2, 0x1 @@ -10932,7 +10932,7 @@ sub_80A760C: @ 80A760C lsls r0, 4 add r0, r12 lsls r0, 2 - ldr r1, _080A7668 @ =gUnknown_202063C + ldr r1, _080A7668 @ =gSprites adds r6, r0, r1 movs r1, 0x10 ldrsh r0, [r5, r1] @@ -10944,7 +10944,7 @@ sub_80A760C: @ 80A760C .align 2, 0 _080A7660: .4byte gUnknown_3005090 _080A7664: .4byte gUnknown_83E3C28 -_080A7668: .4byte gUnknown_202063C +_080A7668: .4byte gSprites _080A766C: ldrb r2, [r6, 0x3] lsls r1, r2, 26 @@ -12138,7 +12138,7 @@ sub_80A7FB0: @ 80A7FB0 movs r2, 0xD0 movs r3, 0 bl obj_id_set_rotscale - ldr r1, _080A8008 @ =gUnknown_202063C + ldr r1, _080A8008 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -12161,7 +12161,7 @@ sub_80A7FB0: @ 80A7FB0 pop {r0} bx r0 .align 2, 0 -_080A8008: .4byte gUnknown_202063C +_080A8008: .4byte gSprites _080A800C: .4byte gUnknown_3005090 _080A8010: .4byte sub_80A8014 thumb_func_end sub_80A7FB0 @@ -12192,7 +12192,7 @@ sub_80A8014: @ 80A8014 lsrs r4, 24 adds r0, r4, 0 bl sub_8075980 - ldr r1, _080A8070 @ =gUnknown_202063C + ldr r1, _080A8070 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -12210,7 +12210,7 @@ _080A8064: bx r0 .align 2, 0 _080A806C: .4byte gUnknown_3005090 -_080A8070: .4byte gUnknown_202063C +_080A8070: .4byte gSprites thumb_func_end sub_80A8014 thumb_func_start sub_80A8074 @@ -12394,7 +12394,7 @@ _080A81D0: _080A81D8: ldrb r0, [r4, 0x8] bl sub_8075980 - ldr r2, _080A81FC @ =gUnknown_202063C + ldr r2, _080A81FC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12410,7 +12410,7 @@ _080A81F6: pop {r0} bx r0 .align 2, 0 -_080A81FC: .4byte gUnknown_202063C +_080A81FC: .4byte gSprites thumb_func_end sub_80A80CC thumb_func_start sub_80A8200 @@ -12440,14 +12440,14 @@ sub_80A8200: @ 80A8200 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080A8240 @ =gUnknown_202063C + ldr r1, _080A8240 @ =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram b _080A82DA .align 2, 0 -_080A8240: .4byte gUnknown_202063C +_080A8240: .4byte gSprites _080A8244: - ldr r5, _080A82E8 @ =gUnknown_202063C + ldr r5, _080A82E8 @ =gSprites lsls r3, r4, 4 adds r3, r4 lsls r3, 2 @@ -12528,7 +12528,7 @@ _080A82DA: pop {r0} bx r0 .align 2, 0 -_080A82E8: .4byte gUnknown_202063C +_080A82E8: .4byte gSprites _080A82EC: .4byte sub_80A82F0 thumb_func_end sub_80A8200 @@ -12652,7 +12652,7 @@ _080A83CA: ldrh r2, [r4, 0x10] adds r2, 0x3 strh r2, [r4, 0x10] - ldr r3, _080A83FC @ =gUnknown_202063C + ldr r3, _080A83FC @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12672,11 +12672,11 @@ _080A83CA: strh r5, [r4, 0xE] b _080A845C .align 2, 0 -_080A83FC: .4byte gUnknown_202063C +_080A83FC: .4byte gSprites _080A8400: adds r0, r4, 0 bl sub_8076308 - ldr r2, _080A8430 @ =gUnknown_202063C + ldr r2, _080A8430 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12698,13 +12698,13 @@ _080A8400: strh r0, [r4, 0xE] b _080A845C .align 2, 0 -_080A8430: .4byte gUnknown_202063C +_080A8430: .4byte gSprites _080A8434: movs r1, 0x10 ldrsh r0, [r4, r1] cmp r0, 0 beq _080A845C - ldr r2, _080A8458 @ =gUnknown_202063C + ldr r2, _080A8458 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12719,7 +12719,7 @@ _080A8434: strh r0, [r4, 0x10] b _080A84A8 .align 2, 0 -_080A8458: .4byte gUnknown_202063C +_080A8458: .4byte gSprites _080A845C: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -12738,7 +12738,7 @@ _080A8464: lsls r0, 16 cmp r0, 0 bne _080A849C - ldr r2, _080A8498 @ =gUnknown_202063C + ldr r2, _080A8498 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12750,7 +12750,7 @@ _080A8464: bl DestroyAnimVisualTask b _080A84A8 .align 2, 0 -_080A8498: .4byte gUnknown_202063C +_080A8498: .4byte gSprites _080A849C: ldrb r1, [r4, 0x8] ldr r2, _080A84B0 @ =gUnknown_83E3E60 @@ -13032,7 +13032,7 @@ sub_80A86A4: @ 80A86A4 strh r0, [r4, 0xE] movs r0, 0x3 strh r0, [r4, 0x10] - ldr r3, _080A871C @ =gUnknown_202063C + ldr r3, _080A871C @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -13070,7 +13070,7 @@ _080A870E: bx r0 .align 2, 0 _080A8718: .4byte gUnknown_3005090 -_080A871C: .4byte gUnknown_202063C +_080A871C: .4byte gSprites _080A8720: .4byte gUnknown_2037F1A _080A8724: .4byte sub_80A8728 thumb_func_end sub_80A86A4 @@ -13101,7 +13101,7 @@ sub_80A8728: @ 80A8728 ands r0, r1 cmp r0, 0 beq _080A8778 - ldr r2, _080A8774 @ =gUnknown_202063C + ldr r2, _080A8774 @ =gSprites movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -13114,9 +13114,9 @@ sub_80A8728: @ 80A8728 b _080A878C .align 2, 0 _080A8770: .4byte gUnknown_3005090 -_080A8774: .4byte gUnknown_202063C +_080A8774: .4byte gSprites _080A8778: - ldr r2, _080A87A0 @ =gUnknown_202063C + ldr r2, _080A87A0 @ =gSprites movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -13139,13 +13139,13 @@ _080A878E: beq _080A87AA b _080A886C .align 2, 0 -_080A87A0: .4byte gUnknown_202063C +_080A87A0: .4byte gSprites _080A87A4: cmp r0, 0x2 beq _080A880C b _080A886C _080A87AA: - ldr r2, _080A87D8 @ =gUnknown_202063C + ldr r2, _080A87D8 @ =gSprites movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -13168,9 +13168,9 @@ _080A87AA: strh r0, [r3, 0xA] b _080A886C .align 2, 0 -_080A87D8: .4byte gUnknown_202063C +_080A87D8: .4byte gSprites _080A87DC: - ldr r2, _080A8808 @ =gUnknown_202063C + ldr r2, _080A8808 @ =gSprites movs r5, 0x8 ldrsh r1, [r3, r5] lsls r0, r1, 4 @@ -13193,9 +13193,9 @@ _080A87DC: strh r0, [r3, 0xA] b _080A886C .align 2, 0 -_080A8808: .4byte gUnknown_202063C +_080A8808: .4byte gSprites _080A880C: - ldr r2, _080A8844 @ =gUnknown_202063C + ldr r2, _080A8844 @ =gSprites movs r0, 0x8 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -13224,7 +13224,7 @@ _080A880C: strh r1, [r3, 0xA] b _080A886C .align 2, 0 -_080A8844: .4byte gUnknown_202063C +_080A8844: .4byte gSprites _080A8848: ldrh r1, [r3, 0x18] movs r0, 0x1 @@ -13886,21 +13886,21 @@ _080A8D10: lsls r0, 24 cmp r0, 0 beq _080A8D5C - ldr r2, _080A8D54 @ =gUnknown_202063C + ldr r2, _080A8D54 @ =gSprites ldr r0, _080A8D58 @ =gUnknown_2023D44 adds r0, r4, r0 b _080A8DEA .align 2, 0 _080A8D50: .4byte gUnknown_2037F02 -_080A8D54: .4byte gUnknown_202063C +_080A8D54: .4byte gSprites _080A8D58: .4byte gUnknown_2023D44 _080A8D5C: - ldr r2, _080A8D64 @ =gUnknown_202063C + ldr r2, _080A8D64 @ =gSprites ldr r0, _080A8D68 @ =gUnknown_2023D44 add r0, r8 b _080A8DEA .align 2, 0 -_080A8D64: .4byte gUnknown_202063C +_080A8D64: .4byte gSprites _080A8D68: .4byte gUnknown_2023D44 _080A8D6C: adds r0, r7, 0 @@ -13926,7 +13926,7 @@ _080A8D6C: lsls r0, 24 cmp r0, 0 beq _080A8DE4 - ldr r3, _080A8DD8 @ =gUnknown_202063C + ldr r3, _080A8DD8 @ =gSprites ldr r2, _080A8DDC @ =gUnknown_2023D44 adds r0, r7, r2 ldrb r1, [r0] @@ -13953,13 +13953,13 @@ _080A8D6C: b _080A8DFA .align 2, 0 _080A8DD4: .4byte gUnknown_2037F02 -_080A8DD8: .4byte gUnknown_202063C +_080A8DD8: .4byte gSprites _080A8DDC: .4byte gUnknown_2023D44 _080A8DE0: adds r0, r6, 0 b _080A8DF4 _080A8DE4: - ldr r2, _080A8E40 @ =gUnknown_202063C + ldr r2, _080A8E40 @ =gSprites ldr r0, _080A8E44 @ =gUnknown_2023D44 adds r0, r7, r0 _080A8DEA: @@ -14005,7 +14005,7 @@ _080A8DFA: bl sub_8076D9C b _080A8E6C .align 2, 0 -_080A8E40: .4byte gUnknown_202063C +_080A8E40: .4byte gSprites _080A8E44: .4byte gUnknown_2023D44 _080A8E48: .4byte gUnknown_2037F02 _080A8E4C: @@ -14474,7 +14474,7 @@ sub_80A91B8: @ 80A91B8 lsrs r3, r0, 24 cmp r3, 0 bne _080A9202 - ldr r2, _080A920C @ =gUnknown_202063C + ldr r2, _080A920C @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -14501,7 +14501,7 @@ _080A9202: bx r0 .align 2, 0 _080A9208: .4byte gUnknown_3005090 -_080A920C: .4byte gUnknown_202063C +_080A920C: .4byte gSprites thumb_func_end sub_80A91B8 thumb_func_start sub_80A9210 @@ -14584,7 +14584,7 @@ _080A92A0: beq _080A9362 b _080A9392 _080A92AA: - ldr r2, _080A92C8 @ =gUnknown_202063C + ldr r2, _080A92C8 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -14600,7 +14600,7 @@ _080A92AA: strh r4, [r3, 0xE] b _080A935A .align 2, 0 -_080A92C8: .4byte gUnknown_202063C +_080A92C8: .4byte gSprites _080A92CC: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -14618,7 +14618,7 @@ _080A92CC: lsls r0, 16 cmp r0, 0 beq _080A9304 - ldr r2, _080A9300 @ =gUnknown_202063C + ldr r2, _080A9300 @ =gSprites movs r4, 0x26 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -14629,9 +14629,9 @@ _080A92CC: adds r1, 0x6 b _080A9316 .align 2, 0 -_080A9300: .4byte gUnknown_202063C +_080A9300: .4byte gSprites _080A9304: - ldr r2, _080A9344 @ =gUnknown_202063C + ldr r2, _080A9344 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -14665,7 +14665,7 @@ _080A9316: strh r0, [r1, 0x24] b _080A935A .align 2, 0 -_080A9344: .4byte gUnknown_202063C +_080A9344: .4byte gSprites _080A9348: ldrh r0, [r3, 0x20] subs r0, 0x1 @@ -14682,7 +14682,7 @@ _080A935A: strh r0, [r3, 0x8] b _080A9392 _080A9362: - ldr r2, _080A9398 @ =gUnknown_202063C + ldr r2, _080A9398 @ =gSprites movs r4, 0x26 ldrsh r1, [r3, r4] lsls r0, r1, 4 @@ -14710,7 +14710,7 @@ _080A9392: pop {r0} bx r0 .align 2, 0 -_080A9398: .4byte gUnknown_202063C +_080A9398: .4byte gSprites thumb_func_end sub_80A9278 thumb_func_start sub_80A939C @@ -14780,7 +14780,7 @@ sub_80A93E0: @ 80A93E0 ands r0, r1 cmp r0, 0 beq _080A943C - ldr r3, _080A9438 @ =gUnknown_202063C + ldr r3, _080A9438 @ =gSprites movs r6, 0x26 ldrsh r1, [r4, r6] lsls r0, r1, 4 @@ -14795,9 +14795,9 @@ sub_80A93E0: @ 80A93E0 b _080A9452 .align 2, 0 _080A9434: .4byte gUnknown_3005090 -_080A9438: .4byte gUnknown_202063C +_080A9438: .4byte gSprites _080A943C: - ldr r3, _080A9484 @ =gUnknown_202063C + ldr r3, _080A9484 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -14834,7 +14834,7 @@ _080A9452: strh r2, [r4, 0xE] b _080A94A6 .align 2, 0 -_080A9484: .4byte gUnknown_202063C +_080A9484: .4byte gSprites _080A9488: movs r0, 0x26 ldrsh r1, [r4, r0] @@ -15004,7 +15004,7 @@ _080A959E: lsrs r2, r0, 24 cmp r2, 0x40 beq _080A9642 - ldr r0, _080A962C @ =gUnknown_202063C + ldr r0, _080A962C @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -15054,7 +15054,7 @@ _080A959E: b _080A9642 .align 2, 0 _080A9628: .4byte gUnknown_83E4154 -_080A962C: .4byte gUnknown_202063C +_080A962C: .4byte gSprites _080A9630: .4byte gUnknown_83E416C _080A9634: movs r1, 0x22 @@ -15583,7 +15583,7 @@ sub_80A9A20: @ 80A9A20 ldr r2, _080A9A74 @ =gUnknown_83E4200 adds r0, r5, 0 bl sub_80762D0 - ldr r1, _080A9A78 @ =gUnknown_202063C + ldr r1, _080A9A78 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -15594,9 +15594,9 @@ sub_80A9A20: @ 80A9A20 .align 2, 0 _080A9A70: .4byte gUnknown_3005090 _080A9A74: .4byte gUnknown_83E4200 -_080A9A78: .4byte gUnknown_202063C +_080A9A78: .4byte gSprites _080A9A7C: - ldr r1, _080A9AAC @ =gUnknown_202063C + ldr r1, _080A9AAC @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -15619,7 +15619,7 @@ _080A9AA4: pop {r0} bx r0 .align 2, 0 -_080A9AAC: .4byte gUnknown_202063C +_080A9AAC: .4byte gSprites thumb_func_end sub_80A9A20 thumb_func_start sub_80A9AB0 @@ -15652,7 +15652,7 @@ sub_80A9AB0: @ 80A9AB0 ldr r2, _080A9B04 @ =gUnknown_83E4200 adds r0, r5, 0 bl sub_80762D0 - ldr r1, _080A9B08 @ =gUnknown_202063C + ldr r1, _080A9B08 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -15663,9 +15663,9 @@ sub_80A9AB0: @ 80A9AB0 .align 2, 0 _080A9B00: .4byte gUnknown_3005090 _080A9B04: .4byte gUnknown_83E4200 -_080A9B08: .4byte gUnknown_202063C +_080A9B08: .4byte gSprites _080A9B0C: - ldr r1, _080A9B3C @ =gUnknown_202063C + ldr r1, _080A9B3C @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -15688,7 +15688,7 @@ _080A9B34: pop {r0} bx r0 .align 2, 0 -_080A9B3C: .4byte gUnknown_202063C +_080A9B3C: .4byte gSprites thumb_func_end sub_80A9AB0 thumb_func_start sub_80A9B40 @@ -18010,7 +18010,7 @@ _080AAD10: strh r0, [r6, 0x36] adds r0, r6, 0 bl obj_translate_based_on_private_1_2_3_4 - ldr r0, _080AADAC @ =nullsub_8 + ldr r0, _080AADAC @ =SpriteCallbackDummy bl CreateInvisibleSpriteWithCallback adds r4, r0, 0 lsls r4, 24 @@ -18030,7 +18030,7 @@ _080AAD10: ldrh r1, [r6, 0x22] subs r1, r0 strh r1, [r6, 0x22] - ldr r0, _080AADB0 @ =gUnknown_202063C + ldr r0, _080AADB0 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -18057,8 +18057,8 @@ _080AAD10: _080AADA0: .4byte gUnknown_2037F02 _080AADA4: .4byte gUnknown_2037F1A _080AADA8: .4byte gUnknown_2037F1B -_080AADAC: .4byte nullsub_8 -_080AADB0: .4byte gUnknown_202063C +_080AADAC: .4byte SpriteCallbackDummy +_080AADB0: .4byte gSprites _080AADB4: .4byte sub_80AADB8 thumb_func_end sub_80AAC98 @@ -18072,7 +18072,7 @@ sub_80AADB8: @ 80AADB8 ldrh r1, [r5, 0x38] lsls r1, 24 lsrs r1, 24 - ldr r2, _080AAE20 @ =gUnknown_202063C + ldr r2, _080AAE20 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -18114,7 +18114,7 @@ sub_80AADB8: @ 80AADB8 strh r4, [r7, 0x36] b _080AAE2E .align 2, 0 -_080AAE20: .4byte gUnknown_202063C +_080AAE20: .4byte gSprites _080AAE24: ldr r0, _080AAE3C @ =sub_80AAE40 str r0, [r5, 0x1C] @@ -19807,7 +19807,7 @@ sub_80ABB28: @ 80ABB28 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] - ldr r2, _080ABB7C @ =gUnknown_202063C + ldr r2, _080ABB7C @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19832,7 +19832,7 @@ sub_80ABB28: @ 80ABB28 bx r0 .align 2, 0 _080ABB78: .4byte gUnknown_3005090 -_080ABB7C: .4byte gUnknown_202063C +_080ABB7C: .4byte gSprites _080ABB80: .4byte sub_80ABB84 thumb_func_end sub_80ABB28 @@ -19907,7 +19907,7 @@ _080ABBFA: ands r0, r1 cmp r0, 0 beq _080ABC44 - ldr r2, _080ABC40 @ =gUnknown_202063C + ldr r2, _080ABC40 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19927,9 +19927,9 @@ _080ABBFA: strh r1, [r0, 0x22] b _080ABC56 .align 2, 0 -_080ABC40: .4byte gUnknown_202063C +_080ABC40: .4byte gSprites _080ABC44: - ldr r2, _080ABC84 @ =gUnknown_202063C + ldr r2, _080ABC84 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19951,7 +19951,7 @@ _080ABC66: lsls r0, 24 lsrs r0, 24 bl sub_8076440 - ldr r2, _080ABC84 @ =gUnknown_202063C + ldr r2, _080ABC84 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -19962,7 +19962,7 @@ _080ABC66: strh r5, [r4, 0xE] b _080ABDA0 .align 2, 0 -_080ABC84: .4byte gUnknown_202063C +_080ABC84: .4byte gSprites _080ABC88: .4byte 0x0000fffd _080ABC8C: ldrh r0, [r4, 0xE] @@ -20026,7 +20026,7 @@ _080ABCE4: ands r0, r1 cmp r0, 0 beq _080ABD1C - ldr r2, _080ABD18 @ =gUnknown_202063C + ldr r2, _080ABD18 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -20037,9 +20037,9 @@ _080ABCE4: adds r1, 0x2 b _080ABD2E .align 2, 0 -_080ABD18: .4byte gUnknown_202063C +_080ABD18: .4byte gSprites _080ABD1C: - ldr r2, _080ABD60 @ =gUnknown_202063C + ldr r2, _080ABD60 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -20073,9 +20073,9 @@ _080ABD2E: strh r0, [r4, 0x10] b _080ABDA2 .align 2, 0 -_080ABD60: .4byte gUnknown_202063C +_080ABD60: .4byte gSprites _080ABD64: - ldr r6, _080ABDAC @ =gUnknown_202063C + ldr r6, _080ABDAC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -20111,7 +20111,7 @@ _080ABDA2: strh r0, [r4, 0x8] b _080ABDBE .align 2, 0 -_080ABDAC: .4byte gUnknown_202063C +_080ABDAC: .4byte gSprites _080ABDB0: movs r1, 0xC ldrsh r0, [r4, r1] @@ -20258,7 +20258,7 @@ _080ABEB6: lsls r6, r5, 16 cmp r2, 0x40 beq _080ABF1E - ldr r1, _080ABF5C @ =gUnknown_202063C + ldr r1, _080ABF5C @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -20328,7 +20328,7 @@ _080ABF1E: .align 2, 0 _080ABF54: .4byte gUnknown_2037F1A _080ABF58: .4byte gUnknown_83E5AE0 -_080ABF5C: .4byte gUnknown_202063C +_080ABF5C: .4byte gSprites thumb_func_end sub_80ABE4C thumb_func_start sub_80ABF60 @@ -20626,7 +20626,7 @@ sub_80AC160: @ 80AC160 lsrs r1, r0, 24 cmp r1, 0x40 beq _080AC1BA - ldr r3, _080AC1F4 @ =gUnknown_202063C + ldr r3, _080AC1F4 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -20670,7 +20670,7 @@ _080AC1BA: .align 2, 0 _080AC1EC: .4byte gUnknown_825E074 _080AC1F0: .4byte gUnknown_83E5AE0 -_080AC1F4: .4byte gUnknown_202063C +_080AC1F4: .4byte gSprites _080AC1F8: .4byte sub_80AC204 _080AC1FC: .4byte 0x41c64e6d _080AC200: .4byte 0x00003039 @@ -20719,7 +20719,7 @@ sub_80AC204: @ 80AC204 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080AC2A8 @ =gUnknown_202063C + ldr r4, _080AC2A8 @ =gSprites adds r0, r4 movs r1, 0x3 bl StartSpriteAffineAnim @@ -20758,7 +20758,7 @@ _080AC29A: .align 2, 0 _080AC2A0: .4byte gUnknown_3005090 _080AC2A4: .4byte gUnknown_83E7C38 -_080AC2A8: .4byte gUnknown_202063C +_080AC2A8: .4byte gSprites _080AC2AC: .4byte sub_80AC2B0 thumb_func_end sub_80AC204 @@ -21086,7 +21086,7 @@ sub_80AC504: @ 80AC504 lsrs r0, 24 cmp r0, 0x40 beq _080AC55E - ldr r5, _080AC568 @ =gUnknown_202063C + ldr r5, _080AC568 @ =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -21113,7 +21113,7 @@ _080AC55E: bx r0 .align 2, 0 _080AC564: .4byte gUnknown_83E5AE0 -_080AC568: .4byte gUnknown_202063C +_080AC568: .4byte gSprites _080AC56C: .4byte sub_80AC570 thumb_func_end sub_80AC504 @@ -21480,7 +21480,7 @@ _080AC826: bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080AC86C @ =gUnknown_202063C + ldr r1, _080AC86C @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -21504,7 +21504,7 @@ _080AC826: b _080AC876 .align 2, 0 _080AC868: .4byte gUnknown_83E5B88 -_080AC86C: .4byte gUnknown_202063C +_080AC86C: .4byte gSprites _080AC870: .4byte gUnknown_2037F1A _080AC874: strh r7, [r4, 0x32] @@ -21538,7 +21538,7 @@ _080AC89C: bl CreateSprite lsls r0, 24 lsrs r2, r0, 24 - ldr r1, _080AC8E4 @ =gUnknown_202063C + ldr r1, _080AC8E4 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -21562,7 +21562,7 @@ _080AC89C: b _080AC8EE .align 2, 0 _080AC8E0: .4byte gUnknown_83E5B88 -_080AC8E4: .4byte gUnknown_202063C +_080AC8E4: .4byte gSprites _080AC8E8: .4byte gUnknown_2037F1A _080AC8EC: strh r7, [r4, 0x32] @@ -22341,7 +22341,7 @@ sub_80ACEA4: @ 80ACEA4 strh r5, [r4, 0xA] strh r5, [r4, 0xC] strh r5, [r4, 0xE] - ldr r2, _080ACF08 @ =gUnknown_202063C + ldr r2, _080ACF08 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22369,7 +22369,7 @@ sub_80ACEA4: @ 80ACEA4 bx r0 .align 2, 0 _080ACF04: .4byte gUnknown_3005090 -_080ACF08: .4byte gUnknown_202063C +_080ACF08: .4byte gSprites _080ACF0C: .4byte gUnknown_2037F1A _080ACF10: .4byte sub_80ACF14 thumb_func_end sub_80ACEA4 @@ -22444,7 +22444,7 @@ _080ACF86: ands r0, r1 cmp r0, 0 beq _080ACFBC - ldr r2, _080ACFB8 @ =gUnknown_202063C + ldr r2, _080ACFB8 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22454,9 +22454,9 @@ _080ACF86: movs r1, 0x3 b _080ACFCC .align 2, 0 -_080ACFB8: .4byte gUnknown_202063C +_080ACFB8: .4byte gSprites _080ACFBC: - ldr r2, _080AD030 @ =gUnknown_202063C + ldr r2, _080AD030 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22480,7 +22480,7 @@ _080ACFCE: ble _080ACFFC movs r0, 0 strh r0, [r4, 0xE] - ldr r2, _080AD030 @ =gUnknown_202063C + ldr r2, _080AD030 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22503,7 +22503,7 @@ _080AD00C: lsls r0, 24 lsrs r0, 24 bl sub_8076440 - ldr r2, _080AD030 @ =gUnknown_202063C + ldr r2, _080AD030 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22516,7 +22516,7 @@ _080AD00C: strh r5, [r4, 0xE] b _080AD1D4 .align 2, 0 -_080AD030: .4byte gUnknown_202063C +_080AD030: .4byte gSprites _080AD034: .4byte 0x0000fffd _080AD038: ldrh r0, [r4, 0xA] @@ -22600,7 +22600,7 @@ _080AD0B6: ands r0, r1 cmp r0, 0 beq _080AD0F0 - ldr r2, _080AD0EC @ =gUnknown_202063C + ldr r2, _080AD0EC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22611,9 +22611,9 @@ _080AD0B6: adds r1, 0x3 b _080AD102 .align 2, 0 -_080AD0EC: .4byte gUnknown_202063C +_080AD0EC: .4byte gSprites _080AD0F0: - ldr r2, _080AD13C @ =gUnknown_202063C + ldr r2, _080AD13C @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22652,7 +22652,7 @@ _080AD104: bl sub_80765D4 b _080AD15E .align 2, 0 -_080AD13C: .4byte gUnknown_202063C +_080AD13C: .4byte gSprites _080AD140: ldrh r1, [r4, 0x26] lsls r1, 24 @@ -22674,7 +22674,7 @@ _080AD15E: ands r0, r1 cmp r0, 0 beq _080AD17C - ldr r2, _080AD188 @ =gUnknown_202063C + ldr r2, _080AD188 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22691,13 +22691,13 @@ _080AD17C: strh r0, [r4, 0xE] b _080AD1D4 .align 2, 0 -_080AD188: .4byte gUnknown_202063C +_080AD188: .4byte gSprites _080AD18C: movs r1, 0x12 ldrsh r0, [r4, r1] cmp r0, 0 beq _080AD1A8 - ldr r2, _080AD1DC @ =gUnknown_202063C + ldr r2, _080AD1DC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22714,7 +22714,7 @@ _080AD1A8: lsrs r5, r0, 24 cmp r5, 0 bne _080AD1EE - ldr r2, _080AD1DC @ =gUnknown_202063C + ldr r2, _080AD1DC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -22734,7 +22734,7 @@ _080AD1D4: strh r0, [r4, 0x8] b _080AD1EE .align 2, 0 -_080AD1DC: .4byte gUnknown_202063C +_080AD1DC: .4byte gSprites _080AD1E0: movs r1, 0x14 ldrsh r0, [r4, r1] @@ -22770,7 +22770,7 @@ sub_80AD1F8: @ 80AD1F8 lsls r0, 16 lsrs r0, 16 mov r9, r0 - ldr r1, _080AD248 @ =gUnknown_202063C + ldr r1, _080AD248 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -22789,7 +22789,7 @@ sub_80AD1F8: @ 80AD1F8 movs r0, 0x1 b _080AD25A .align 2, 0 -_080AD248: .4byte gUnknown_202063C +_080AD248: .4byte gSprites _080AD24C: .4byte gUnknown_2037F1A _080AD250: adds r0, r4, 0 @@ -22825,7 +22825,7 @@ _080AD278: lsrs r2, r0, 24 cmp r2, 0x40 beq _080AD2FA - ldr r1, _080AD31C @ =gUnknown_202063C + ldr r1, _080AD31C @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -22895,7 +22895,7 @@ _080AD2FA: .align 2, 0 _080AD314: .4byte gUnknown_83E5E44 _080AD318: .4byte gUnknown_83E5E2C -_080AD31C: .4byte gUnknown_202063C +_080AD31C: .4byte gSprites _080AD320: .4byte 0x000003ff _080AD324: .4byte 0xfffffc00 _080AD328: .4byte gUnknown_83E5E46 @@ -22944,7 +22944,7 @@ sub_80AD374: @ 80AD374 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r2, _080AD3AC @ =gUnknown_202063C + ldr r2, _080AD3AC @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -22969,7 +22969,7 @@ sub_80AD374: @ 80AD374 lsls r1, 15 b _080AD3BA .align 2, 0 -_080AD3AC: .4byte gUnknown_202063C +_080AD3AC: .4byte gSprites _080AD3B0: .4byte gUnknown_2037F1A _080AD3B4: lsls r0, r4, 16 @@ -23671,7 +23671,7 @@ _080AD8D8: ldrsh r0, [r2, r7] cmp r1, r0 bge _080AD91A - ldr r4, _080AD934 @ =gUnknown_202063C + ldr r4, _080AD934 @ =gSprites adds r3, r2, 0 adds r3, 0x8 _080AD8EA: @@ -23714,7 +23714,7 @@ _080AD92A: b _080ADA44 .align 2, 0 _080AD930: .4byte 0x0000fffe -_080AD934: .4byte gUnknown_202063C +_080AD934: .4byte gSprites _080AD938: ldrh r0, [r2, 0xA] adds r0, 0x1 @@ -23745,7 +23745,7 @@ _080AD960: ldrsh r0, [r2, r7] cmp r1, r0 bge _080AD9A2 - ldr r4, _080AD9BC @ =gUnknown_202063C + ldr r4, _080AD9BC @ =gSprites adds r3, r2, 0 adds r3, 0x8 _080AD972: @@ -23786,7 +23786,7 @@ _080AD9A2: b _080ADA44 .align 2, 0 _080AD9B8: .4byte 0x0000fffe -_080AD9BC: .4byte gUnknown_202063C +_080AD9BC: .4byte gSprites _080AD9C0: movs r7, 0x20 ldrsh r1, [r2, r7] @@ -23822,7 +23822,7 @@ _080AD9F4: ldrsh r0, [r2, r3] cmp r1, r0 bge _080ADA36 - ldr r4, _080ADA50 @ =gUnknown_202063C + ldr r4, _080ADA50 @ =gSprites adds r3, r2, 0 adds r3, 0x8 _080ADA06: @@ -23865,7 +23865,7 @@ _080ADA44: b _080ADA98 .align 2, 0 _080ADA4C: .4byte 0x0000fffe -_080ADA50: .4byte gUnknown_202063C +_080ADA50: .4byte gSprites _080ADA54: movs r1, 0 strh r1, [r2, 0xE] @@ -23873,7 +23873,7 @@ _080ADA54: ldrsh r0, [r2, r3] cmp r1, r0 bge _080ADA92 - ldr r6, _080ADAA0 @ =gUnknown_202063C + ldr r6, _080ADAA0 @ =gSprites adds r3, r2, 0 adds r3, 0x8 movs r5, 0 @@ -23907,7 +23907,7 @@ _080ADA98: pop {r0} bx r0 .align 2, 0 -_080ADAA0: .4byte gUnknown_202063C +_080ADAA0: .4byte gSprites thumb_func_end sub_80AD870 thumb_func_start sub_80ADAA4 @@ -24009,7 +24009,7 @@ _080ADB4A: mov r12, r0 cmp r1, 0x1 bne _080ADB98 - ldr r2, _080ADB94 @ =gUnknown_202063C + ldr r2, _080ADB94 @ =gSprites lsls r3, r6, 4 adds r0, r3, r6 lsls r0, 2 @@ -24030,9 +24030,9 @@ _080ADB88: b _080ADBB2 .align 2, 0 _080ADB90: .4byte gUnknown_83E5F0C -_080ADB94: .4byte gUnknown_202063C +_080ADB94: .4byte gSprites _080ADB98: - ldr r3, _080ADBE8 @ =gUnknown_202063C + ldr r3, _080ADBE8 @ =gSprites lsls r4, r6, 4 adds r2, r4, r6 lsls r2, 2 @@ -24073,7 +24073,7 @@ _080ADBD8: pop {r0} bx r0 .align 2, 0 -_080ADBE8: .4byte gUnknown_202063C +_080ADBE8: .4byte gSprites thumb_func_end sub_80ADAD8 thumb_func_start sub_80ADBEC @@ -24408,7 +24408,7 @@ _080ADE66: lsls r0, r1, 1 adds r0, r7 ldrh r0, [r0] - ldr r3, _080ADEA8 @ =gUnknown_2021BCC + ldr r3, _080ADEA8 @ =gOamMatrices lsls r2, 3 adds r2, r3 adds r1, 0x40 @@ -24432,7 +24432,7 @@ _080ADE66: .align 2, 0 _080ADEA0: .4byte gUnknown_825E074 _080ADEA4: .4byte gUnknown_2037F02 -_080ADEA8: .4byte gUnknown_2021BCC +_080ADEA8: .4byte gOamMatrices _080ADEAC: .4byte sub_80B1D3C thumb_func_end sub_80ADD4C @@ -25079,7 +25079,7 @@ _080AE3B4: _080AE3BC: cmp r7, 0 beq _080AE3F0 - ldr r4, _080AE410 @ =gUnknown_202063C + ldr r4, _080AE410 @ =gSprites lsls r3, r5, 4 adds r3, r5 lsls r3, 2 @@ -25121,7 +25121,7 @@ _080AE400: pop {r0} bx r0 .align 2, 0 -_080AE410: .4byte gUnknown_202063C +_080AE410: .4byte gSprites _080AE414: .4byte 0x000003ff _080AE418: .4byte 0xfffffc00 _080AE41C: .4byte gUnknown_3005090 @@ -25197,7 +25197,7 @@ sub_80AE470: @ 80AE470 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r3, _080AE4E0 @ =gUnknown_202063C + ldr r3, _080AE4E0 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -25228,7 +25228,7 @@ sub_80AE470: @ 80AE470 .align 2, 0 _080AE4D8: .4byte gUnknown_2037F02 _080AE4DC: .4byte gUnknown_83E60B8 -_080AE4E0: .4byte gUnknown_202063C +_080AE4E0: .4byte gSprites _080AE4E4: .4byte 0x000003ff _080AE4E8: .4byte 0xfffffc00 _080AE4EC: .4byte gUnknown_2037EE2 @@ -25378,7 +25378,7 @@ sub_80AE5BC: @ 80AE5BC lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080AE6AC @ =gUnknown_202063C + ldr r0, _080AE6AC @ =gSprites adds r4, r0 ldr r1, _080AE6B0 @ =gUnknown_83E60D0 movs r2, 0x1A @@ -25458,7 +25458,7 @@ _080AE696: .align 2, 0 _080AE6A4: .4byte gUnknown_3005090 _080AE6A8: .4byte gUnknown_83E6120 -_080AE6AC: .4byte gUnknown_202063C +_080AE6AC: .4byte gSprites _080AE6B0: .4byte gUnknown_83E60D0 _080AE6B4: .4byte sub_80AE704 _080AE6B8: .4byte sub_8074F6C @@ -25685,7 +25685,7 @@ _080AE864: ldrh r1, [r4, 0x20] adds r0, r2, r1 strh r0, [r4, 0x20] - ldr r3, _080AE89C @ =gUnknown_202063C + ldr r3, _080AE89C @ =gSprites movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -25709,7 +25709,7 @@ _080AE894: pop {r0} bx r0 .align 2, 0 -_080AE89C: .4byte gUnknown_202063C +_080AE89C: .4byte gSprites thumb_func_end sub_80AE83C thumb_func_start sub_80AE8A0 @@ -25773,7 +25773,7 @@ _080AE910: ldr r0, _080AE92C @ =0x0000fffe _080AE916: strh r0, [r5, 0x22] - ldr r2, _080AE930 @ =gUnknown_202063C + ldr r2, _080AE930 @ =gSprites movs r0, 0x26 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -25785,7 +25785,7 @@ _080AE916: b _080AE9D6 .align 2, 0 _080AE92C: .4byte 0x0000fffe -_080AE930: .4byte gUnknown_202063C +_080AE930: .4byte gSprites _080AE934: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -25796,7 +25796,7 @@ _080AE934: ble _080AEA04 movs r0, 0 strh r0, [r5, 0xA] - ldr r4, _080AE98C @ =gUnknown_202063C + ldr r4, _080AE98C @ =gSprites movs r1, 0x26 ldrsh r0, [r5, r1] lsls r2, r0, 4 @@ -25832,7 +25832,7 @@ _080AE934: strh r2, [r0, 0x24] b _080AEA04 .align 2, 0 -_080AE98C: .4byte gUnknown_202063C +_080AE98C: .4byte gSprites _080AE990: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -25843,7 +25843,7 @@ _080AE990: ble _080AEA04 movs r0, 0 strh r0, [r5, 0xA] - ldr r1, _080AE9E0 @ =gUnknown_202063C + ldr r1, _080AE9E0 @ =gSprites movs r2, 0x26 ldrsh r0, [r5, r2] lsls r2, r0, 4 @@ -25875,9 +25875,9 @@ _080AE9D6: strh r0, [r5, 0x8] b _080AEA04 .align 2, 0 -_080AE9E0: .4byte gUnknown_202063C +_080AE9E0: .4byte gSprites _080AE9E4: - ldr r2, _080AEA0C @ =gUnknown_202063C + ldr r2, _080AEA0C @ =gSprites movs r0, 0x26 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -25897,7 +25897,7 @@ _080AEA04: pop {r0} bx r0 .align 2, 0 -_080AEA0C: .4byte gUnknown_202063C +_080AEA0C: .4byte gSprites thumb_func_end sub_80AE8A0 thumb_func_start sub_80AEA10 @@ -26121,7 +26121,7 @@ sub_80AEB98: @ 80AEB98 lsrs r2, r0, 24 cmp r2, 0x40 beq _080AEBCE - ldr r1, _080AEC28 @ =gUnknown_202063C + ldr r1, _080AEC28 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -26182,7 +26182,7 @@ _080AEC20: b _080AEC2E .align 2, 0 _080AEC24: .4byte gUnknown_83E6278 -_080AEC28: .4byte gUnknown_202063C +_080AEC28: .4byte gSprites _080AEC2C: movs r0, 0 _080AEC2E: @@ -26503,7 +26503,7 @@ sub_80AEE74: @ 80AEE74 lsrs r2, r0, 24 cmp r2, 0x40 beq _080AEEE0 - ldr r1, _080AEF40 @ =gUnknown_202063C + ldr r1, _080AEF40 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -26593,7 +26593,7 @@ _080AEF28: b _080AEF58 .align 2, 0 _080AEF3C: .4byte gUnknown_83E62A8 -_080AEF40: .4byte gUnknown_202063C +_080AEF40: .4byte gSprites _080AEF44: .4byte 0x000003ff _080AEF48: .4byte 0xfffffc00 _080AEF4C: @@ -26762,7 +26762,7 @@ sub_80AF058: @ 80AF058 lsrs r1, r0, 24 cmp r1, 0x40 beq _080AF09C - ldr r3, _080AF0B8 @ =gUnknown_202063C + ldr r3, _080AF0B8 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -26793,7 +26793,7 @@ _080AF09C: b _080AF0C2 .align 2, 0 _080AF0B4: .4byte gUnknown_83E5F38 -_080AF0B8: .4byte gUnknown_202063C +_080AF0B8: .4byte gSprites _080AF0BC: .4byte sub_80AF0C8 _080AF0C0: movs r0, 0x1 @@ -28754,7 +28754,7 @@ _080B0008: bne _080B0064 movs r0, 0x1 bl GetAnimBankSpriteId - ldr r2, _080B00CC @ =gUnknown_202063C + ldr r2, _080B00CC @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -28814,7 +28814,7 @@ _080B00BC: .4byte gUnknown_2037F02 _080B00C0: .4byte gUnknown_2037F1A _080B00C4: .4byte gUnknown_2037F1B _080B00C8: .4byte gUnknown_2023BD6 -_080B00CC: .4byte gUnknown_202063C +_080B00CC: .4byte gSprites _080B00D0: ldrh r0, [r6, 0x2] ldrh r1, [r5, 0x20] @@ -29430,7 +29430,7 @@ _080B0556: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r0, _080B05B4 @ =gUnknown_202063C + ldr r0, _080B05B4 @ =gSprites adds r4, r0 adds r0, r4, 0 mov r1, r9 @@ -29451,7 +29451,7 @@ _080B0556: b _080B05BA .align 2, 0 _080B05B0: .4byte gUnknown_83E65A4 -_080B05B4: .4byte gUnknown_202063C +_080B05B4: .4byte gSprites _080B05B8: movs r0, 0 _080B05BA: @@ -29511,7 +29511,7 @@ _080B05F6: strh r0, [r4, 0x2E] cmp r0, 0x40 beq _080B065A - ldr r2, _080B0670 @ =gUnknown_202063C + ldr r2, _080B0670 @ =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -29548,7 +29548,7 @@ _080B065A: b _080B06A6 .align 2, 0 _080B066C: .4byte gUnknown_83E63E0 -_080B0670: .4byte gUnknown_202063C +_080B0670: .4byte gSprites _080B0674: .4byte sub_80B06B0 _080B0678: ldr r3, _080B06AC @ =gUnknown_3005090 @@ -30118,7 +30118,7 @@ _080B0A9C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080B0B20 @ =gUnknown_202063C + ldr r4, _080B0B20 @ =gSprites adds r0, r4 movs r1, 0 bl StartSpriteAffineAnim @@ -30129,7 +30129,7 @@ _080B0A9C: lsls r0, 2 adds r4, 0x1C adds r0, r4 - ldr r1, _080B0B24 @ =nullsub_8 + ldr r1, _080B0B24 @ =SpriteCallbackDummy str r1, [r0] _080B0B00: ldr r0, _080B0B28 @ =sub_80B0B2C @@ -30145,8 +30145,8 @@ _080B0B10: .4byte gUnknown_2037F1B _080B0B14: .4byte gUnknown_2023BD6 _080B0B18: .4byte 0xfff00000 _080B0B1C: .4byte gUnknown_83E7C08 -_080B0B20: .4byte gUnknown_202063C -_080B0B24: .4byte nullsub_8 +_080B0B20: .4byte gSprites +_080B0B24: .4byte SpriteCallbackDummy _080B0B28: .4byte sub_80B0B2C thumb_func_end sub_80B09A4 @@ -30163,7 +30163,7 @@ sub_80B0B2C: @ 80B0B2C ldrsh r0, [r5, r1] cmp r0, 0x40 beq _080B0B68 - ldr r4, _080B0B70 @ =gUnknown_202063C + ldr r4, _080B0B70 @ =gSprites adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -30185,7 +30185,7 @@ _080B0B68: bl DestroyAnimSprite b _080B0B78 .align 2, 0 -_080B0B70: .4byte gUnknown_202063C +_080B0B70: .4byte gSprites _080B0B74: subs r0, r1, 0x1 strh r0, [r5, 0x2E] @@ -32294,7 +32294,7 @@ sub_80B1BB0: @ 80B1BB0 str r0, [r4, 0x1C] movs r0, 0 bl GetAnimBankSpriteId - ldr r2, _080B1BF4 @ =gUnknown_202063C + ldr r2, _080B1BF4 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -32312,7 +32312,7 @@ sub_80B1BB0: @ 80B1BB0 .align 2, 0 _080B1BEC: .4byte gUnknown_2037F02 _080B1BF0: .4byte sub_80B1BF8 -_080B1BF4: .4byte gUnknown_202063C +_080B1BF4: .4byte gSprites thumb_func_end sub_80B1BB0 thumb_func_start sub_80B1BF8 @@ -32457,7 +32457,7 @@ _080B1CE8: _080B1D0A: movs r0, 0 bl GetAnimBankSpriteId - ldr r2, _080B1D38 @ =gUnknown_202063C + ldr r2, _080B1D38 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -32477,7 +32477,7 @@ _080B1D30: pop {r0} bx r0 .align 2, 0 -_080B1D38: .4byte gUnknown_202063C +_080B1D38: .4byte gSprites thumb_func_end sub_80B1CC0 thumb_func_start sub_80B1D3C @@ -32755,7 +32755,7 @@ _080B1F1E: lsls r1, r0, 1 adds r1, r3 ldrh r4, [r1] - ldr r1, _080B1F8C @ =gUnknown_2021BCC + ldr r1, _080B1F8C @ =gOamMatrices lsls r2, 3 adds r2, r1 adds r0, 0x40 @@ -32778,7 +32778,7 @@ _080B1F1E: bx r0 .align 2, 0 _080B1F88: .4byte gUnknown_825E074 -_080B1F8C: .4byte gUnknown_2021BCC +_080B1F8C: .4byte gOamMatrices _080B1F90: .4byte sub_80B1F94 thumb_func_end sub_80B1D88 @@ -33418,7 +33418,7 @@ _080B23F0: lsls r1, r0, 1 adds r1, r3 ldrh r6, [r1] - ldr r1, _080B247C @ =gUnknown_2021BCC + ldr r1, _080B247C @ =gOamMatrices lsls r2, 3 adds r2, r1 adds r0, 0x40 @@ -33457,7 +33457,7 @@ _080B23F0: b _080B2490 .align 2, 0 _080B2478: .4byte gUnknown_825E074 -_080B247C: .4byte gUnknown_2021BCC +_080B247C: .4byte gOamMatrices _080B2480: ldrh r0, [r4, 0x4] ldr r1, _080B24B8 @ =0x00007fff @@ -33671,7 +33671,7 @@ _080B2622: lsls r0, r1, 1 adds r0, r5 ldrh r0, [r0] - ldr r3, _080B2684 @ =gUnknown_2021BCC + ldr r3, _080B2684 @ =gOamMatrices lsls r2, r6, 3 adds r2, r3 adds r1, 0x40 @@ -33715,7 +33715,7 @@ _080B2672: .align 2, 0 _080B267C: .4byte gUnknown_2037F1B _080B2680: .4byte gUnknown_825E074 -_080B2684: .4byte gUnknown_2021BCC +_080B2684: .4byte gOamMatrices _080B2688: .4byte sub_80B268C thumb_func_end sub_80B2514 @@ -34067,7 +34067,7 @@ _080B2926: bl sub_8075160 movs r0, 0 bl GetAnimBankSpriteId - ldr r2, _080B2954 @ =gUnknown_202063C + ldr r2, _080B2954 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -34084,7 +34084,7 @@ _080B2926: strh r0, [r4, 0x2E] b _080B296C .align 2, 0 -_080B2954: .4byte gUnknown_202063C +_080B2954: .4byte gSprites _080B2958: adds r0, r4, 0 adds r0, 0x3F @@ -34159,7 +34159,7 @@ _080B29C0: bge _080B29FE movs r0, 0 bl GetAnimBankSpriteId - ldr r2, _080B2A04 @ =gUnknown_202063C + ldr r2, _080B2A04 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -34179,7 +34179,7 @@ _080B29FE: pop {r0} bx r0 .align 2, 0 -_080B2A04: .4byte gUnknown_202063C +_080B2A04: .4byte gSprites thumb_func_end sub_80B2974 thumb_func_start sub_80B2A08 @@ -34197,7 +34197,7 @@ sub_80B2A08: @ 80B2A08 str r0, [r4, 0x1C] movs r0, 0 bl GetAnimBankSpriteId - ldr r2, _080B2A4C @ =gUnknown_202063C + ldr r2, _080B2A4C @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -34215,7 +34215,7 @@ sub_80B2A08: @ 80B2A08 .align 2, 0 _080B2A44: .4byte gUnknown_2037F02 _080B2A48: .4byte sub_80B2A50 -_080B2A4C: .4byte gUnknown_202063C +_080B2A4C: .4byte gSprites thumb_func_end sub_80B2A08 thumb_func_start sub_80B2A50 @@ -34394,7 +34394,7 @@ _080B2B72: lsrs r1, 27 movs r0, 0xF4 lsls r0, 6 - ldr r2, _080B2BD4 @ =gUnknown_2021BCC + ldr r2, _080B2BD4 @ =gOamMatrices lsls r1, 3 adds r1, r2 movs r2, 0x6 @@ -34425,7 +34425,7 @@ _080B2BCC: pop {r0} bx r0 .align 2, 0 -_080B2BD4: .4byte gUnknown_2021BCC +_080B2BD4: .4byte gOamMatrices thumb_func_end sub_80B2AF4 thumb_func_start sub_80B2BD8 @@ -34788,7 +34788,7 @@ sub_80B2E64: @ 80B2E64 bl GetAnimBankSpriteId lsls r0, 24 lsrs r0, 24 - ldr r2, _080B2E98 @ =gUnknown_202063C + ldr r2, _080B2E98 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -34800,13 +34800,13 @@ sub_80B2E64: @ 80B2E64 b _080B2EBA .align 2, 0 _080B2E94: .4byte gUnknown_2037F02 -_080B2E98: .4byte gUnknown_202063C +_080B2E98: .4byte gSprites _080B2E9C: movs r0, 0 bl GetAnimBankSpriteId lsls r0, 24 lsrs r0, 24 - ldr r2, _080B2EC8 @ =gUnknown_202063C + ldr r2, _080B2EC8 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -34824,7 +34824,7 @@ _080B2EBA: pop {r0} bx r0 .align 2, 0 -_080B2EC8: .4byte gUnknown_202063C +_080B2EC8: .4byte gSprites thumb_func_end sub_80B2E64 thumb_func_start sub_80B2ECC @@ -35107,7 +35107,7 @@ sub_80B30B0: @ 80B30B0 lsls r0, 24 cmp r0, 0 beq _080B3118 - ldr r2, _080B315C @ =gUnknown_202063C + ldr r2, _080B315C @ =gSprites ldr r0, _080B3160 @ =gUnknown_2023D44 adds r0, r4, r0 ldrb r1, [r0] @@ -35130,7 +35130,7 @@ _080B3118: lsls r0, 24 cmp r0, 0 beq _080B3146 - ldr r2, _080B315C @ =gUnknown_202063C + ldr r2, _080B315C @ =gSprites ldr r0, _080B3160 @ =gUnknown_2023D44 adds r0, r4, r0 ldrb r1, [r0] @@ -35158,7 +35158,7 @@ _080B3156: pop {r0} bx r0 .align 2, 0 -_080B315C: .4byte gUnknown_202063C +_080B315C: .4byte gSprites _080B3160: .4byte gUnknown_2023D44 _080B3164: .4byte sub_80B3168 thumb_func_end sub_80B30B0 @@ -35643,7 +35643,7 @@ _080B351C: ldrsh r0, [r4, r1] cmp r0, 0 beq _080B3544 - ldr r2, _080B3540 @ =gUnknown_202063C + ldr r2, _080B3540 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -35658,9 +35658,9 @@ _080B351C: strh r0, [r4, 0xE] b _080B357A .align 2, 0 -_080B3540: .4byte gUnknown_202063C +_080B3540: .4byte gSprites _080B3544: - ldr r3, _080B3580 @ =gUnknown_202063C + ldr r3, _080B3580 @ =gSprites movs r0, 0x8 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -35690,7 +35690,7 @@ _080B357A: pop {r0} bx r0 .align 2, 0 -_080B3580: .4byte gUnknown_202063C +_080B3580: .4byte gSprites thumb_func_end sub_80B34DC thumb_func_start sub_80B3584 @@ -35841,7 +35841,7 @@ _080B36A0: beq _080B36EC b _080B3702 _080B36AA: - ldr r0, _080B36B8 @ =gUnknown_202063C + ldr r0, _080B36B8 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -35849,9 +35849,9 @@ _080B36AA: ldrh r0, [r4, 0x20] b _080B36FA .align 2, 0 -_080B36B8: .4byte gUnknown_202063C +_080B36B8: .4byte gSprites _080B36BC: - ldr r0, _080B36D0 @ =gUnknown_202063C + ldr r0, _080B36D0 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -35862,9 +35862,9 @@ _080B36BC: ldrh r0, [r4, 0x20] b _080B3700 .align 2, 0 -_080B36D0: .4byte gUnknown_202063C +_080B36D0: .4byte gSprites _080B36D4: - ldr r1, _080B36E8 @ =gUnknown_202063C + ldr r1, _080B36E8 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -35875,9 +35875,9 @@ _080B36D4: strh r1, [r0, 0x26] b _080B3702 .align 2, 0 -_080B36E8: .4byte gUnknown_202063C +_080B36E8: .4byte gSprites _080B36EC: - ldr r0, _080B3714 @ =gUnknown_202063C + ldr r0, _080B3714 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -35900,7 +35900,7 @@ _080B3702: bne _080B379E b _080B377A .align 2, 0 -_080B3714: .4byte gUnknown_202063C +_080B3714: .4byte gSprites _080B3718: ldrh r0, [r4, 0xA] ands r1, r0 @@ -35944,7 +35944,7 @@ _080B3754: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B3784 @ =gUnknown_202063C + ldr r1, _080B3784 @ =gSprites adds r0, r1 bl DestroySprite _080B3770: @@ -35959,7 +35959,7 @@ _080B377A: strh r0, [r4, 0x8] b _080B379E .align 2, 0 -_080B3784: .4byte gUnknown_202063C +_080B3784: .4byte gSprites _080B3788: movs r0, 0x52 movs r1, 0 @@ -36238,7 +36238,7 @@ _080B39A4: lsrs r1, r0, 24 cmp r1, 0x40 beq _080B39F8 - ldr r0, _080B3A14 @ =gUnknown_202063C + ldr r0, _080B3A14 @ =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -36272,7 +36272,7 @@ _080B39F8: b _080B3A2C .align 2, 0 _080B3A10: .4byte gUnknown_83E7114 -_080B3A14: .4byte gUnknown_202063C +_080B3A14: .4byte gSprites _080B3A18: ldrh r0, [r5, 0xA] adds r0, 0x1 @@ -36641,14 +36641,14 @@ _080B3CB0: .align 2, 0 _080B3CD4: .4byte gUnknown_2037F02 _080B3CD8: - ldr r2, _080B3D68 @ =gUnknown_202063C + ldr r2, _080B3D68 @ =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 adds r0, r2, 0 adds r0, 0x1C adds r0, r4, r0 - ldr r1, _080B3D6C @ =nullsub_8 + ldr r1, _080B3D6C @ =SpriteCallbackDummy str r1, [r0] adds r4, r2 ldrb r0, [r4, 0x1] @@ -36712,8 +36712,8 @@ _080B3D5A: pop {r0} bx r0 .align 2, 0 -_080B3D68: .4byte gUnknown_202063C -_080B3D6C: .4byte nullsub_8 +_080B3D68: .4byte gSprites +_080B3D6C: .4byte SpriteCallbackDummy _080B3D70: .4byte gUnknown_2037F02 _080B3D74: .4byte sub_80B3D78 thumb_func_end sub_80B3C78 @@ -36829,7 +36829,7 @@ _080B3E4C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B3E68 @ =gUnknown_202063C + ldr r1, _080B3E68 @ =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram _080B3E5E: @@ -36838,7 +36838,7 @@ _080B3E5E: strh r0, [r4, 0x8] b _080B3E7C .align 2, 0 -_080B3E68: .4byte gUnknown_202063C +_080B3E68: .4byte gSprites _080B3E6C: ldrh r0, [r4, 0x24] lsls r0, 24 @@ -38697,7 +38697,7 @@ _080B4D40: ldrh r1, [r4, 0x12] subs r0, r1 strh r0, [r4, 0x16] - ldr r3, _080B4DA0 @ =gUnknown_202063C + ldr r3, _080B4DA0 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -38737,7 +38737,7 @@ _080B4D90: bl PlaySE12WithPanning b _080B4E68 .align 2, 0 -_080B4DA0: .4byte gUnknown_202063C +_080B4DA0: .4byte gSprites _080B4DA4: ldrh r0, [r4, 0x1E] subs r0, 0x1 @@ -38767,7 +38767,7 @@ _080B4DCC: adds r0, 0x1 strh r0, [r4, 0x8] _080B4DD6: - ldr r2, _080B4E04 @ =gUnknown_202063C + ldr r2, _080B4E04 @ =gSprites movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -38790,7 +38790,7 @@ _080B4DD6: strh r0, [r1, 0x26] b _080B4E68 .align 2, 0 -_080B4E04: .4byte gUnknown_202063C +_080B4E04: .4byte gSprites _080B4E08: ldrh r0, [r4, 0x10] ldrh r2, [r4, 0xC] @@ -38917,7 +38917,7 @@ _080B4ECC: lsrs r2, r0, 24 cmp r2, 0x40 beq _080B4F58 - ldr r1, _080B4F6C @ =gUnknown_202063C + ldr r1, _080B4F6C @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -38971,7 +38971,7 @@ _080B4F60: bx r0 .align 2, 0 _080B4F68: .4byte gUnknown_83E74F0 -_080B4F6C: .4byte gUnknown_202063C +_080B4F6C: .4byte gSprites _080B4F70: .4byte 0x000003ff _080B4F74: .4byte 0xfffffc00 thumb_func_end sub_80B4E70 @@ -39729,7 +39729,7 @@ sub_80B54E8: @ 80B54E8 movs r2, 0x80 movs r3, 0 bl obj_id_set_rotscale - ldr r1, _080B5560 @ =gUnknown_202063C + ldr r1, _080B5560 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -39760,7 +39760,7 @@ sub_80B54E8: @ 80B54E8 pop {r0} bx r0 .align 2, 0 -_080B5560: .4byte gUnknown_202063C +_080B5560: .4byte gSprites _080B5564: .4byte gUnknown_3005090 _080B5568: .4byte gUnknown_2037F02 _080B556C: .4byte sub_80B5570 @@ -40237,7 +40237,7 @@ _080B58DC: lsrs r1, 16 movs r0, 0x52 bl SetGpuReg - ldr r4, _080B5944 @ =gUnknown_202063C + ldr r4, _080B5944 @ =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -40269,7 +40269,7 @@ _080B58DC: movs r1, 0x70 b _080B596E .align 2, 0 -_080B5944: .4byte gUnknown_202063C +_080B5944: .4byte gSprites _080B5948: .4byte gUnknown_2037F1B _080B594C: .4byte 0x0000ff70 _080B5950: @@ -40290,7 +40290,7 @@ _080B5950: ldr r1, _080B59C0 @ =0x0000ff90 _080B596E: strh r1, [r0, 0x32] - ldr r4, _080B59C4 @ =gUnknown_202063C + ldr r4, _080B59C4 @ =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -40312,7 +40312,7 @@ _080B596E: adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _080B59C8 @ =nullsub_8 + ldr r1, _080B59C8 @ =SpriteCallbackDummy bl StoreSpriteCallbackInData6 movs r0, 0x8 ldrsh r1, [r5, r0] @@ -40331,8 +40331,8 @@ _080B59B8: bx r0 .align 2, 0 _080B59C0: .4byte 0x0000ff90 -_080B59C4: .4byte gUnknown_202063C -_080B59C8: .4byte nullsub_8 +_080B59C4: .4byte gSprites +_080B59C8: .4byte SpriteCallbackDummy _080B59CC: .4byte sub_8074D00 _080B59D0: .4byte sub_80B59D4 thumb_func_end sub_80B58AC @@ -40413,14 +40413,14 @@ _080B5A36: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B5A74 @ =gUnknown_202063C + ldr r1, _080B5A74 @ =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram movs r0, 0x1 strh r0, [r4, 0x10] b _080B5AA4 .align 2, 0 -_080B5A74: .4byte gUnknown_202063C +_080B5A74: .4byte gSprites _080B5A78: ldrh r0, [r4, 0x14] adds r0, 0x1 @@ -40538,7 +40538,7 @@ _080B5B5A: .align 2, 0 _080B5B64: .4byte 0x00002771 _080B5B68: - ldr r4, _080B5C14 @ =gUnknown_202063C + ldr r4, _080B5C14 @ =gSprites movs r1, 0x8 ldrsh r0, [r5, r1] lsls r1, r0, 4 @@ -40624,7 +40624,7 @@ _080B5B68: lsls r1, 2 b _080B5C24 .align 2, 0 -_080B5C14: .4byte gUnknown_202063C +_080B5C14: .4byte gSprites _080B5C18: .4byte gUnknown_2024018 _080B5C1C: .4byte gUnknown_2037F1B _080B5C20: @@ -40664,7 +40664,7 @@ _080B5C64: .4byte gUnknown_20375F8 _080B5C68: .4byte 0x04000008 _080B5C6C: .4byte 0x00003c0d _080B5C70: - ldr r2, _080B5CAC @ =gUnknown_202063C + ldr r2, _080B5CAC @ =gSprites movs r0, 0x22 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -40696,7 +40696,7 @@ _080B5C90: str r6, [sp, 0x8] b _080B5CC8 .align 2, 0 -_080B5CAC: .4byte gUnknown_202063C +_080B5CAC: .4byte gSprites _080B5CB0: lsls r0, r2, 24 lsrs r0, 24 @@ -40909,7 +40909,7 @@ _080B5E38: .align 2, 0 _080B5E48: .4byte 0x00003c0d _080B5E4C: - ldr r3, _080B5E9C @ =gUnknown_202063C + ldr r3, _080B5E9C @ =gSprites movs r0, 0x24 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -40944,7 +40944,7 @@ _080B5E4C: bl SetGpuRegBits b _080B5EAE .align 2, 0 -_080B5E9C: .4byte gUnknown_202063C +_080B5E9C: .4byte gSprites _080B5EA0: .4byte 0x00002771 _080B5EA4: movs r1, 0x80 @@ -41239,7 +41239,7 @@ _080B6092: lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r1, _080B6180 @ =gUnknown_202063C + ldr r1, _080B6180 @ =gSprites adds r4, r5, r1 lsls r0, r6, 4 strh r0, [r4, 0x2E] @@ -41270,7 +41270,7 @@ _080B6092: strh r2, [r4, 0x38] mov r3, r9 strh r3, [r4, 0x3A] - ldr r0, _080B6184 @ =gUnknown_2020658 + ldr r0, _080B6184 @ =gSprites + 0x1C adds r5, r0 ldr r0, _080B6188 @ =sub_80B5FE0 str r0, [r5] @@ -41302,8 +41302,8 @@ _080B6170: .4byte gUnknown_3005090 _080B6174: .4byte gUnknown_2037F02 _080B6178: .4byte gUnknown_2037F1A _080B617C: .4byte gUnknown_83E7668 -_080B6180: .4byte gUnknown_202063C -_080B6184: .4byte gUnknown_2020658 +_080B6180: .4byte gSprites +_080B6184: .4byte gSprites + 0x1C _080B6188: .4byte sub_80B5FE0 _080B618C: ldr r0, _080B6228 @ =gUnknown_83E7668 @@ -41325,7 +41325,7 @@ _080B618C: mov r10, r3 movs r0, 0x28 mov r9, r0 - ldr r6, _080B622C @ =gUnknown_202063C + ldr r6, _080B622C @ =gSprites mov r1, r8 lsls r5, r1, 4 add r5, r8 @@ -41383,7 +41383,7 @@ _080B6210: bx r0 .align 2, 0 _080B6228: .4byte gUnknown_83E7668 -_080B622C: .4byte gUnknown_202063C +_080B622C: .4byte gSprites _080B6230: .4byte gUnknown_2037F02 _080B6234: .4byte sub_80B5FE0 _080B6238: .4byte sub_80B623C @@ -41549,7 +41549,7 @@ _080B6350: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080B6380 @ =gUnknown_202063C + ldr r1, _080B6380 @ =gSprites adds r0, r1 bl DestroySprite adds r0, r5, 0x1 @@ -41562,7 +41562,7 @@ _080B6374: blt _080B6350 b _080B6390 .align 2, 0 -_080B6380: .4byte gUnknown_202063C +_080B6380: .4byte gSprites _080B6384: ldrh r0, [r4, 0x12] adds r0, 0x1 @@ -42340,7 +42340,7 @@ _080B69B2: lsrs r2, r0, 24 cmp r2, 0x40 beq _080B6A06 - ldr r1, _080B6A18 @ =gUnknown_202063C + ldr r1, _080B6A18 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -42379,7 +42379,7 @@ _080B6A06: b _080B6AD4 .align 2, 0 _080B6A14: .4byte gUnknown_83E76E0 -_080B6A18: .4byte gUnknown_202063C +_080B6A18: .4byte gSprites _080B6A1C: .4byte gUnknown_2037F1A _080B6A20: ldrh r0, [r4, 0xA] @@ -42685,7 +42685,7 @@ _080B6C44: lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x10] - ldr r3, _080B6CC8 @ =gUnknown_202063C + ldr r3, _080B6CC8 @ =gSprites movs r2, 0x10 ldrsh r1, [r6, r2] lsls r0, r1, 4 @@ -42730,7 +42730,7 @@ _080B6C44: strh r0, [r6, 0x16] b _080B6F1E .align 2, 0 -_080B6CC8: .4byte gUnknown_202063C +_080B6CC8: .4byte gSprites _080B6CCC: ldrh r0, [r6, 0xA] adds r0, 0x1 @@ -42930,7 +42930,7 @@ _080B6E7A: bl ClearGpuRegBits b _080B6F1E _080B6E82: - ldr r2, _080B6EC0 @ =gUnknown_202063C + ldr r2, _080B6EC0 @ =gSprites movs r0, 0x10 ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -42962,7 +42962,7 @@ _080B6EA2: str r4, [sp, 0x8] b _080B6EDE .align 2, 0 -_080B6EC0: .4byte gUnknown_202063C +_080B6EC0: .4byte gSprites _080B6EC4: lsls r0, r2, 24 lsrs r0, 24 @@ -43231,7 +43231,7 @@ _080B70CC: .align 2, 0 _080B70E4: .4byte 0x00003f44 _080B70E8: - ldr r5, _080B7154 @ =gUnknown_202063C + ldr r5, _080B7154 @ =gSprites movs r1, 0x10 ldrsh r0, [r6, r1] lsls r1, r0, 4 @@ -43283,7 +43283,7 @@ _080B714E: pop {r0} bx r0 .align 2, 0 -_080B7154: .4byte gUnknown_202063C +_080B7154: .4byte gSprites thumb_func_end sub_80B6FC4 thumb_func_start sub_80B7158 @@ -43311,7 +43311,7 @@ sub_80B7158: @ 80B7158 strh r1, [r0, 0x34] ldr r1, _080B71A8 @ =sub_80B71B0 str r1, [r0, 0x1C] - ldr r2, _080B71AC @ =gUnknown_202063C + ldr r2, _080B71AC @ =gSprites movs r3, 0x38 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -43327,7 +43327,7 @@ _080B719C: .4byte gUnknown_2023D44 _080B71A0: .4byte gUnknown_2037F1A _080B71A4: .4byte gUnknown_2037F02 _080B71A8: .4byte sub_80B71B0 -_080B71AC: .4byte gUnknown_202063C +_080B71AC: .4byte gSprites thumb_func_end sub_80B7158 thumb_func_start sub_80B71B0 @@ -43346,7 +43346,7 @@ sub_80B71B0: @ 80B71B0 movs r2, 0x30 ldrsh r1, [r5, r2] bl Sin - ldr r4, _080B7210 @ =gUnknown_202063C + ldr r4, _080B7210 @ =gSprites movs r1, 0x38 ldrsh r2, [r5, r1] lsls r1, r2, 4 @@ -43379,10 +43379,10 @@ sub_80B71B0: @ 80B71B0 strh r0, [r5, 0x2E] b _080B724C .align 2, 0 -_080B7210: .4byte gUnknown_202063C +_080B7210: .4byte gSprites _080B7214: .4byte 0xffffff00 _080B7218: - ldr r2, _080B7254 @ =gUnknown_202063C + ldr r2, _080B7254 @ =gSprites movs r0, 0x38 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -43413,7 +43413,7 @@ _080B724C: pop {r0} bx r0 .align 2, 0 -_080B7254: .4byte gUnknown_202063C +_080B7254: .4byte gSprites _080B7258: .4byte move_anim_8074EE0 thumb_func_end sub_80B71B0 @@ -44334,7 +44334,7 @@ sub_80B7954: @ 80B7954 strh r5, [r6, 0xC] cmp r4, 0x10 bne _080B79D6 - ldr r2, _080B79C4 @ =gUnknown_202063C + ldr r2, _080B79C4 @ =gSprites ldr r1, _080B79C8 @ =gUnknown_2023D44 ldr r0, _080B79CC @ =gUnknown_2037F1A ldrb r0, [r0] @@ -44354,7 +44354,7 @@ sub_80B7954: @ 80B7954 b _080B79D6 .align 2, 0 _080B79C0: .4byte gUnknown_3005090 -_080B79C4: .4byte gUnknown_202063C +_080B79C4: .4byte gSprites _080B79C8: .4byte gUnknown_2023D44 _080B79CC: .4byte gUnknown_2037F1A _080B79D0: @@ -45844,7 +45844,7 @@ sub_80B856C: @ 80B856C lsls r0, 24 lsrs r0, 24 movs r4, 0 - ldr r7, _080B85B4 @ =gUnknown_202063C + ldr r7, _080B85B4 @ =gSprites movs r1, 0x3 ands r0, r1 lsls r5, r0, 2 @@ -45877,7 +45877,7 @@ _080B85A2: pop {r0} bx r0 .align 2, 0 -_080B85B4: .4byte gUnknown_202063C +_080B85B4: .4byte gSprites thumb_func_end sub_80B856C thumb_func_start sub_80B85B8 @@ -45903,7 +45903,7 @@ sub_80B85B8: @ 80B85B8 ldrb r0, [r6] adds r1, r4, 0 bl sub_8072E48 - ldr r0, _080B865C @ =gUnknown_202063C + ldr r0, _080B865C @ =gSprites mov r9, r0 ldr r0, _080B8660 @ =gUnknown_2023D44 mov r8, r0 @@ -45959,7 +45959,7 @@ _080B8642: bx r0 .align 2, 0 _080B8658: .4byte gUnknown_2037F1A -_080B865C: .4byte gUnknown_202063C +_080B865C: .4byte gSprites _080B8660: .4byte gUnknown_2023D44 thumb_func_end sub_80B85B8 @@ -46104,7 +46104,7 @@ _080B8780: lsrs r0, 24 cmp r0, 0x1 bne _080B87CA - ldr r3, _080B8808 @ =gUnknown_202063C + ldr r3, _080B8808 @ =gSprites ldr r1, _080B880C @ =gUnknown_2023D44 ldrb r0, [r4] eors r0, r5 @@ -46155,7 +46155,7 @@ _080B87F8: .4byte 0x00003f3d _080B87FC: .4byte 0x00003f42 _080B8800: .4byte 0x00000c08 _080B8804: .4byte gUnknown_2037F1A -_080B8808: .4byte gUnknown_202063C +_080B8808: .4byte gSprites _080B880C: .4byte gUnknown_2023D44 _080B8810: .4byte gUnknown_2023BCE _080B8814: .4byte gUnknown_202402C @@ -46205,7 +46205,7 @@ _080B8828: movs r2, 0x20 bl LoadCompressedPalette ldr r2, _080B88D0 @ =gUnknown_2022978 - ldr r0, _080B88D4 @ =gUnknown_202063C + ldr r0, _080B88D4 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -46240,7 +46240,7 @@ _080B88C4: .4byte gUnknown_8D1D388 _080B88C8: .4byte gUnknown_8D1D224 _080B88CC: .4byte gUnknown_8D1D360 _080B88D0: .4byte gUnknown_2022978 -_080B88D4: .4byte gUnknown_202063C +_080B88D4: .4byte gSprites _080B88D8: .4byte gUnknown_202297A _080B88DC: .4byte gUnknown_2037F02 _080B88E0: @@ -46317,7 +46317,7 @@ _080B894E: bl GetAnimBankSpriteId lsls r0, 24 lsrs r0, 24 - ldr r5, _080B89F0 @ =gUnknown_202063C + ldr r5, _080B89F0 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -46377,7 +46377,7 @@ _080B8990: .align 2, 0 _080B89E8: .4byte gUnknown_3005090 _080B89EC: .4byte gUnknown_2022978 -_080B89F0: .4byte gUnknown_202063C +_080B89F0: .4byte gSprites _080B89F4: .4byte gUnknown_2023D44 _080B89F8: .4byte gUnknown_2037F1A _080B89FC: @@ -46508,7 +46508,7 @@ _080B8B04: _080B8B06: cmp r2, 0xFF beq _080B8B22 - ldr r1, _080B8B30 @ =gUnknown_202063C + ldr r1, _080B8B30 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -46526,7 +46526,7 @@ _080B8B22: pop {r0} bx r0 .align 2, 0 -_080B8B30: .4byte gUnknown_202063C +_080B8B30: .4byte gSprites _080B8B34: .4byte gUnknown_2037F02 thumb_func_end sub_80B8A74 @@ -47071,7 +47071,7 @@ _080B8F50: movs r0, 0 strh r0, [r4, 0x24] _080B8F72: - ldr r2, _080B8F98 @ =gUnknown_202063C + ldr r2, _080B8F98 @ =gSprites movs r3, 0x1C ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -47088,7 +47088,7 @@ _080B8F72: _080B8F8C: .4byte gUnknown_202297C _080B8F90: .4byte gUnknown_202297E _080B8F94: .4byte gUnknown_2037F1A -_080B8F98: .4byte gUnknown_202063C +_080B8F98: .4byte gSprites _080B8F9C: ldrb r0, [r4, 0x1E] movs r2, 0x24 @@ -47165,7 +47165,7 @@ _080B9026: ldrh r0, [r4, 0x22] subs r0, r2 strh r0, [r1] - ldr r2, _080B904C @ =gUnknown_202063C + ldr r2, _080B904C @ =gSprites movs r1, 0x1C ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -47181,7 +47181,7 @@ _080B9026: b _080B9056 .align 2, 0 _080B9048: .4byte gUnknown_202297E -_080B904C: .4byte gUnknown_202063C +_080B904C: .4byte gSprites _080B9050: ldr r1, _080B9060 @ =gUnknown_2039600 movs r0, 0x3 @@ -47196,7 +47196,7 @@ _080B9060: .4byte gUnknown_2039600 _080B9064: adds r0, r2, 0 bl DestroyAnimVisualTask - ldr r2, _080B9088 @ =gUnknown_202063C + ldr r2, _080B9088 @ =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -47213,7 +47213,7 @@ _080B9082: pop {r0} bx r0 .align 2, 0 -_080B9088: .4byte gUnknown_202063C +_080B9088: .4byte gSprites thumb_func_end sub_80B8ED4 thumb_func_start sub_80B908C @@ -47225,7 +47225,7 @@ sub_80B908C: @ 80B908C bl GetAnimBankSpriteId lsls r0, 24 lsrs r0, 24 - ldr r2, _080B90CC @ =gUnknown_202063C + ldr r2, _080B90CC @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -47249,7 +47249,7 @@ sub_80B908C: @ 80B908C ldr r0, _080B90D4 @ =gUnknown_202297A b _080B90DA .align 2, 0 -_080B90CC: .4byte gUnknown_202063C +_080B90CC: .4byte gSprites _080B90D0: .4byte gUnknown_2037F1A _080B90D4: .4byte gUnknown_202297A _080B90D8: @@ -47324,7 +47324,7 @@ _080B9150: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] - ldr r3, _080B91A0 @ =gUnknown_202063C + ldr r3, _080B91A0 @ =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -47359,7 +47359,7 @@ _080B9150: strh r0, [r4, 0x8] b _080B91AA .align 2, 0 -_080B91A0: .4byte gUnknown_202063C +_080B91A0: .4byte gSprites _080B91A4: adds r0, r2, 0 bl DestroyAnimVisualTask @@ -47444,7 +47444,7 @@ _080B9244: bl sub_80B92B8 b _080B929A _080B9252: - ldr r2, _080B9268 @ =gUnknown_202063C + ldr r2, _080B9268 @ =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -47455,9 +47455,9 @@ _080B9252: strh r1, [r0, 0x26] b _080B929A .align 2, 0 -_080B9268: .4byte gUnknown_202063C +_080B9268: .4byte gSprites _080B926C: - ldr r2, _080B92A4 @ =gUnknown_202063C + ldr r2, _080B92A4 @ =gSprites movs r0, 0x1C ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -47486,7 +47486,7 @@ _080B929A: strh r0, [r4, 0x8] b _080B92B2 .align 2, 0 -_080B92A4: .4byte gUnknown_202063C +_080B92A4: .4byte gSprites _080B92A8: .4byte gUnknown_2039600 _080B92AC: adds r0, r2, 0 @@ -48086,7 +48086,7 @@ _080B9718: ldrsh r0, [r4, r7] cmp r2, r0 bge _080B9750 - ldr r0, _080B975C @ =gUnknown_202063C + ldr r0, _080B975C @ =gSprites mov r12, r0 adds r5, r4, 0 adds r5, 0x8 @@ -48118,7 +48118,7 @@ _080B9756: pop {r0} bx r0 .align 2, 0 -_080B975C: .4byte gUnknown_202063C +_080B975C: .4byte gSprites thumb_func_end sub_80B967C thumb_func_start sub_80B9760 @@ -48158,7 +48158,7 @@ _080B9798: ldrsh r0, [r3, r7] cmp r2, r0 bge _080B97CC - ldr r6, _080B97D4 @ =gUnknown_202063C + ldr r6, _080B97D4 @ =gSprites adds r5, r3, 0 adds r5, 0x8 _080B97A8: @@ -48185,7 +48185,7 @@ _080B97CC: pop {r0} bx r0 .align 2, 0 -_080B97D4: .4byte gUnknown_202063C +_080B97D4: .4byte gSprites thumb_func_end sub_80B9760 thumb_func_start sub_80B97D8 @@ -49517,7 +49517,7 @@ _080BA1D0: ands r0, r1 cmp r0, 0 beq _080BA200 - ldr r2, _080BA274 @ =gUnknown_202063C + ldr r2, _080BA274 @ =gSprites ldr r0, _080BA278 @ =gUnknown_3004FF0 add r0, r9 ldrb r1, [r0] @@ -49590,7 +49590,7 @@ _080BA264: .4byte gUnknown_2037F02 _080BA268: .4byte gUnknown_2037F1A _080BA26C: .4byte gUnknown_2037F1B _080BA270: .4byte 0x0000ffff -_080BA274: .4byte gUnknown_202063C +_080BA274: .4byte gSprites _080BA278: .4byte gUnknown_3004FF0 thumb_func_end sub_80BA16C @@ -49639,15 +49639,15 @@ _080BA2C4: .align 2, 0 _080BA2C8: .4byte gUnknown_2022982 _080BA2CC: - ldr r1, _080BA2D8 @ =gUnknown_2021BC8 + ldr r1, _080BA2D8 @ =gSpriteCoordOffsetX _080BA2CE: adds r0, r4, 0 bl StoreSpriteCallbackInData6 b _080BA2E4 .align 2, 0 -_080BA2D8: .4byte gUnknown_2021BC8 +_080BA2D8: .4byte gSpriteCoordOffsetX _080BA2DC: - ldr r1, _080BA314 @ =gUnknown_2021BCA + ldr r1, _080BA314 @ =gSpriteCoordOffsetY adds r0, r4, 0 bl StoreSpriteCallbackInData6 _080BA2E4: @@ -49675,7 +49675,7 @@ _080BA308: pop {r0} bx r0 .align 2, 0 -_080BA314: .4byte gUnknown_2021BCA +_080BA314: .4byte gSpriteCoordOffsetY _080BA318: .4byte gUnknown_2037F02 _080BA31C: .4byte sub_80BA320 thumb_func_end sub_80BA27C @@ -49736,7 +49736,7 @@ _080BA362: ldrb r0, [r5] cmp r4, r0 bcs _080BA3B4 - ldr r2, _080BA3C4 @ =gUnknown_202063C + ldr r2, _080BA3C4 @ =gSprites mov r12, r2 ldr r6, _080BA3C8 @ =gUnknown_2023D44 movs r7, 0x3 @@ -49768,14 +49768,14 @@ _080BA3BA: bx r0 .align 2, 0 _080BA3C0: .4byte gUnknown_2023BCC -_080BA3C4: .4byte gUnknown_202063C +_080BA3C4: .4byte gSprites _080BA3C8: .4byte gUnknown_2023D44 thumb_func_end sub_80BA320 thumb_func_start sub_80BA3CC sub_80BA3CC: @ 80BA3CC push {r4-r6,lr} - ldr r6, _080BA440 @ =gUnknown_202063C + ldr r6, _080BA440 @ =gSprites ldr r4, _080BA444 @ =gUnknown_2023D44 ldr r5, _080BA448 @ =gUnknown_2037F1A ldrb r0, [r5] @@ -49832,7 +49832,7 @@ sub_80BA3CC: @ 80BA3CC ldrb r1, [r0] b _080BA470 .align 2, 0 -_080BA440: .4byte gUnknown_202063C +_080BA440: .4byte gSprites _080BA444: .4byte gUnknown_2023D44 _080BA448: .4byte gUnknown_2037F1A _080BA44C: .4byte gUnknown_2037F1B @@ -50164,7 +50164,7 @@ sub_80BA6C8: @ 80BA6C8 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] - ldr r2, _080BA72C @ =gUnknown_202063C + ldr r2, _080BA72C @ =gSprites movs r0, 0x2E ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -50202,7 +50202,7 @@ sub_80BA6C8: @ 80BA6C8 bx r0 .align 2, 0 _080BA728: .4byte gUnknown_2037F02 -_080BA72C: .4byte gUnknown_202063C +_080BA72C: .4byte gSprites _080BA730: .4byte move_anim_8074EE0 _080BA734: .4byte sub_8074F50 thumb_func_end sub_80BA6C8 @@ -50842,7 +50842,7 @@ _080BAC00: lsls r0, 16 cmp r0, 0 blt _080BAC7E - ldr r6, _080BAC8C @ =gUnknown_202063C + ldr r6, _080BAC8C @ =gSprites movs r1, 0x14 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -50907,7 +50907,7 @@ _080BAC7E: strh r0, [r4, 0xA] b _080BACA2 .align 2, 0 -_080BAC8C: .4byte gUnknown_202063C +_080BAC8C: .4byte gSprites _080BAC90: .4byte sub_80BACA8 _080BAC94: movs r1, 0x12 @@ -51054,7 +51054,7 @@ _080BADAA: lsrs r0, 24 cmp r0, 0x1 bne _080BADFE - ldr r3, _080BAE3C @ =gUnknown_202063C + ldr r3, _080BAE3C @ =gSprites ldr r1, _080BAE40 @ =gUnknown_2023D44 ldrb r0, [r5] eors r0, r6 @@ -51110,7 +51110,7 @@ _080BAE2C: .4byte 0x00003f3d _080BAE30: .4byte 0x00003f42 _080BAE34: .4byte 0x00000c08 _080BAE38: .4byte gUnknown_2037F1A -_080BAE3C: .4byte gUnknown_202063C +_080BAE3C: .4byte gSprites _080BAE40: .4byte gUnknown_2023D44 _080BAE44: .4byte gUnknown_2023BCE _080BAE48: .4byte gUnknown_202402C @@ -51172,7 +51172,7 @@ _080BAEAC: movs r2, 0x2 bl LoadPalette ldr r2, _080BAF24 @ =gUnknown_2022978 - ldr r0, _080BAF28 @ =gUnknown_202063C + ldr r0, _080BAF28 @ =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -51211,7 +51211,7 @@ _080BAF18: .4byte gUnknown_8D20858 _080BAF1C: .4byte gUnknown_8D2083C _080BAF20: .4byte gUnknown_83E7CC8 _080BAF24: .4byte gUnknown_2022978 -_080BAF28: .4byte gUnknown_202063C +_080BAF28: .4byte gSprites _080BAF2C: .4byte gUnknown_202297A _080BAF30: .4byte gUnknown_3005090 _080BAF34: .4byte sub_80BAF38 @@ -51306,7 +51306,7 @@ _080BAFCA: bl SetGpuReg movs r0, 0 bl GetAnimBankSpriteId - ldr r4, _080BB07C @ =gUnknown_202063C + ldr r4, _080BB07C @ =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -51364,7 +51364,7 @@ _080BB06C: .4byte gUnknown_202297A _080BB070: .4byte gUnknown_2022984 _080BB074: .4byte gUnknown_2022986 _080BB078: .4byte 0x00003f3f -_080BB07C: .4byte gUnknown_202063C +_080BB07C: .4byte gSprites _080BB080: .4byte gUnknown_2023D44 _080BB084: .4byte gUnknown_2037F1A thumb_func_end sub_80BAF38 @@ -51525,7 +51525,7 @@ _080BB1C0: lsrs r5, r0, 24 cmp r5, 0x1 bne _080BB20A - ldr r3, _080BB24C @ =gUnknown_202063C + ldr r3, _080BB24C @ =gSprites ldr r1, _080BB250 @ =gUnknown_2023D44 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -51579,7 +51579,7 @@ _080BB23C: .4byte gUnknown_2022986 _080BB240: .4byte 0x00003f3f _080BB244: .4byte 0x00003f3d _080BB248: .4byte 0x00003f42 -_080BB24C: .4byte gUnknown_202063C +_080BB24C: .4byte gSprites _080BB250: .4byte gUnknown_2023D44 _080BB254: .4byte gUnknown_2023BCE _080BB258: .4byte gUnknown_202402C @@ -52026,7 +52026,7 @@ _080BB5B2: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080BB658 @ =gUnknown_202063C + ldr r4, _080BB658 @ =gSprites adds r0, r4 bl DestroySprite movs r1, 0xC @@ -52079,7 +52079,7 @@ _080BB644: _080BB64C: .4byte gUnknown_2022984 _080BB650: .4byte gUnknown_2022986 _080BB654: .4byte 0x00003f3f -_080BB658: .4byte gUnknown_202063C +_080BB658: .4byte gSprites _080BB65C: .4byte gUnknown_20399B4 thumb_func_end sub_80BB4B8 @@ -52529,7 +52529,7 @@ sub_80BB9B0: @ 80BB9B0 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r6, _080BBA10 @ =gUnknown_202063C + ldr r6, _080BBA10 @ =gSprites _080BB9BA: ldr r0, _080BBA14 @ =gUnknown_2037F1A ldrb r0, [r0] @@ -52573,7 +52573,7 @@ _080BB9F8: pop {r0} bx r0 .align 2, 0 -_080BBA10: .4byte gUnknown_202063C +_080BBA10: .4byte gSprites _080BBA14: .4byte gUnknown_2037F1A _080BBA18: .4byte gUnknown_2023D44 _080BBA1C: .4byte gUnknown_2037F02 @@ -53013,7 +53013,7 @@ _080BBD7E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080BBDEC @ =gUnknown_202063C + ldr r4, _080BBDEC @ =gSprites adds r0, r4 bl DestroySprite movs r1, 0xC @@ -53039,7 +53039,7 @@ _080BBDD8: _080BBDE0: .4byte gUnknown_2022984 _080BBDE4: .4byte gUnknown_2022986 _080BBDE8: .4byte 0x00003f3f -_080BBDEC: .4byte gUnknown_202063C +_080BBDEC: .4byte gSprites thumb_func_end sub_80BBC2C thumb_func_start sub_80BBDF0 @@ -54998,7 +54998,7 @@ _080BCD34: ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - ldr r4, _080BCDB4 @ =gUnknown_202063C + ldr r4, _080BCDB4 @ =gSprites ldr r5, _080BCDB8 @ =gUnknown_2023FE8 ldr r0, [r5] adds r0, 0x7D @@ -55057,7 +55057,7 @@ _080BCD34: bl SetGpuReg b _080BCEE6 .align 2, 0 -_080BCDB4: .4byte gUnknown_202063C +_080BCDB4: .4byte gSprites _080BCDB8: .4byte gUnknown_2023FE8 _080BCDBC: .4byte sub_801182C _080BCDC0: .4byte 0x00003f06 diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index 31ad64420..88f09c90b 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -2117,7 +2117,7 @@ _080DF2A8: bl PlaySE12WithPanning cmp r4, 0x40 beq _080DF30C - ldr r5, _080DF340 @ =gUnknown_202063C + ldr r5, _080DF340 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -2134,7 +2134,7 @@ _080DF2A8: strb r0, [r3] adds r5, 0x1C adds r1, r5 - ldr r0, _080DF344 @ =nullsub_8 + ldr r0, _080DF344 @ =SpriteCallbackDummy str r0, [r1] _080DF30C: ldrh r1, [r6, 0xA] @@ -2163,8 +2163,8 @@ _080DF324: b _080DF41A .align 2, 0 _080DF33C: .4byte gUnknown_83E398C -_080DF340: .4byte gUnknown_202063C -_080DF344: .4byte nullsub_8 +_080DF340: .4byte gSprites +_080DF344: .4byte SpriteCallbackDummy _080DF348: .4byte gUnknown_83FF080 _080DF34C: adds r0, r6, 0 @@ -2219,7 +2219,7 @@ _080DF39E: _080DF3A4: movs r5, 0 movs r7, 0 - ldr r3, _080DF400 @ =gUnknown_202063C + ldr r3, _080DF400 @ =gSprites movs r0, 0x1C adds r0, r3 mov r8, r0 @@ -2265,7 +2265,7 @@ _080DF3F6: strh r0, [r6, 0x8] b _080DF41A .align 2, 0 -_080DF400: .4byte gUnknown_202063C +_080DF400: .4byte gSprites _080DF404: .4byte gUnknown_83E398C _080DF408: .4byte sub_80DF428 _080DF40C: @@ -2558,7 +2558,7 @@ _080DF610: bne _080DF682 movs r0, 0 strh r0, [r5, 0x34] - ldr r1, _080DF660 @ =gUnknown_202063C + ldr r1, _080DF660 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -2576,7 +2576,7 @@ _080DF658: strh r0, [r5, 0x2E] b _080DF682 .align 2, 0 -_080DF660: .4byte gUnknown_202063C +_080DF660: .4byte gSprites _080DF664: ldrh r0, [r5, 0x26] subs r0, 0x6 @@ -3300,7 +3300,7 @@ c3_80DFBE4: @ 80DFBE4 lsls r0, 24 lsrs r0, 24 ldr r4, _080DFC14 @ =gUnknown_2037F02 - ldr r3, _080DFC18 @ =gUnknown_202063C + ldr r3, _080DFC18 @ =gSprites ldr r2, _080DFC1C @ =gUnknown_2023D44 ldr r1, _080DFC20 @ =gUnknown_2037F1A ldrb r1, [r1] @@ -3321,7 +3321,7 @@ c3_80DFBE4: @ 80DFBE4 bx r0 .align 2, 0 _080DFC14: .4byte gUnknown_2037F02 -_080DFC18: .4byte gUnknown_202063C +_080DFC18: .4byte gSprites _080DFC1C: .4byte gUnknown_2023D44 _080DFC20: .4byte gUnknown_2037F1A thumb_func_end c3_80DFBE4 @@ -3732,7 +3732,7 @@ _080DFF06: lsls r2, r0, 4 add r2, r9 lsls r2, 2 - ldr r1, _080E000C @ =gUnknown_202063C + ldr r1, _080E000C @ =gSprites mov r10, r1 adds r5, r2, r1 adds r0, r5, 0 @@ -3797,7 +3797,7 @@ _080DFF06: _080E0000: .4byte gUnknown_2037F1A _080E0004: .4byte gUnknown_2037F02 _080E0008: .4byte gUnknown_83FF26C -_080E000C: .4byte gUnknown_202063C +_080E000C: .4byte gSprites _080E0010: .4byte 0x0000ffff _080E0014: .4byte sub_80E0128 _080E0018: .4byte sub_80E001C @@ -3828,7 +3828,7 @@ sub_80E001C: @ 80E001C negs r1, r1 cmp r0, r1 bge _080E006A - ldr r2, _080E00C4 @ =gUnknown_202063C + ldr r2, _080E00C4 @ =gSprites movs r0, 0x3A ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -3855,7 +3855,7 @@ _080E006A: negs r0, r0 cmp r1, r0 bge _080E009E - ldr r2, _080E00C4 @ =gUnknown_202063C + ldr r2, _080E00C4 @ =gSprites movs r0, 0x3C ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -3893,7 +3893,7 @@ _080E00C0: pop {r0} bx r0 .align 2, 0 -_080E00C4: .4byte gUnknown_202063C +_080E00C4: .4byte gSprites _080E00C8: .4byte sub_80E00CC thumb_func_end sub_80E001C @@ -3901,7 +3901,7 @@ _080E00C8: .4byte sub_80E00CC sub_80E00CC: @ 80E00CC push {r4-r6,lr} adds r4, r0, 0 - ldr r5, _080E0120 @ =gUnknown_202063C + ldr r5, _080E0120 @ =gSprites movs r0, 0x3A ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -3911,7 +3911,7 @@ sub_80E00CC: @ 80E00CC adds r6, 0x1C adds r0, r3, r6 ldr r2, [r0] - ldr r0, _080E0124 @ =nullsub_8 + ldr r0, _080E0124 @ =SpriteCallbackDummy cmp r2, r0 bne _080E0118 movs r1, 0x3C @@ -3939,8 +3939,8 @@ _080E0118: pop {r0} bx r0 .align 2, 0 -_080E0120: .4byte gUnknown_202063C -_080E0124: .4byte nullsub_8 +_080E0120: .4byte gSprites +_080E0124: .4byte SpriteCallbackDummy thumb_func_end sub_80E00CC thumb_func_start sub_80E0128 @@ -3981,13 +3981,13 @@ sub_80E0128: @ 80E0128 orrs r0, r1 mov r1, r12 strb r0, [r1] - ldr r0, _080E0178 @ =nullsub_8 + ldr r0, _080E0178 @ =SpriteCallbackDummy str r0, [r3, 0x1C] _080E0174: pop {r0} bx r0 .align 2, 0 -_080E0178: .4byte nullsub_8 +_080E0178: .4byte SpriteCallbackDummy thumb_func_end sub_80E0128 thumb_func_start sub_80E017C @@ -4599,7 +4599,7 @@ _080E0650: _080E065A: b _080E0788 _080E065C: - ldr r2, _080E06AC @ =gUnknown_202063C + ldr r2, _080E06AC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -4638,9 +4638,9 @@ _080E065C: strh r6, [r4, 0xA] b _080E0770 .align 2, 0 -_080E06AC: .4byte gUnknown_202063C +_080E06AC: .4byte gSprites _080E06B0: - ldr r2, _080E0704 @ =gUnknown_202063C + ldr r2, _080E0704 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -4681,9 +4681,9 @@ _080E06B0: strh r0, [r4, 0xA] b _080E0770 .align 2, 0 -_080E0704: .4byte gUnknown_202063C +_080E0704: .4byte gSprites _080E0708: - ldr r2, _080E076C @ =gUnknown_202063C + ldr r2, _080E076C @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -4731,7 +4731,7 @@ _080E0708: strh r5, [r4, 0x8] b _080E0788 .align 2, 0 -_080E076C: .4byte gUnknown_202063C +_080E076C: .4byte gSprites _080E0770: ldrh r0, [r4, 0x8] adds r0, 0x1 @@ -5045,7 +5045,7 @@ _080E09BA: lsls r0, 24 lsrs r0, 24 bl sub_80759DC - ldr r2, _080E0A28 @ =gUnknown_202063C + ldr r2, _080E0A28 @ =gSprites movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -5087,7 +5087,7 @@ _080E09EE: strh r0, [r7, 0x24] b _080E0A30 .align 2, 0 -_080E0A28: .4byte gUnknown_202063C +_080E0A28: .4byte gSprites _080E0A2C: movs r0, 0x2 strh r0, [r7, 0x8] @@ -5307,7 +5307,7 @@ _080E0BB2: cmp r0, 0 bne _080E0BE8 _080E0BD8: - ldr r0, _080E0C04 @ =gUnknown_202063C + ldr r0, _080E0C04 @ =gSprites lsls r2, r5, 4 adds r1, r2, r5 lsls r1, 2 @@ -5316,7 +5316,7 @@ _080E0BD8: adds r0, 0x10 strh r0, [r1, 0x26] _080E0BE8: - ldr r1, _080E0C04 @ =gUnknown_202063C + ldr r1, _080E0C04 @ =gSprites adds r0, r2, r5 lsls r0, 2 adds r0, r1 @@ -5331,7 +5331,7 @@ _080E0BE8: strh r0, [r1, 0x8] b _080E0C58 .align 2, 0 -_080E0C04: .4byte gUnknown_202063C +_080E0C04: .4byte gSprites _080E0C08: .4byte gUnknown_3005090 _080E0C0C: ldrb r5, [r2, 0x1C] @@ -5344,7 +5344,7 @@ _080E0C0C: cmp r0, 0x3 bne _080E0C30 strh r4, [r2, 0xC] - ldr r0, _080E0C64 @ =gUnknown_202063C + ldr r0, _080E0C64 @ =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -5362,7 +5362,7 @@ _080E0C30: bne _080E0C58 adds r0, r5, 0 bl sub_8075980 - ldr r1, _080E0C64 @ =gUnknown_202063C + ldr r1, _080E0C64 @ =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -5378,7 +5378,7 @@ _080E0C58: pop {r0} bx r0 .align 2, 0 -_080E0C64: .4byte gUnknown_202063C +_080E0C64: .4byte gSprites thumb_func_end sub_80E0B00 thumb_func_start sub_80E0C68 @@ -6020,7 +6020,7 @@ _080E1112: adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 - ldr r0, _080E1208 @ =gUnknown_202063C + ldr r0, _080E1208 @ =gSprites lsls r5, r6, 4 adds r5, r6 lsls r5, 2 @@ -6091,7 +6091,7 @@ _080E1112: _080E11FC: .4byte 0x0000ffec _080E1200: .4byte gUnknown_2037F1A _080E1204: .4byte gUnknown_2037F1B -_080E1208: .4byte gUnknown_202063C +_080E1208: .4byte gSprites _080E120C: .4byte 0x00007fff _080E1210: .4byte gUnknown_3005090 _080E1214: .4byte sub_80E1218 @@ -6165,7 +6165,7 @@ sub_80E1274: @ 80E1274 ldrh r0, [r5, 0x1E] adds r0, 0x80 strh r0, [r5, 0x1E] - ldr r1, _080E12F0 @ =gUnknown_202063C + ldr r1, _080E12F0 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -6207,7 +6207,7 @@ _080E12E2: bx r0 .align 2, 0 _080E12EC: .4byte gUnknown_3005090 -_080E12F0: .4byte gUnknown_202063C +_080E12F0: .4byte gSprites _080E12F4: .4byte sub_8074FA8 thumb_func_end sub_80E1274 @@ -6798,7 +6798,7 @@ sub_80E174C: @ 80E174C ands r0, r5 cmp r0, 0 bne _080E17B0 - ldr r2, _080E17A8 @ =gUnknown_202063C + ldr r2, _080E17A8 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -6810,10 +6810,10 @@ sub_80E174C: @ 80E174C b _080E17C0 .align 2, 0 _080E17A4: .4byte gUnknown_3005090 -_080E17A8: .4byte gUnknown_202063C +_080E17A8: .4byte gSprites _080E17AC: .4byte 0x0000ffff _080E17B0: - ldr r2, _080E17E0 @ =gUnknown_202063C + ldr r2, _080E17E0 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -6837,7 +6837,7 @@ _080E17D8: pop {r0} bx r0 .align 2, 0 -_080E17E0: .4byte gUnknown_202063C +_080E17E0: .4byte gSprites thumb_func_end sub_80E174C thumb_func_start sub_80E17E4 @@ -7144,7 +7144,7 @@ _080E1A12: mov r12, r2 cmp r0, 0 beq _080E1A50 - ldr r3, _080E1A4C @ =gUnknown_202063C + ldr r3, _080E1A4C @ =gSprites movs r2, 0x26 ldrsh r0, [r4, r2] lsls r1, r0, 4 @@ -7158,9 +7158,9 @@ _080E1A12: adds r2, r3, 0 b _080E1A66 .align 2, 0 -_080E1A4C: .4byte gUnknown_202063C +_080E1A4C: .4byte gSprites _080E1A50: - ldr r2, _080E1A94 @ =gUnknown_202063C + ldr r2, _080E1A94 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -7195,7 +7195,7 @@ _080E1A66: subs r0, r2 b _080E1AAA .align 2, 0 -_080E1A94: .4byte gUnknown_202063C +_080E1A94: .4byte gSprites _080E1A98: movs r1, 0x26 ldrsh r0, [r4, r1] @@ -7333,7 +7333,7 @@ _080E1B5E: mov r12, r3 cmp r0, 0 beq _080E1BB8 - ldr r3, _080E1BB4 @ =gUnknown_202063C + ldr r3, _080E1BB4 @ =gSprites movs r2, 0x26 ldrsh r0, [r4, r2] lsls r1, r0, 4 @@ -7348,9 +7348,9 @@ _080E1B5E: b _080E1BCE .align 2, 0 _080E1BB0: .4byte 0x00007fff -_080E1BB4: .4byte gUnknown_202063C +_080E1BB4: .4byte gSprites _080E1BB8: - ldr r2, _080E1BFC @ =gUnknown_202063C + ldr r2, _080E1BFC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -7385,7 +7385,7 @@ _080E1BCE: subs r0, r2 b _080E1C12 .align 2, 0 -_080E1BFC: .4byte gUnknown_202063C +_080E1BFC: .4byte gSprites _080E1C00: movs r1, 0x26 ldrsh r0, [r4, r1] @@ -7770,7 +7770,7 @@ _080E1EC4: strh r0, [r2, 0x2] movs r5, 0 mov r8, r2 - ldr r7, _080E1F68 @ =gUnknown_202063C + ldr r7, _080E1F68 @ =gSprites _080E1EFC: lsls r0, r5, 1 add r0, sp @@ -7827,7 +7827,7 @@ _080E1F50: pop {r0} bx r0 .align 2, 0 -_080E1F68: .4byte gUnknown_202063C +_080E1F68: .4byte gSprites _080E1F6C: .4byte gUnknown_83FF54C _080E1F70: .4byte 0x0000ffff thumb_func_end sub_80E1E98 @@ -7895,7 +7895,7 @@ sub_80E1FC4: @ 80E1FC4 bl GetAnimBankSpriteId lsls r0, 24 lsrs r0, 24 - ldr r2, _080E2014 @ =gUnknown_202063C + ldr r2, _080E2014 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -7916,7 +7916,7 @@ sub_80E1FC4: @ 80E1FC4 .align 2, 0 _080E200C: .4byte gUnknown_3005090 _080E2010: .4byte gUnknown_2037F02 -_080E2014: .4byte gUnknown_202063C +_080E2014: .4byte gSprites _080E2018: .4byte sub_80E201C thumb_func_end sub_80E1FC4 @@ -8298,7 +8298,7 @@ _080E22D4: bl sub_80E23E8 movs r6, 0 mov r8, r4 - ldr r4, _080E2348 @ =gUnknown_202063C + ldr r4, _080E2348 @ =gSprites _080E230E: add r0, sp, 0x10 movs r2, 0 @@ -8329,7 +8329,7 @@ _080E230E: strh r0, [r1, 0x24] b _080E238A .align 2, 0 -_080E2348: .4byte gUnknown_202063C +_080E2348: .4byte gSprites _080E234C: .4byte gUnknown_83FF5CC _080E2350: lsls r2, r3, 4 @@ -8365,7 +8365,7 @@ _080E2378: _080E2388: strh r0, [r1, 0x26] _080E238A: - ldr r1, _080E23C8 @ =gUnknown_202063C + ldr r1, _080E23C8 @ =gSprites adds r0, r2, r3 lsls r0, 2 adds r0, r1 @@ -8398,7 +8398,7 @@ _080E23C0: strh r0, [r5, 0xC] b _080E23DA .align 2, 0 -_080E23C8: .4byte gUnknown_202063C +_080E23C8: .4byte gSprites _080E23CC: movs r1, 0x1C ldrsh r0, [r5, r1] @@ -8655,7 +8655,7 @@ _080E258A: strh r0, [r7, 0x26] cmp r0, 0x40 beq _080E2654 - ldr r4, _080E2648 @ =gUnknown_202063C + ldr r4, _080E2648 @ =gSprites movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -8719,7 +8719,7 @@ _080E2638: .4byte gUnknown_3005090 _080E263C: .4byte gUnknown_2037F1A _080E2640: .4byte gUnknown_2037F1B _080E2644: .4byte gUnknown_83FF62C -_080E2648: .4byte gUnknown_202063C +_080E2648: .4byte gSprites _080E264C: .4byte 0x0000ffe0 _080E2650: .4byte sub_80E2668 _080E2654: @@ -8776,7 +8776,7 @@ _080E269A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E26CC @ =gUnknown_202063C + ldr r1, _080E26CC @ =gSprites adds r0, r1 bl AnimateBallThrow ldrh r0, [r4, 0xC] @@ -8788,14 +8788,14 @@ _080E269A: ble _080E276E b _080E275A .align 2, 0 -_080E26CC: .4byte gUnknown_202063C +_080E26CC: .4byte gSprites _080E26D0: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E26F0 @ =gUnknown_202063C + ldr r1, _080E26F0 @ =gSprites adds r0, r1 bl AnimateBallThrow lsls r0, 24 @@ -8806,7 +8806,7 @@ _080E26D0: strh r0, [r4, 0xC] b _080E275A .align 2, 0 -_080E26F0: .4byte gUnknown_202063C +_080E26F0: .4byte gSprites _080E26F4: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -8820,7 +8820,7 @@ _080E26F4: ldrh r2, [r4, 0xC] adds r2, 0x1 strh r2, [r4, 0xC] - ldr r5, _080E2764 @ =gUnknown_202063C + ldr r5, _080E2764 @ =gSprites movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -8863,7 +8863,7 @@ _080E275A: strh r0, [r4, 0x8] b _080E276E .align 2, 0 -_080E2764: .4byte gUnknown_202063C +_080E2764: .4byte gSprites _080E2768: adds r0, r2, 0 bl DestroyAnimVisualTask @@ -9135,7 +9135,7 @@ sub_80E2934: @ 80E2934 ands r0, r1 cmp r0, 0 bne _080E297C - ldr r2, _080E2978 @ =gUnknown_202063C + ldr r2, _080E2978 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9146,9 +9146,9 @@ sub_80E2934: @ 80E2934 b _080E298C .align 2, 0 _080E2974: .4byte gUnknown_3005090 -_080E2978: .4byte gUnknown_202063C +_080E2978: .4byte gSprites _080E297C: - ldr r2, _080E29D4 @ =gUnknown_202063C + ldr r2, _080E29D4 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9165,7 +9165,7 @@ _080E298E: lsrs r5, r0, 24 cmp r5, 0 bne _080E29EA - ldr r2, _080E29D4 @ =gUnknown_202063C + ldr r2, _080E29D4 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -9193,7 +9193,7 @@ _080E298E: strh r5, [r4, 0xC] b _080E29EA .align 2, 0 -_080E29D4: .4byte gUnknown_202063C +_080E29D4: .4byte gSprites _080E29D8: .4byte 0x0000fffe _080E29DC: .4byte gUnknown_3005090 _080E29E0: .4byte gUnknown_83FF65C @@ -9721,7 +9721,7 @@ _080E2DC4: _080E2DD4: b _080E2EE0 _080E2DD6: - ldr r2, _080E2E04 @ =gUnknown_202063C + ldr r2, _080E2E04 @ =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -9746,9 +9746,9 @@ _080E2DD6: _080E2E02: b _080E2EE0 .align 2, 0 -_080E2E04: .4byte gUnknown_202063C +_080E2E04: .4byte gSprites _080E2E08: - ldr r2, _080E2E34 @ =gUnknown_202063C + ldr r2, _080E2E34 @ =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -9771,7 +9771,7 @@ _080E2E08: bne _080E2F08 b _080E2EE0 .align 2, 0 -_080E2E34: .4byte gUnknown_202063C +_080E2E34: .4byte gSprites _080E2E38: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -9793,7 +9793,7 @@ _080E2E38: strh r0, [r3, 0x8] b _080E2F08 _080E2E5E: - ldr r2, _080E2E84 @ =gUnknown_202063C + ldr r2, _080E2E84 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -9813,7 +9813,7 @@ _080E2E5E: bne _080E2F08 b _080E2EE0 .align 2, 0 -_080E2E84: .4byte gUnknown_202063C +_080E2E84: .4byte gSprites _080E2E88: ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -9824,7 +9824,7 @@ _080E2E88: bne _080E2F08 b _080E2EE0 _080E2E98: - ldr r2, _080E2EB4 @ =gUnknown_202063C + ldr r2, _080E2EB4 @ =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -9838,9 +9838,9 @@ _080E2E98: subs r0, r2 b _080E2ED0 .align 2, 0 -_080E2EB4: .4byte gUnknown_202063C +_080E2EB4: .4byte gSprites _080E2EB8: - ldr r2, _080E2EEC @ =gUnknown_202063C + ldr r2, _080E2EEC @ =gSprites movs r1, 0x26 ldrsh r0, [r3, r1] lsls r1, r0, 4 @@ -9870,9 +9870,9 @@ _080E2EE4: strh r0, [r3, 0x8] b _080E2F08 .align 2, 0 -_080E2EEC: .4byte gUnknown_202063C +_080E2EEC: .4byte gSprites _080E2EF0: - ldr r2, _080E2F10 @ =gUnknown_202063C + ldr r2, _080E2F10 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -9888,7 +9888,7 @@ _080E2F08: pop {r0} bx r0 .align 2, 0 -_080E2F10: .4byte gUnknown_202063C +_080E2F10: .4byte gSprites thumb_func_end sub_80E2D74 thumb_func_start sub_80E2F14 @@ -10413,7 +10413,7 @@ _080E32DC: strh r0, [r4, 0xE] adds r0, r5, 0 bl sub_8075980 - ldr r1, _080E3330 @ =gUnknown_202063C + ldr r1, _080E3330 @ =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -10429,7 +10429,7 @@ _080E3328: strh r0, [r4, 0x8] b _080E3360 .align 2, 0 -_080E3330: .4byte gUnknown_202063C +_080E3330: .4byte gSprites _080E3334: ldr r0, _080E336C @ =gUnknown_2037F1A ldrb r0, [r0] @@ -10497,7 +10497,7 @@ _080E33A4: beq _080E3480 b _080E34C6 _080E33AE: - ldr r0, _080E33D0 @ =gUnknown_202063C + ldr r0, _080E33D0 @ =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -10514,14 +10514,14 @@ _080E33AE: strh r5, [r4, 0x1C] b _080E3472 .align 2, 0 -_080E33D0: .4byte gUnknown_202063C +_080E33D0: .4byte gSprites _080E33D4: .4byte 0x0000ff38 _080E33D8: ldrh r1, [r4, 0x1C] adds r1, 0x70 movs r5, 0 strh r1, [r4, 0x1C] - ldr r2, _080E343C @ =gUnknown_202063C + ldr r2, _080E343C @ =gSprites lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -10567,7 +10567,7 @@ _080E3412: strh r0, [r4, 0x1C] b _080E3472 .align 2, 0 -_080E343C: .4byte gUnknown_202063C +_080E343C: .4byte gSprites _080E3440: .4byte 0xfffff800 _080E3444: ldrh r0, [r4, 0x1C] @@ -10579,7 +10579,7 @@ _080E3444: movs r0, 0 strh r0, [r4, 0x1C] _080E3454: - ldr r0, _080E347C @ =gUnknown_202063C + ldr r0, _080E347C @ =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -10600,12 +10600,12 @@ _080E3472: strh r0, [r4, 0x8] b _080E34C6 .align 2, 0 -_080E347C: .4byte gUnknown_202063C +_080E347C: .4byte gSprites _080E3480: ldrh r0, [r4, 0x1C] adds r0, 0x70 strh r0, [r4, 0x1C] - ldr r2, _080E34CC @ =gUnknown_202063C + ldr r2, _080E34CC @ =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -10640,7 +10640,7 @@ _080E34C6: pop {r0} bx r0 .align 2, 0 -_080E34CC: .4byte gUnknown_202063C +_080E34CC: .4byte gSprites thumb_func_end sub_80E3374 thumb_func_start sub_80E34D0 @@ -10874,7 +10874,7 @@ sub_80E3664: @ 80E3664 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, _080E36B0 @ =gUnknown_202063C + ldr r1, _080E36B0 @ =gSprites adds r0, r1 bl obj_delete_but_dont_free_vram _080E36A6: @@ -10882,9 +10882,9 @@ _080E36A6: bl DestroyAnimVisualTask b _080E37BA .align 2, 0 -_080E36B0: .4byte gUnknown_202063C +_080E36B0: .4byte gSprites _080E36B4: - ldr r4, _080E3744 @ =gUnknown_202063C + ldr r4, _080E3744 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -10957,7 +10957,7 @@ _080E36B4: strb r0, [r2] b _080E376E .align 2, 0 -_080E3744: .4byte gUnknown_202063C +_080E3744: .4byte gSprites _080E3748: .4byte 0x0000fff0 _080E374C: .4byte gUnknown_3005090 _080E3750: .4byte gUnknown_2024018 @@ -11273,7 +11273,7 @@ _080E3978: mov r9, r4 cmp r0, 0 bne _080E39D0 - ldr r2, _080E39CC @ =gUnknown_202063C + ldr r2, _080E39CC @ =gSprites lsls r3, r7, 4 adds r1, r3, r7 lsls r1, 2 @@ -11288,9 +11288,9 @@ _080E3978: .align 2, 0 _080E39C4: .4byte gUnknown_3005090 _080E39C8: .4byte gUnknown_2037F1A -_080E39CC: .4byte gUnknown_202063C +_080E39CC: .4byte gSprites _080E39D0: - ldr r3, _080E3A24 @ =gUnknown_202063C + ldr r3, _080E3A24 @ =gSprites lsls r4, r7, 4 adds r2, r4, r7 lsls r2, 2 @@ -11334,7 +11334,7 @@ _080E3A16: strh r0, [r4, 0x8] b _080E3E6C .align 2, 0 -_080E3A24: .4byte gUnknown_202063C +_080E3A24: .4byte gSprites _080E3A28: .4byte gUnknown_3005090 _080E3A2C: ldr r4, _080E3A90 @ =gUnknown_2037F1A @@ -11393,7 +11393,7 @@ _080E3AA0: _080E3AA2: movs r0, 0x1 bl GetAnimBankSpriteId - ldr r2, _080E3AC8 @ =gUnknown_202063C + ldr r2, _080E3AC8 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -11410,7 +11410,7 @@ _080E3AA2: lsls r6, 1 b _080E3B54 .align 2, 0 -_080E3AC8: .4byte gUnknown_202063C +_080E3AC8: .4byte gSprites _080E3ACC: ldr r7, _080E3B24 @ =gUnknown_2023BCE ldrb r0, [r4] @@ -11461,7 +11461,7 @@ _080E3B30: _080E3B32: movs r0, 0x1 bl GetAnimBankSpriteId - ldr r2, _080E3BD0 @ =gUnknown_202063C + ldr r2, _080E3BD0 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -11510,7 +11510,7 @@ _080E3B54: ldrh r0, [r0, 0x2] cmp r0, 0 beq _080E3BBE - ldr r1, _080E3BD0 @ =gUnknown_202063C + ldr r1, _080E3BD0 @ =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -11536,7 +11536,7 @@ _080E3BBE: strh r5, [r1, 0x26] b _080E3D82 .align 2, 0 -_080E3BD0: .4byte gUnknown_202063C +_080E3BD0: .4byte gSprites _080E3BD4: .4byte 0x0000ffe0 _080E3BD8: .4byte gUnknown_2037F1B _080E3BDC: .4byte gUnknown_2037F1A @@ -11566,7 +11566,7 @@ _080E3BEC: mov r9, r4 cmp r0, 0 bne _080E3C44 - ldr r3, _080E3C40 @ =gUnknown_202063C + ldr r3, _080E3C40 @ =gSprites lsls r4, r5, 4 adds r2, r4, r5 lsls r2, 2 @@ -11583,9 +11583,9 @@ _080E3BEC: .align 2, 0 _080E3C38: .4byte gUnknown_3005090 _080E3C3C: .4byte gUnknown_2037F1A -_080E3C40: .4byte gUnknown_202063C +_080E3C40: .4byte gSprites _080E3C44: - ldr r2, _080E3CA8 @ =gUnknown_202063C + ldr r2, _080E3CA8 @ =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -11634,7 +11634,7 @@ _080E3C5A: bge _080E3CDA b _080E3CCE .align 2, 0 -_080E3CA8: .4byte gUnknown_202063C +_080E3CA8: .4byte gSprites _080E3CAC: .4byte gUnknown_3005090 _080E3CB0: .4byte gUnknown_2037F1A _080E3CB4: .4byte gUnknown_2037F1B @@ -11697,7 +11697,7 @@ _080E3D0C: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r5, _080E3D5C @ =gUnknown_202063C + ldr r5, _080E3D5C @ =gSprites adds r0, r5 bl sub_8076B20 ldr r0, _080E3D60 @ =gUnknown_2037F1A @@ -11718,7 +11718,7 @@ _080E3D0C: b _080E3D78 .align 2, 0 _080E3D58: .4byte gUnknown_3005090 -_080E3D5C: .4byte gUnknown_202063C +_080E3D5C: .4byte gSprites _080E3D60: .4byte gUnknown_2037F1A _080E3D64: lsls r0, r7, 4 @@ -11771,7 +11771,7 @@ _080E3D90: ldr r2, [sp, 0x18] cmp r0, 0 bne _080E3E10 - ldr r1, _080E3E0C @ =gUnknown_202063C + ldr r1, _080E3E0C @ =gSprites lsls r5, r7, 4 adds r0, r5, r7 lsls r0, 2 @@ -11802,9 +11802,9 @@ _080E3D90: .align 2, 0 _080E3E04: .4byte gUnknown_3005090 _080E3E08: .4byte gUnknown_2037F1A -_080E3E0C: .4byte gUnknown_202063C +_080E3E0C: .4byte gSprites _080E3E10: - ldr r1, _080E3E7C @ =gUnknown_202063C + ldr r1, _080E3E7C @ =gSprites lsls r5, r7, 4 adds r0, r5, r7 lsls r0, 2 @@ -11839,7 +11839,7 @@ _080E3E48: adds r0, r1 ldrb r1, [r0, 0xA] strh r1, [r0, 0xA] - ldr r1, _080E3E7C @ =gUnknown_202063C + ldr r1, _080E3E7C @ =gSprites adds r0, r3, r7 lsls r0, 2 adds r0, r1 @@ -11859,7 +11859,7 @@ _080E3E6C: pop {r0} bx r0 .align 2, 0 -_080E3E7C: .4byte gUnknown_202063C +_080E3E7C: .4byte gSprites _080E3E80: .4byte gUnknown_3005090 thumb_func_end sub_80E392C @@ -11918,7 +11918,7 @@ _080E3E96: bne _080E3FB8 movs r0, 0x1 bl GetAnimBankSpriteId - ldr r2, _080E3F24 @ =gUnknown_202063C + ldr r2, _080E3F24 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -11937,7 +11937,7 @@ _080E3F14: .4byte gUnknown_2037F02 _080E3F18: .4byte gUnknown_2037F1B _080E3F1C: .4byte 0x0000ffe0 _080E3F20: .4byte gUnknown_2037F1A -_080E3F24: .4byte gUnknown_202063C +_080E3F24: .4byte gSprites _080E3F28: adds r0, r4, 0 adds r0, 0x3E @@ -12093,7 +12093,7 @@ _080E4054: ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, _080E4098 @ =gUnknown_202063C + ldr r1, _080E4098 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -12121,7 +12121,7 @@ _080E4054: .align 2, 0 _080E4090: .4byte gUnknown_2023D44 _080E4094: .4byte gUnknown_2037F1A -_080E4098: .4byte gUnknown_202063C +_080E4098: .4byte gSprites _080E409C: movs r3, 0x20 ldrsh r0, [r1, r3] @@ -12152,7 +12152,7 @@ _080E40C8: ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, _080E4110 @ =gUnknown_202063C + ldr r1, _080E4110 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -12182,7 +12182,7 @@ _080E40C8: .align 2, 0 _080E4108: .4byte gUnknown_2023D44 _080E410C: .4byte gUnknown_2037F1A -_080E4110: .4byte gUnknown_202063C +_080E4110: .4byte gSprites _080E4114: movs r3, 0x20 ldrsh r0, [r1, r3] @@ -12205,7 +12205,7 @@ _080E412E: ldrb r0, [r0] adds r0, r1 ldrb r2, [r0] - ldr r1, _080E415C @ =gUnknown_202063C + ldr r1, _080E415C @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -12221,7 +12221,7 @@ _080E414C: .align 2, 0 _080E4154: .4byte gUnknown_2023D44 _080E4158: .4byte gUnknown_2037F1A -_080E415C: .4byte gUnknown_202063C +_080E415C: .4byte gSprites thumb_func_end sub_80E3FC0 thumb_func_start sub_80E4160 @@ -12252,7 +12252,7 @@ sub_80E4160: @ 80E4160 movs r1, 0x1 _080E4194: strh r1, [r4, 0x10] - ldr r2, _080E41D0 @ =gUnknown_202063C + ldr r2, _080E41D0 @ =gSprites movs r0, 0xE ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -12280,7 +12280,7 @@ _080E4194: .align 2, 0 _080E41C8: .4byte gUnknown_3005090 _080E41CC: .4byte gUnknown_2037F1A -_080E41D0: .4byte gUnknown_202063C +_080E41D0: .4byte gSprites _080E41D4: .4byte sub_80E41D8 thumb_func_end sub_80E4160 @@ -12315,7 +12315,7 @@ _080E4206: movs r2, 0xFF ands r0, r2 strh r0, [r4, 0x1E] - ldr r5, _080E4278 @ =gUnknown_202063C + ldr r5, _080E4278 @ =gSprites movs r6, 0xE ldrsh r0, [r4, r6] lsls r1, r0, 4 @@ -12367,7 +12367,7 @@ _080E4206: strh r1, [r0, 0x20] b _080E42C0 .align 2, 0 -_080E4278: .4byte gUnknown_202063C +_080E4278: .4byte gSprites _080E427C: .4byte gUnknown_825E074 _080E4280: ldrh r0, [r4, 0x1E] @@ -12375,7 +12375,7 @@ _080E4280: movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x1E] - ldr r3, _080E42C8 @ =gUnknown_202063C + ldr r3, _080E42C8 @ =gSprites movs r1, 0xE ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -12408,7 +12408,7 @@ _080E42C0: strh r0, [r4, 0x8] b _080E42D6 .align 2, 0 -_080E42C8: .4byte gUnknown_202063C +_080E42C8: .4byte gSprites _080E42CC: .4byte gUnknown_825E074 _080E42D0: adds r0, r2, 0 @@ -12812,7 +12812,7 @@ sub_80E4588: @ 80E4588 ands r0, r5 cmp r0, 0 bne _080E45EC - ldr r2, _080E45E4 @ =gUnknown_202063C + ldr r2, _080E45E4 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -12824,10 +12824,10 @@ sub_80E4588: @ 80E4588 b _080E45FC .align 2, 0 _080E45E0: .4byte gUnknown_3005090 -_080E45E4: .4byte gUnknown_202063C +_080E45E4: .4byte gSprites _080E45E8: .4byte 0x0000ffff _080E45EC: - ldr r2, _080E461C @ =gUnknown_202063C + ldr r2, _080E461C @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -12851,7 +12851,7 @@ _080E4614: pop {r0} bx r0 .align 2, 0 -_080E461C: .4byte gUnknown_202063C +_080E461C: .4byte gSprites thumb_func_end sub_80E4588 .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index 1cd0b1955..a96a11373 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -59,7 +59,7 @@ sub_80EEC0C: @ 80EEC0C ldr r0, _080EEDCC @ =gUnknown_3004FF0 adds r4, r0 ldrb r0, [r4] - ldr r1, _080EEDD0 @ =gUnknown_202063C + ldr r1, _080EEDD0 @ =gSprites mov r9, r1 lsls r4, r0, 4 adds r4, r0 @@ -69,12 +69,12 @@ sub_80EEC0C: @ 80EEC0C ldrh r6, [r4, 0x38] lsls r6, 24 lsrs r6, 24 - ldr r0, _080EEDD4 @ =nullsub_8 + ldr r0, _080EEDD4 @ =SpriteCallbackDummy bl CreateInvisibleSpriteWithCallback lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] - ldr r0, _080EEDD4 @ =nullsub_8 + ldr r0, _080EEDD4 @ =SpriteCallbackDummy bl CreateInvisibleSpriteWithCallback mov r10, r0 mov r2, r10 @@ -146,7 +146,7 @@ sub_80EEC0C: @ 80EEC0C movs r0, 0x1C add r9, r0 add r6, r9 - ldr r1, _080EEDD4 @ =nullsub_8 + ldr r1, _080EEDD4 @ =SpriteCallbackDummy str r1, [r6] add r4, r9 str r1, [r4] @@ -210,8 +210,8 @@ _080EEDC0: .4byte 0x00003f3f _080EEDC4: .4byte 0x00003f3d _080EEDC8: .4byte 0x00003f42 _080EEDCC: .4byte gUnknown_3004FF0 -_080EEDD0: .4byte gUnknown_202063C -_080EEDD4: .4byte nullsub_8 +_080EEDD0: .4byte gSprites +_080EEDD4: .4byte SpriteCallbackDummy _080EEDD8: .4byte gUnknown_8D2EC70 _080EEDDC: .4byte gUnknown_8D2EC24 _080EEDE0: .4byte gUnknown_8D2DF78 @@ -378,7 +378,7 @@ _080EEF00: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _080EEFC0 @ =gUnknown_202063C + ldr r6, _080EEFC0 @ =gSprites adds r0, r6 bl DestroySprite movs r0, 0xC @@ -442,7 +442,7 @@ _080EEFA8: _080EEFB4: .4byte gUnknown_2022984 _080EEFB8: .4byte gUnknown_2022986 _080EEFBC: .4byte 0x00003f3f -_080EEFC0: .4byte gUnknown_202063C +_080EEFC0: .4byte gSprites _080EEFC4: .4byte gUnknown_3004FF0 thumb_func_end sub_80EEDF4 @@ -464,7 +464,7 @@ sub_80EEFC8: @ 80EEFC8 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _080EF0A4 @ =gUnknown_202063C + ldr r0, _080EF0A4 @ =gSprites adds r5, r0 ldrb r1, [r5, 0x6] mov r10, r1 @@ -488,7 +488,7 @@ sub_80EEFC8: @ 80EEFC8 lsls r6, r4, 4 adds r6, r4 lsls r6, 2 - ldr r2, _080EF0A4 @ =gUnknown_202063C + ldr r2, _080EF0A4 @ =gSprites adds r6, r2 ldrb r4, [r6, 0x5] lsrs r4, 4 @@ -528,7 +528,7 @@ sub_80EEFC8: @ 80EEFC8 lsls r1, r2, 4 add r1, r10 lsls r1, 2 - ldr r0, _080EF0A4 @ =gUnknown_202063C + ldr r0, _080EF0A4 @ =gSprites adds r1, r0 mov r0, r9 ldrb r2, [r0] @@ -554,7 +554,7 @@ sub_80EEFC8: @ 80EEFC8 bx r0 .align 2, 0 _080EF0A0: .4byte gUnknown_3004FF0 -_080EF0A4: .4byte gUnknown_202063C +_080EF0A4: .4byte gSprites _080EF0A8: .4byte 0x0000d709 _080EF0AC: .4byte 0x0000d70a _080EF0B0: .4byte gUnknown_20371F8 @@ -594,7 +594,7 @@ sub_80EF0E0: @ 80EF0E0 ldr r1, _080EF168 @ =gUnknown_3004FF0 adds r0, r1 ldrb r0, [r0] - ldr r1, _080EF16C @ =gUnknown_202063C + ldr r1, _080EF16C @ =gSprites mov r8, r1 lsls r5, r0, 4 adds r5, r0 @@ -651,7 +651,7 @@ sub_80EF0E0: @ 80EF0E0 bx r0 .align 2, 0 _080EF168: .4byte gUnknown_3004FF0 -_080EF16C: .4byte gUnknown_202063C +_080EF16C: .4byte gSprites _080EF170: .4byte 0x0000d709 _080EF174: .4byte 0x0000d70a _080EF178: .4byte 0x0000d6ff @@ -871,7 +871,7 @@ _080EF314: .4byte 0x000002cf _080EF318: adds r0, r5, 0 bl sub_8075980 - ldr r1, _080EF340 @ =gUnknown_202063C + ldr r1, _080EF340 @ =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -888,7 +888,7 @@ _080EF338: pop {r0} bx r0 .align 2, 0 -_080EF340: .4byte gUnknown_202063C +_080EF340: .4byte gSprites thumb_func_end sub_80EF298 thumb_func_start sub_80EF344 @@ -972,7 +972,7 @@ _080EF3D8: bl sub_8074480 adds r1, r0, 0 lsls r1, 24 - ldr r2, _080EF454 @ =gUnknown_202063C + ldr r2, _080EF454 @ =gSprites mov r3, r9 lsls r0, r3, 4 add r0, r9 @@ -1016,7 +1016,7 @@ _080EF3D8: b _080EF482 .align 2, 0 _080EF450: .4byte gUnknown_2037F1A -_080EF454: .4byte gUnknown_202063C +_080EF454: .4byte gSprites _080EF458: movs r1, 0x1C ldrsh r0, [r6, r1] @@ -1228,7 +1228,7 @@ sub_80EF5AC: @ 80EF5AC adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, _080EF67C @ =gUnknown_202063C + ldr r1, _080EF67C @ =gSprites mov r9, r1 lsls r4, r5, 4 adds r4, r5 @@ -1299,7 +1299,7 @@ sub_80EF5AC: @ 80EF5AC .align 2, 0 _080EF674: .4byte gUnknown_2023D68 _080EF678: .4byte gUnknown_82606F4 -_080EF67C: .4byte gUnknown_202063C +_080EF67C: .4byte gSprites _080EF680: .4byte gUnknown_2037F1B _080EF684: .4byte sub_80EF8C0 _080EF688: .4byte gUnknown_2024018 @@ -1319,7 +1319,7 @@ sub_80EF698: @ 80EF698 lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x8] - ldr r2, _080EF6CC @ =gUnknown_202063C + ldr r2, _080EF6CC @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -1335,7 +1335,7 @@ _080EF6C2: bx r0 .align 2, 0 _080EF6C8: .4byte gUnknown_3005090 -_080EF6CC: .4byte gUnknown_202063C +_080EF6CC: .4byte gSprites _080EF6D0: .4byte 0x0000ffff thumb_func_end sub_80EF698 @@ -1399,7 +1399,7 @@ _080EF708: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080EF7D0 @ =gUnknown_202063C + ldr r0, _080EF7D0 @ =gSprites mov r9, r0 lsls r4, r5, 4 adds r4, r5 @@ -1426,7 +1426,7 @@ _080EF708: movs r0, 0x1C add r9, r0 add r4, r9 - ldr r0, _080EF7D8 @ =nullsub_8 + ldr r0, _080EF7D8 @ =SpriteCallbackDummy str r0, [r4] movs r0, 0 bl GetBankByIdentity @@ -1459,9 +1459,9 @@ _080EF708: _080EF7C4: .4byte gSaveBlock2Ptr _080EF7C8: .4byte gUnknown_2023D68 _080EF7CC: .4byte gUnknown_82606F4 -_080EF7D0: .4byte gUnknown_202063C +_080EF7D0: .4byte gSprites _080EF7D4: .4byte gUnknown_2037F1B -_080EF7D8: .4byte nullsub_8 +_080EF7D8: .4byte SpriteCallbackDummy _080EF7DC: .4byte gUnknown_2023D44 _080EF7E0: .4byte sub_8012354 _080EF7E4: .4byte gUnknown_3005090 @@ -1473,7 +1473,7 @@ sub_80EF7EC: @ 80EF7EC push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _080EF84C @ =gUnknown_202063C + ldr r6, _080EF84C @ =gSprites movs r0, 0 bl GetBankByIdentity ldr r1, _080EF850 @ =gUnknown_2023D44 @@ -1517,7 +1517,7 @@ _080EF846: pop {r0} bx r0 .align 2, 0 -_080EF84C: .4byte gUnknown_202063C +_080EF84C: .4byte gSprites _080EF850: .4byte gUnknown_2023D44 _080EF854: .4byte gUnknown_3005090 _080EF858: .4byte sub_80EF8C0 @@ -1530,7 +1530,7 @@ sub_80EF864: @ 80EF864 push {r4-r6,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r6, _080EF8B8 @ =gUnknown_202063C + ldr r6, _080EF8B8 @ =gSprites movs r0, 0 bl GetBankByIdentity ldr r4, _080EF8BC @ =gUnknown_2023D44 @@ -1566,7 +1566,7 @@ _080EF8B0: pop {r0} bx r0 .align 2, 0 -_080EF8B8: .4byte gUnknown_202063C +_080EF8B8: .4byte gSprites _080EF8BC: .4byte gUnknown_2023D44 thumb_func_end sub_80EF864 @@ -1710,7 +1710,7 @@ sub_80EF9B4: @ 80EF9B4 strh r0, [r4, 0x38] ldr r0, _080EF9FC @ =sub_80EFA0C str r0, [r4, 0x1C] - ldr r2, _080EFA00 @ =gUnknown_202063C + ldr r2, _080EFA00 @ =gSprites ldr r1, _080EFA04 @ =gUnknown_2023D44 ldr r0, _080EFA08 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -1729,7 +1729,7 @@ _080EF9F0: .align 2, 0 _080EF9F8: .4byte nullsub_43 _080EF9FC: .4byte sub_80EFA0C -_080EFA00: .4byte gUnknown_202063C +_080EFA00: .4byte gSprites _080EFA04: .4byte gUnknown_2023D44 _080EFA08: .4byte gUnknown_2037F1B thumb_func_end sub_80EF9B4 @@ -1789,7 +1789,7 @@ _080EFA62: movs r0, 0x1C str r0, [r1] ldr r2, _080EFAA8 @ =gUnknown_300542C - ldr r1, _080EFAAC @ =gUnknown_202063C + ldr r1, _080EFAAC @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1813,7 +1813,7 @@ _080EFA62: .align 2, 0 _080EFAA4: .4byte gUnknown_3005424 _080EFAA8: .4byte gUnknown_300542C -_080EFAAC: .4byte gUnknown_202063C +_080EFAAC: .4byte gSprites _080EFAB0: .4byte gUnknown_3005428 _080EFAB4: ldrh r0, [r5, 0x1C] @@ -1829,7 +1829,7 @@ _080EFAB4: ldrh r1, [r5, 0xE] adds r0, r1 strh r0, [r5, 0xE] - ldr r0, _080EFAF0 @ =gUnknown_202063C + ldr r0, _080EFAF0 @ =gSprites lsls r1, r4, 4 adds r1, r4 lsls r1, 2 @@ -1846,12 +1846,12 @@ _080EFAB4: ble _080EFB48 b _080EFB12 .align 2, 0 -_080EFAF0: .4byte gUnknown_202063C +_080EFAF0: .4byte gSprites _080EFAF4: .4byte 0x0000047f _080EFAF8: adds r0, r4, 0 bl sub_8075980 - ldr r1, _080EFB1C @ =gUnknown_202063C + ldr r1, _080EFB1C @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1867,7 +1867,7 @@ _080EFB12: strh r0, [r5, 0x8] b _080EFB48 .align 2, 0 -_080EFB1C: .4byte gUnknown_202063C +_080EFB1C: .4byte gSprites _080EFB20: ldr r0, _080EFB50 @ =gUnknown_3005090 lsls r1, r6, 2 @@ -2554,7 +2554,7 @@ _080F004C: ldr r0, _080F0094 @ =0x0000013b cmp r1, r0 bne _080F0088 - ldr r5, _080F0098 @ =gUnknown_202063C + ldr r5, _080F0098 @ =gSprites ldr r4, _080F009C @ =gUnknown_2023D44 ldrb r0, [r7] adds r0, r4 @@ -2588,7 +2588,7 @@ _080F0088: bx r0 .align 2, 0 _080F0094: .4byte 0x0000013b -_080F0098: .4byte gUnknown_202063C +_080F0098: .4byte gSprites _080F009C: .4byte gUnknown_2023D44 _080F00A0: .4byte sub_80F00A4 thumb_func_end sub_80EFFC4 @@ -2763,7 +2763,7 @@ _080F01E0: movs r0, 0x4 bl sub_80F05B4 movs r7, 0 - ldr r2, _080F0264 @ =gUnknown_202063C + ldr r2, _080F0264 @ =gSprites mov r9, r2 movs r0, 0x1C add r0, r9 @@ -2824,7 +2824,7 @@ _080F024E: pop {r0} bx r0 .align 2, 0 -_080F0264: .4byte gUnknown_202063C +_080F0264: .4byte gSprites _080F0268: .4byte gUnknown_840C104 _080F026C: .4byte gUnknown_840BF3C _080F0270: .4byte sub_80F0278 @@ -2900,7 +2900,7 @@ sub_80F02B0: @ 80F02B0 adds r3, r5, 0 bl LaunchBallFadeMonTask _080F0302: - ldr r6, _080F0370 @ =gUnknown_202063C + ldr r6, _080F0370 @ =gSprites ldr r5, _080F0374 @ =gUnknown_2023D44 ldr r4, _080F036C @ =gUnknown_2037F1B ldrb r0, [r4] @@ -2951,7 +2951,7 @@ _080F0302: _080F0364: .4byte sub_80F0378 _080F0368: .4byte gUnknown_2023D68 _080F036C: .4byte gUnknown_2037F1B -_080F0370: .4byte gUnknown_202063C +_080F0370: .4byte gSprites _080F0374: .4byte gUnknown_2023D44 thumb_func_end sub_80F02B0 @@ -2973,7 +2973,7 @@ sub_80F0378: @ 80F0378 orrs r0, r1 strb r0, [r2] _080F0396: - ldr r4, _080F03C4 @ =gUnknown_202063C + ldr r4, _080F03C4 @ =gSprites ldr r3, _080F03C8 @ =gUnknown_2023D44 ldr r2, _080F03CC @ =gUnknown_2037F1B ldrb r0, [r2] @@ -2995,7 +2995,7 @@ _080F0396: movs r5, 0x1 b _080F03F0 .align 2, 0 -_080F03C4: .4byte gUnknown_202063C +_080F03C4: .4byte gSprites _080F03C8: .4byte gUnknown_2023D44 _080F03CC: .4byte gUnknown_2037F1B _080F03D0: @@ -3025,7 +3025,7 @@ _080F03F0: beq _080F0456 cmp r5, 0 beq _080F0456 - ldr r4, _080F0460 @ =gUnknown_202063C + ldr r4, _080F0460 @ =gSprites ldr r3, _080F0464 @ =gUnknown_2023D44 ldr r2, _080F0468 @ =gUnknown_2037F1B ldrb r0, [r2] @@ -3072,7 +3072,7 @@ _080F0456: bx r0 .align 2, 0 _080F045C: .4byte 0xfffffee0 -_080F0460: .4byte gUnknown_202063C +_080F0460: .4byte gSprites _080F0464: .4byte gUnknown_2023D44 _080F0468: .4byte gUnknown_2037F1B _080F046C: .4byte gUnknown_2024018 @@ -3418,7 +3418,7 @@ sub_80F06A4: @ 80F06A4 lsls r4, r0, 4 add r4, r10 lsls r4, 2 - ldr r5, _080F0788 @ =gUnknown_202063C + ldr r5, _080F0788 @ =gSprites adds r7, r4, r5 ldr r0, _080F078C @ =gUnknown_840C068 ldr r1, [sp] @@ -3469,7 +3469,7 @@ _080F0740: ands r0, r1 cmp r0, 0 bne _080F0776 - ldr r0, _080F0788 @ =gUnknown_202063C + ldr r0, _080F0788 @ =gSprites mov r2, r10 lsls r1, r2, 4 add r1, r10 @@ -3484,7 +3484,7 @@ _080F0776: .align 2, 0 _080F0780: .4byte gUnknown_3005090 _080F0784: .4byte gUnknown_840C0A4 -_080F0788: .4byte gUnknown_202063C +_080F0788: .4byte gSprites _080F078C: .4byte gUnknown_840C068 _080F0790: .4byte sub_80F07BC _080F0794: .4byte gMain @@ -3592,7 +3592,7 @@ sub_80F0818: @ 80F0818 ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, _080F0900 @ =gUnknown_202063C + ldr r3, _080F0900 @ =gSprites mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -3622,7 +3622,7 @@ _080F085E: ldrb r1, [r0] adds r0, r5, 0 bl StartSpriteAnim - ldr r0, _080F090C @ =gUnknown_2020658 + ldr r0, _080F090C @ =gSprites + 0x1C adds r4, r0 ldr r0, _080F0910 @ =sub_80F0D5C str r0, [r4] @@ -3659,7 +3659,7 @@ _080F08BE: ands r0, r1 cmp r0, 0 bne _080F08E6 - ldr r0, _080F0900 @ =gUnknown_202063C + ldr r0, _080F0900 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3679,10 +3679,10 @@ _080F08E6: bx r0 .align 2, 0 _080F08FC: .4byte gUnknown_3005090 -_080F0900: .4byte gUnknown_202063C +_080F0900: .4byte gSprites _080F0904: .4byte gUnknown_840C0A4 _080F0908: .4byte gUnknown_840C068 -_080F090C: .4byte gUnknown_2020658 +_080F090C: .4byte gSprites + 0x1C _080F0910: .4byte sub_80F0D5C _080F0914: .4byte gMain _080F0918: .4byte 0x00000439 @@ -3718,7 +3718,7 @@ sub_80F091C: @ 80F091C ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, _080F0A04 @ =gUnknown_202063C + ldr r3, _080F0A04 @ =gSprites mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -3748,7 +3748,7 @@ _080F0962: ldrb r1, [r0] adds r0, r5, 0 bl StartSpriteAnim - ldr r0, _080F0A10 @ =gUnknown_2020658 + ldr r0, _080F0A10 @ =gSprites + 0x1C adds r4, r0 ldr r0, _080F0A14 @ =sub_80F0D5C str r0, [r4] @@ -3785,7 +3785,7 @@ _080F09C2: ands r0, r1 cmp r0, 0 bne _080F09EA - ldr r0, _080F0A04 @ =gUnknown_202063C + ldr r0, _080F0A04 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3805,10 +3805,10 @@ _080F09EA: bx r0 .align 2, 0 _080F0A00: .4byte gUnknown_3005090 -_080F0A04: .4byte gUnknown_202063C +_080F0A04: .4byte gSprites _080F0A08: .4byte gUnknown_840C0A4 _080F0A0C: .4byte gUnknown_840C068 -_080F0A10: .4byte gUnknown_2020658 +_080F0A10: .4byte gSprites + 0x1C _080F0A14: .4byte sub_80F0D5C _080F0A18: .4byte gMain _080F0A1C: .4byte 0x00000439 @@ -3846,7 +3846,7 @@ sub_80F0A20: @ 80F0A20 adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, _080F0B04 @ =gUnknown_202063C + ldr r3, _080F0B04 @ =gSprites mov r8, r3 ldr r0, _080F0B08 @ =gUnknown_840C068 adds r1, r0 @@ -3873,7 +3873,7 @@ _080F0A66: ldrb r1, [r3] adds r0, r5, 0 bl StartSpriteAnim - ldr r0, _080F0B10 @ =gUnknown_2020658 + ldr r0, _080F0B10 @ =gSprites + 0x1C adds r4, r0 ldr r0, _080F0B14 @ =sub_80F0D5C str r0, [r4] @@ -3909,7 +3909,7 @@ _080F0AC2: ands r0, r1 cmp r0, 0 bne _080F0AEA - ldr r0, _080F0B04 @ =gUnknown_202063C + ldr r0, _080F0B04 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -3929,10 +3929,10 @@ _080F0AEA: bx r0 .align 2, 0 _080F0B00: .4byte gUnknown_3005090 -_080F0B04: .4byte gUnknown_202063C +_080F0B04: .4byte gSprites _080F0B08: .4byte gUnknown_840C068 _080F0B0C: .4byte gUnknown_840C0A4 -_080F0B10: .4byte gUnknown_2020658 +_080F0B10: .4byte gSprites + 0x1C _080F0B14: .4byte sub_80F0D5C _080F0B18: .4byte gMain _080F0B1C: .4byte 0x00000439 @@ -3968,7 +3968,7 @@ sub_80F0B20: @ 80F0B20 ldrb r1, [r1, 0x10] str r1, [sp, 0xC] movs r7, 0 - ldr r3, _080F0C0C @ =gUnknown_202063C + ldr r3, _080F0C0C @ =gSprites mov r10, r3 mov r1, r8 lsls r0, r1, 1 @@ -3998,7 +3998,7 @@ _080F0B66: ldrb r1, [r0] adds r0, r5, 0 bl StartSpriteAnim - ldr r0, _080F0C18 @ =gUnknown_2020658 + ldr r0, _080F0C18 @ =gSprites + 0x1C adds r4, r0 ldr r0, _080F0C1C @ =sub_80F0D5C str r0, [r4] @@ -4037,7 +4037,7 @@ _080F0BCA: ands r0, r1 cmp r0, 0 bne _080F0BF2 - ldr r0, _080F0C0C @ =gUnknown_202063C + ldr r0, _080F0C0C @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4057,10 +4057,10 @@ _080F0BF2: bx r0 .align 2, 0 _080F0C08: .4byte gUnknown_3005090 -_080F0C0C: .4byte gUnknown_202063C +_080F0C0C: .4byte gSprites _080F0C10: .4byte gUnknown_840C0A4 _080F0C14: .4byte gUnknown_840C068 -_080F0C18: .4byte gUnknown_2020658 +_080F0C18: .4byte gSprites + 0x1C _080F0C1C: .4byte sub_80F0D5C _080F0C20: .4byte gMain _080F0C24: .4byte 0x00000439 @@ -4110,7 +4110,7 @@ _080F0C58: adds r1, r0 lsls r1, 3 str r1, [sp, 0x10] - ldr r3, _080F0D3C @ =gUnknown_202063C + ldr r3, _080F0D3C @ =gSprites mov r9, r3 ldr r1, _080F0D40 @ =gUnknown_840C068 adds r0, r1 @@ -4137,7 +4137,7 @@ _080F0C84: ldrb r1, [r3] adds r0, r5, 0 bl StartSpriteAnim - ldr r0, _080F0D48 @ =gUnknown_2020658 + ldr r0, _080F0D48 @ =gSprites + 0x1C adds r4, r0 ldr r0, _080F0D4C @ =sub_80F0D5C str r0, [r4] @@ -4187,7 +4187,7 @@ _080F0CE0: ands r0, r1 cmp r0, 0 bne _080F0D24 - ldr r0, _080F0D3C @ =gUnknown_202063C + ldr r0, _080F0D3C @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4207,10 +4207,10 @@ _080F0D2A: pop {r0} bx r0 .align 2, 0 -_080F0D3C: .4byte gUnknown_202063C +_080F0D3C: .4byte gSprites _080F0D40: .4byte gUnknown_840C068 _080F0D44: .4byte gUnknown_840C0A4 -_080F0D48: .4byte gUnknown_2020658 +_080F0D48: .4byte gSprites + 0x1C _080F0D4C: .4byte sub_80F0D5C _080F0D50: .4byte gUnknown_3005090 _080F0D54: .4byte gMain @@ -4294,7 +4294,7 @@ sub_80F0DB4: @ 80F0DB4 adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, _080F0E94 @ =gUnknown_202063C + ldr r3, _080F0E94 @ =gSprites mov r8, r3 ldr r0, _080F0E98 @ =gUnknown_840C068 adds r1, r0 @@ -4321,7 +4321,7 @@ _080F0DFA: ldrb r1, [r3] adds r0, r5, 0 bl StartSpriteAnim - ldr r0, _080F0EA0 @ =gUnknown_2020658 + ldr r0, _080F0EA0 @ =gSprites + 0x1C adds r4, r0 ldr r0, _080F0EA4 @ =sub_80F0EB0 str r0, [r4] @@ -4355,7 +4355,7 @@ _080F0E52: ands r0, r1 cmp r0, 0 bne _080F0E7A - ldr r0, _080F0E94 @ =gUnknown_202063C + ldr r0, _080F0E94 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4375,10 +4375,10 @@ _080F0E7A: bx r0 .align 2, 0 _080F0E90: .4byte gUnknown_3005090 -_080F0E94: .4byte gUnknown_202063C +_080F0E94: .4byte gSprites _080F0E98: .4byte gUnknown_840C068 _080F0E9C: .4byte gUnknown_840C0A4 -_080F0EA0: .4byte gUnknown_2020658 +_080F0EA0: .4byte gSprites + 0x1C _080F0EA4: .4byte sub_80F0EB0 _080F0EA8: .4byte gMain _080F0EAC: .4byte 0x00000439 @@ -4489,14 +4489,14 @@ _080F0F5C: lsls r4, r6, 4 adds r4, r6 lsls r4, 2 - ldr r0, _080F0FCC @ =gUnknown_202063C + ldr r0, _080F0FCC @ =gSprites adds r5, r4, r0 ldr r0, _080F0FD0 @ =gUnknown_840C068 add r0, r9 ldrb r1, [r0] adds r0, r5, 0 bl StartSpriteAnim - ldr r1, _080F0FD4 @ =gUnknown_2020658 + ldr r1, _080F0FD4 @ =gSprites + 0x1C adds r4, r1 ldr r0, _080F0FD8 @ =sub_80F0D5C str r0, [r4] @@ -4525,9 +4525,9 @@ _080F0F5C: .align 2, 0 _080F0FC4: .4byte gUnknown_3005090 _080F0FC8: .4byte gUnknown_840C0A4 -_080F0FCC: .4byte gUnknown_202063C +_080F0FCC: .4byte gSprites _080F0FD0: .4byte gUnknown_840C068 -_080F0FD4: .4byte gUnknown_2020658 +_080F0FD4: .4byte gSprites + 0x1C _080F0FD8: .4byte sub_80F0D5C _080F0FDC: movs r0, 0x1 @@ -4555,7 +4555,7 @@ _080F0FE4: ands r0, r1 cmp r0, 0 bne _080F1018 - ldr r0, _080F1038 @ =gUnknown_202063C + ldr r0, _080F1038 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4576,7 +4576,7 @@ _080F1018: .align 2, 0 _080F1030: .4byte gMain _080F1034: .4byte 0x00000439 -_080F1038: .4byte gUnknown_202063C +_080F1038: .4byte gSprites thumb_func_end sub_80F0F10 thumb_func_start sub_80F103C @@ -4611,7 +4611,7 @@ sub_80F103C: @ 80F103C adds r0, r1 lsls r0, 3 str r0, [sp, 0x10] - ldr r3, _080F1118 @ =gUnknown_202063C + ldr r3, _080F1118 @ =gSprites mov r8, r3 ldr r0, _080F111C @ =gUnknown_840C068 adds r1, r0 @@ -4638,7 +4638,7 @@ _080F1082: ldrb r1, [r3] adds r0, r5, 0 bl StartSpriteAnim - ldr r0, _080F1124 @ =gUnknown_2020658 + ldr r0, _080F1124 @ =gSprites + 0x1C adds r4, r0 ldr r0, _080F1128 @ =sub_80F1134 str r0, [r4] @@ -4669,7 +4669,7 @@ _080F10D4: ands r0, r1 cmp r0, 0 bne _080F10FC - ldr r0, _080F1118 @ =gUnknown_202063C + ldr r0, _080F1118 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -4689,10 +4689,10 @@ _080F10FC: bx r0 .align 2, 0 _080F1114: .4byte gUnknown_3005090 -_080F1118: .4byte gUnknown_202063C +_080F1118: .4byte gSprites _080F111C: .4byte gUnknown_840C068 _080F1120: .4byte gUnknown_840C0A4 -_080F1124: .4byte gUnknown_2020658 +_080F1124: .4byte gSprites + 0x1C _080F1128: .4byte sub_80F1134 _080F112C: .4byte gMain _080F1130: .4byte 0x00000439 @@ -5124,7 +5124,7 @@ _080F1466: lsls r0, 24 cmp r0, 0 beq _080F14A8 - ldr r2, _080F14A4 @ =gUnknown_202063C + ldr r2, _080F14A4 @ =gSprites lsls r3, r6, 4 adds r1, r3, r6 lsls r1, 2 @@ -5139,9 +5139,9 @@ _080F1466: b _080F14C0 .align 2, 0 _080F14A0: .4byte gUnknown_2037F02 -_080F14A4: .4byte gUnknown_202063C +_080F14A4: .4byte gSprites _080F14A8: - ldr r3, _080F14F0 @ =gUnknown_202063C + ldr r3, _080F14F0 @ =gSprites lsls r4, r6, 4 adds r2, r4, r6 lsls r2, 2 @@ -5179,7 +5179,7 @@ _080F14C0: strh r0, [r3, 0x1C] b _080F15BA .align 2, 0 -_080F14F0: .4byte gUnknown_202063C +_080F14F0: .4byte gSprites _080F14F4: .4byte gUnknown_3005090 _080F14F8: ldrb r1, [r5, 0x1E] @@ -5202,7 +5202,7 @@ _080F150A: lsls r0, 24 cmp r0, 0 beq _080F1540 - ldr r0, _080F153C @ =gUnknown_202063C + ldr r0, _080F153C @ =gSprites lsls r3, r6, 4 adds r2, r3, r6 lsls r2, 2 @@ -5216,9 +5216,9 @@ _080F150A: adds r4, r3, 0 b _080F1558 .align 2, 0 -_080F153C: .4byte gUnknown_202063C +_080F153C: .4byte gSprites _080F1540: - ldr r0, _080F158C @ =gUnknown_202063C + ldr r0, _080F158C @ =gSprites lsls r2, r6, 4 adds r1, r2, r6 lsls r1, 2 @@ -5245,7 +5245,7 @@ _080F1558: lsrs r2, r0, 24 cmp r2, 0 beq _080F1598 - ldr r0, _080F158C @ =gUnknown_202063C + ldr r0, _080F158C @ =gSprites adds r1, r4, r6 lsls r1, 2 adds r1, r0 @@ -5257,11 +5257,11 @@ _080F1558: strh r0, [r1, 0x24] b _080F15B4 .align 2, 0 -_080F158C: .4byte gUnknown_202063C +_080F158C: .4byte gSprites _080F1590: .4byte gUnknown_3005090 _080F1594: .4byte gUnknown_2037F1A _080F1598: - ldr r0, _080F15C4 @ =gUnknown_202063C + ldr r0, _080F15C4 @ =gSprites adds r1, r4, r6 lsls r1, 2 adds r1, r0 @@ -5286,7 +5286,7 @@ _080F15BA: pop {r0} bx r0 .align 2, 0 -_080F15C4: .4byte gUnknown_202063C +_080F15C4: .4byte gSprites thumb_func_end sub_80F1420 thumb_func_start sub_80F15C8 @@ -5384,7 +5384,7 @@ _080F167E: ldrb r0, [r4] adds r0, r1 ldrb r1, [r0] - ldr r2, _080F16C4 @ =gUnknown_202063C + ldr r2, _080F16C4 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -5410,7 +5410,7 @@ _080F16B4: .align 2, 0 _080F16BC: .4byte gUnknown_2023D44 _080F16C0: .4byte gUnknown_2037F1A -_080F16C4: .4byte gUnknown_202063C +_080F16C4: .4byte gSprites _080F16C8: .4byte 0x06010000 thumb_func_end sub_80F15C8 @@ -5655,7 +5655,7 @@ _080F18A4: bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080F18D4 @ =gUnknown_202063C + ldr r0, _080F18D4 @ =gSprites lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -5667,7 +5667,7 @@ _080F18A4: b _080F18F8 .align 2, 0 _080F18D0: .4byte gUnknown_83FF180 -_080F18D4: .4byte gUnknown_202063C +_080F18D4: .4byte gSprites _080F18D8: ldr r0, _080F1930 @ =gUnknown_83FF180 adds r1, r5, 0 @@ -5675,7 +5675,7 @@ _080F18D8: bl CreateSprite lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080F1934 @ =gUnknown_202063C + ldr r0, _080F1934 @ =gSprites lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -5703,7 +5703,7 @@ _080F1906: mov r9, r1 cmp r0, 0 bne _080F1948 - ldr r1, _080F1934 @ =gUnknown_202063C + ldr r1, _080F1934 @ =gSprites lsls r2, r5, 4 adds r0, r2, r5 lsls r0, 2 @@ -5715,13 +5715,13 @@ _080F1906: b _080F1990 .align 2, 0 _080F1930: .4byte gUnknown_83FF180 -_080F1934: .4byte gUnknown_202063C +_080F1934: .4byte gSprites _080F1938: .4byte 0x000003ff _080F193C: .4byte 0xfffffc00 _080F1940: .4byte gUnknown_3005090 _080F1944: .4byte sub_80F1A2C _080F1948: - ldr r3, _080F19CC @ =gUnknown_202063C + ldr r3, _080F19CC @ =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -5757,7 +5757,7 @@ _080F1986: movs r0, 0x5F bl PlaySE12WithPanning _080F1990: - ldr r1, _080F19CC @ =gUnknown_202063C + ldr r1, _080F19CC @ =gSprites adds r0, r4, r5 lsls r0, 2 adds r0, r1 @@ -5790,7 +5790,7 @@ _080F19C0: pop {r0} bx r0 .align 2, 0 -_080F19CC: .4byte gUnknown_202063C +_080F19CC: .4byte gSprites _080F19D0: .4byte sub_80F1A80 _080F19D4: .4byte 0x0000ffe0 _080F19D8: .4byte gUnknown_3005090 @@ -6012,7 +6012,7 @@ sub_80F1B3C: @ 80F1B3C strh r0, [r4, 0x38] adds r0, r4, 0 bl sub_8075068 - ldr r2, _080F1BB8 @ =gUnknown_202063C + ldr r2, _080F1BB8 @ =gSprites ldr r1, _080F1BBC @ =gUnknown_2023D44 ldr r0, _080F1BC0 @ =gUnknown_2037F1A ldrb r0, [r0] @@ -6033,7 +6033,7 @@ sub_80F1B3C: @ 80F1B3C .align 2, 0 _080F1BB0: .4byte gUnknown_2037F02 _080F1BB4: .4byte 0x0000ffe0 -_080F1BB8: .4byte gUnknown_202063C +_080F1BB8: .4byte gSprites _080F1BBC: .4byte gUnknown_2023D44 _080F1BC0: .4byte gUnknown_2037F1A _080F1BC4: .4byte sub_8012354 @@ -6044,7 +6044,7 @@ _080F1BC8: .4byte sub_80F1BCC sub_80F1BCC: @ 80F1BCC push {lr} adds r3, r0, 0 - ldr r2, _080F1BF4 @ =gUnknown_202063C + ldr r2, _080F1BF4 @ =gSprites ldr r1, _080F1BF8 @ =gUnknown_2023D44 ldr r0, _080F1BFC @ =gUnknown_2037F1A ldrb r0, [r0] @@ -6064,7 +6064,7 @@ _080F1BF0: pop {r0} bx r0 .align 2, 0 -_080F1BF4: .4byte gUnknown_202063C +_080F1BF4: .4byte gSprites _080F1BF8: .4byte gUnknown_2023D44 _080F1BFC: .4byte gUnknown_2037F1A _080F1C00: .4byte sub_80F1C04 @@ -6100,7 +6100,7 @@ _080F1C2C: .4byte sub_80F1C30 sub_80F1C30: @ 80F1C30 push {r4,r5,lr} adds r4, r0, 0 - ldr r5, _080F1C80 @ =gUnknown_202063C + ldr r5, _080F1C80 @ =gSprites ldr r3, _080F1C84 @ =gUnknown_2023D44 ldr r2, _080F1C88 @ =gUnknown_2037F1A ldrb r0, [r2] @@ -6137,7 +6137,7 @@ _080F1C78: pop {r0} bx r0 .align 2, 0 -_080F1C80: .4byte gUnknown_202063C +_080F1C80: .4byte gSprites _080F1C84: .4byte gUnknown_2023D44 _080F1C88: .4byte gUnknown_2037F1A thumb_func_end sub_80F1C30 diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s index 226991873..36393e771 100644 --- a/asm/battle_controller_link_opponent.s +++ b/asm/battle_controller_link_opponent.s @@ -69,7 +69,7 @@ _0803A6D0: thumb_func_start sub_803A6D4 sub_803A6D4: @ 803A6D4 push {lr} - ldr r2, _0803A6FC @ =gUnknown_202063C + ldr r2, _0803A6FC @ =gSprites ldr r1, _0803A700 @ =gUnknown_2023D44 ldr r0, _0803A704 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -81,7 +81,7 @@ sub_803A6D4: @ 803A6D4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0803A708 @ =nullsub_8 + ldr r0, _0803A708 @ =SpriteCallbackDummy cmp r1, r0 bne _0803A6F8 bl RecordedOpponentBufferExecCompleted @@ -89,16 +89,16 @@ _0803A6F8: pop {r0} bx r0 .align 2, 0 -_0803A6FC: .4byte gUnknown_202063C +_0803A6FC: .4byte gSprites _0803A700: .4byte gUnknown_2023D44 _0803A704: .4byte gUnknown_2023BC4 -_0803A708: .4byte nullsub_8 +_0803A708: .4byte SpriteCallbackDummy thumb_func_end sub_803A6D4 thumb_func_start sub_803A70C sub_803A70C: @ 803A70C push {r4-r6,lr} - ldr r4, _0803A784 @ =gUnknown_202063C + ldr r4, _0803A784 @ =gSprites ldr r6, _0803A788 @ =gUnknown_2023D44 ldr r5, _0803A78C @ =gUnknown_2023BC4 ldrb r0, [r5] @@ -111,7 +111,7 @@ sub_803A70C: @ 803A70C adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _0803A790 @ =nullsub_8 + ldr r0, _0803A790 @ =SpriteCallbackDummy cmp r1, r0 bne _0803A77C adds r0, r2, r4 @@ -154,10 +154,10 @@ _0803A77C: pop {r0} bx r0 .align 2, 0 -_0803A784: .4byte gUnknown_202063C +_0803A784: .4byte gSprites _0803A788: .4byte gUnknown_2023D44 _0803A78C: .4byte gUnknown_2023BC4 -_0803A790: .4byte nullsub_8 +_0803A790: .4byte SpriteCallbackDummy _0803A794: .4byte 0x000003ff _0803A798: .4byte 0xfffffc00 thumb_func_end sub_803A70C @@ -221,7 +221,7 @@ sub_803A7E4: @ 803A7E4 cmp r0, 0 beq _0803A840 _0803A80C: - ldr r2, _0803A830 @ =gUnknown_202063C + ldr r2, _0803A830 @ =gSprites ldr r1, _0803A834 @ =gUnknown_3004FF0 ldr r0, _0803A838 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -233,18 +233,18 @@ _0803A80C: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0803A83C @ =nullsub_8 + ldr r0, _0803A83C @ =SpriteCallbackDummy cmp r1, r0 bne _0803A876 b _0803A874 .align 2, 0 _0803A82C: .4byte gUnknown_2022B4C -_0803A830: .4byte gUnknown_202063C +_0803A830: .4byte gSprites _0803A834: .4byte gUnknown_3004FF0 _0803A838: .4byte gUnknown_2023BC4 -_0803A83C: .4byte nullsub_8 +_0803A83C: .4byte SpriteCallbackDummy _0803A840: - ldr r2, _0803A95C @ =gUnknown_202063C + ldr r2, _0803A95C @ =gSprites ldr r5, _0803A960 @ =gUnknown_3004FF0 ldr r0, _0803A964 @ =gUnknown_2023BC4 ldrb r3, [r0] @@ -256,7 +256,7 @@ _0803A840: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _0803A968 @ =nullsub_8 + ldr r0, _0803A968 @ =SpriteCallbackDummy cmp r4, r0 bne _0803A876 movs r0, 0x2 @@ -385,10 +385,10 @@ _0803A936: bl m4aMPlayContinue b _0803A988 .align 2, 0 -_0803A95C: .4byte gUnknown_202063C +_0803A95C: .4byte gSprites _0803A960: .4byte gUnknown_3004FF0 _0803A964: .4byte gUnknown_2023BC4 -_0803A968: .4byte nullsub_8 +_0803A968: .4byte SpriteCallbackDummy _0803A96C: .4byte gUnknown_2024018 _0803A970: .4byte 0x000027f9 _0803A974: .4byte gUnknown_2022B4C @@ -576,7 +576,7 @@ _0803AABA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0803AC04 @ =gUnknown_202063C + ldr r1, _0803AC04 @ =gSprites adds r0, r1 bl DestroySprite ldr r2, _0803AC08 @ =gUnknown_3004FF0 @@ -633,7 +633,7 @@ _0803AB50: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0803AC04 @ =gUnknown_202063C + ldr r1, _0803AC04 @ =gSprites adds r0, r1 bl DestroySprite ldr r4, _0803AC08 @ =gUnknown_3004FF0 @@ -704,7 +704,7 @@ _0803ABF4: .4byte gUnknown_2023BCE _0803ABF8: .4byte gUnknown_202402C _0803ABFC: .4byte gUnknown_2022B4C _0803AC00: .4byte gUnknown_3004FFC -_0803AC04: .4byte gUnknown_202063C +_0803AC04: .4byte gSprites _0803AC08: .4byte gUnknown_3004FF0 _0803AC0C: .4byte gUnknown_3004FE0 _0803AC10: .4byte sub_803A7E4 @@ -713,7 +713,7 @@ _0803AC10: .4byte sub_803A7E4 thumb_func_start sub_803AC14 sub_803AC14: @ 803AC14 push {r4-r7,lr} - ldr r2, _0803AC70 @ =gUnknown_202063C + ldr r2, _0803AC70 @ =gSprites ldr r0, _0803AC74 @ =gUnknown_2023D44 ldr r7, _0803AC78 @ =gUnknown_2023BC4 ldrb r3, [r7] @@ -757,7 +757,7 @@ sub_803AC14: @ 803AC14 bl sub_80F1720 b _0803ACC0 .align 2, 0 -_0803AC70: .4byte gUnknown_202063C +_0803AC70: .4byte gSprites _0803AC74: .4byte gUnknown_2023D44 _0803AC78: .4byte gUnknown_2023BC4 _0803AC7C: .4byte gUnknown_2024018 @@ -841,7 +841,7 @@ _0803AD18: thumb_func_start sub_803AD20 sub_803AD20: @ 803AD20 push {lr} - ldr r2, _0803AD54 @ =gUnknown_202063C + ldr r2, _0803AD54 @ =gSprites ldr r0, _0803AD58 @ =gUnknown_2023D44 ldr r1, _0803AD5C @ =gUnknown_2023BC4 ldrb r3, [r1] @@ -865,7 +865,7 @@ _0803AD4E: pop {r0} bx r0 .align 2, 0 -_0803AD54: .4byte gUnknown_202063C +_0803AD54: .4byte gSprites _0803AD58: .4byte gUnknown_2023D44 _0803AD5C: .4byte gUnknown_2023BC4 _0803AD60: .4byte gUnknown_3004FF0 @@ -894,7 +894,7 @@ sub_803AD64: @ 803AD64 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0803ADD0 @ =gUnknown_202063C + ldr r4, _0803ADD0 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -921,7 +921,7 @@ _0803ADBE: _0803ADC4: .4byte gUnknown_2024018 _0803ADC8: .4byte gUnknown_2023BC4 _0803ADCC: .4byte gUnknown_2023D44 -_0803ADD0: .4byte gUnknown_202063C +_0803ADD0: .4byte gSprites _0803ADD4: .4byte gUnknown_3004FF0 thumb_func_end sub_803AD64 @@ -947,7 +947,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _0803AE34 @ =gUnknown_202063C + ldr r2, _0803AE34 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -972,7 +972,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0 .align 2, 0 _0803AE2C: .4byte gUnknown_2023D44 _0803AE30: .4byte gUnknown_2023BC4 -_0803AE34: .4byte gUnknown_202063C +_0803AE34: .4byte gSprites _0803AE38: .4byte gUnknown_2024005 _0803AE3C: ldrh r0, [r4, 0x30] @@ -1006,7 +1006,7 @@ _0803AE66: thumb_func_start sub_803AE6C sub_803AE6C: @ 803AE6C push {r4,lr} - ldr r2, _0803AEC0 @ =gUnknown_202063C + ldr r2, _0803AEC0 @ =gSprites ldr r0, _0803AEC4 @ =gUnknown_3004FF0 ldr r4, _0803AEC8 @ =gUnknown_2023BC4 ldrb r3, [r4] @@ -1018,7 +1018,7 @@ sub_803AE6C: @ 803AE6C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0803AECC @ =nullsub_8 + ldr r0, _0803AECC @ =SpriteCallbackDummy cmp r1, r0 bne _0803AEB8 ldr r0, _0803AED0 @ =gUnknown_2024018 @@ -1048,10 +1048,10 @@ _0803AEB8: pop {r0} bx r0 .align 2, 0 -_0803AEC0: .4byte gUnknown_202063C +_0803AEC0: .4byte gSprites _0803AEC4: .4byte gUnknown_3004FF0 _0803AEC8: .4byte gUnknown_2023BC4 -_0803AECC: .4byte nullsub_8 +_0803AECC: .4byte SpriteCallbackDummy _0803AED0: .4byte gUnknown_2024018 _0803AED4: .4byte gUnknown_3004FE0 _0803AED8: .4byte sub_803AEDC @@ -1139,7 +1139,7 @@ sub_803AF28: @ 803AF28 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0803AFE4 @ =gUnknown_202063C + ldr r1, _0803AFE4 @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAnim @@ -1180,7 +1180,7 @@ _0803AFD4: .4byte gUnknown_2024018 _0803AFD8: .4byte gUnknown_2023BC4 _0803AFDC: .4byte 0x000027f9 _0803AFE0: .4byte gUnknown_2023D44 -_0803AFE4: .4byte gUnknown_202063C +_0803AFE4: .4byte gSprites _0803AFE8: .4byte gUnknown_3004FF0 _0803AFEC: .4byte gUnknown_2023BCE _0803AFF0: .4byte gUnknown_202402C @@ -1215,7 +1215,7 @@ sub_803AFFC: @ 803AFFC adds r0, r2, 0 bl sub_80F1720 _0803B02E: - ldr r4, _0803B0B0 @ =gUnknown_202063C + ldr r4, _0803B0B0 @ =gSprites ldr r0, _0803B0B4 @ =gUnknown_3004FFC ldrb r2, [r5] adds r0, r2, r0 @@ -1227,7 +1227,7 @@ _0803B02E: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _0803B0B8 @ =nullsub_8 + ldr r0, _0803B0B8 @ =SpriteCallbackDummy cmp r1, r0 bne _0803B098 ldr r0, [r6] @@ -1274,9 +1274,9 @@ _0803B0A0: .4byte gUnknown_2024018 _0803B0A4: .4byte gUnknown_2023BC4 _0803B0A8: .4byte gUnknown_2023BCE _0803B0AC: .4byte gUnknown_202402C -_0803B0B0: .4byte gUnknown_202063C +_0803B0B0: .4byte gSprites _0803B0B4: .4byte gUnknown_3004FFC -_0803B0B8: .4byte nullsub_8 +_0803B0B8: .4byte SpriteCallbackDummy _0803B0BC: .4byte gUnknown_3004FE0 _0803B0C0: .4byte sub_803AF28 thumb_func_end sub_803AFFC @@ -3603,7 +3603,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _0803C4F0 @ =gUnknown_202063C + ldr r5, _0803C4F0 @ =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -3679,7 +3679,7 @@ _0803C4E0: .4byte gUnknown_2023BC4 _0803C4E4: .4byte gUnknown_202402C _0803C4E8: .4byte gUnknown_20244DC _0803C4EC: .4byte gUnknown_2023D44 -_0803C4F0: .4byte gUnknown_202063C +_0803C4F0: .4byte gSprites _0803C4F4: .4byte 0x0000ff10 _0803C4F8: .4byte gUnknown_2024024 _0803C4FC: .4byte gUnknown_3004FE0 @@ -3806,7 +3806,7 @@ sub_803C550: @ 803C550 ldr r4, _0803C6C4 @ =gUnknown_2023D44 adds r4, r6, r4 strb r0, [r4] - ldr r5, _0803C6C8 @ =gUnknown_202063C + ldr r5, _0803C6C8 @ =gSprites mov r0, r10 ldrb r1, [r0] lsls r0, r1, 4 @@ -3865,7 +3865,7 @@ sub_803C550: @ 803C550 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0803C6D0 @ =nullsub_8 + ldr r1, _0803C6D0 @ =SpriteCallbackDummy str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -3894,9 +3894,9 @@ _0803C6B8: .4byte sub_8033E3C _0803C6BC: .4byte gUnknown_3004FFC _0803C6C0: .4byte gUnknown_20244DC _0803C6C4: .4byte gUnknown_2023D44 -_0803C6C8: .4byte gUnknown_202063C +_0803C6C8: .4byte gSprites _0803C6CC: .4byte gUnknown_2024024 -_0803C6D0: .4byte nullsub_8 +_0803C6D0: .4byte SpriteCallbackDummy thumb_func_end sub_803C550 thumb_func_start LinkOpponentHandleReturnPokeToBall @@ -3939,7 +3939,7 @@ _0803C71C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0803C764 @ =gUnknown_202063C + ldr r4, _0803C764 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -3964,7 +3964,7 @@ _0803C758: bx r0 .align 2, 0 _0803C760: .4byte gUnknown_2023D44 -_0803C764: .4byte gUnknown_202063C +_0803C764: .4byte gSprites _0803C768: .4byte gUnknown_3004FF0 thumb_func_end LinkOpponentHandleReturnPokeToBall @@ -4283,7 +4283,7 @@ _0803C992: ldrb r1, [r2] adds r1, r5 strb r0, [r1] - ldr r4, _0803CADC @ =gUnknown_202063C + ldr r4, _0803CADC @ =gSprites ldrb r0, [r2] adds r0, r5 ldrb r1, [r0] @@ -4393,7 +4393,7 @@ _0803CACC: .4byte gUnknown_2023BC4 _0803CAD0: .4byte gUnknown_20244DC _0803CAD4: .4byte gUnknown_823932C _0803CAD8: .4byte gUnknown_2023D44 -_0803CADC: .4byte gUnknown_202063C +_0803CADC: .4byte gSprites _0803CAE0: .4byte 0x0000ff10 _0803CAE4: .4byte gUnknown_8239A1C _0803CAE8: .4byte gUnknown_823957C @@ -4423,7 +4423,7 @@ sub_803CB0C: @ 803CB0C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0803CBA4 @ =gUnknown_202063C + ldr r5, _0803CBA4 @ =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -4472,7 +4472,7 @@ sub_803CB0C: @ 803CB0C adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _0803CBAC @ =nullsub_8 + ldr r1, _0803CBAC @ =SpriteCallbackDummy bl StoreSpriteCallbackInData6 ldr r1, _0803CBB0 @ =gUnknown_3004FE0 ldrb r0, [r4] @@ -4486,9 +4486,9 @@ sub_803CB0C: @ 803CB0C .align 2, 0 _0803CB9C: .4byte gUnknown_2023D44 _0803CBA0: .4byte gUnknown_2023BC4 -_0803CBA4: .4byte gUnknown_202063C +_0803CBA4: .4byte gSprites _0803CBA8: .4byte sub_8075590 -_0803CBAC: .4byte nullsub_8 +_0803CBAC: .4byte SpriteCallbackDummy _0803CBB0: .4byte gUnknown_3004FE0 _0803CBB4: .4byte sub_803A70C thumb_func_end sub_803CB0C @@ -4547,7 +4547,7 @@ _0803CC0C: movs r0, 0x10 movs r1, 0x3F bl PlaySE12WithPanning - ldr r2, _0803CC50 @ =gUnknown_202063C + ldr r2, _0803CC50 @ =gSprites ldr r1, _0803CC54 @ =gUnknown_2023D44 ldrb r0, [r5] adds r0, r1 @@ -4570,7 +4570,7 @@ _0803CC48: pop {r0} bx r0 .align 2, 0 -_0803CC50: .4byte gUnknown_202063C +_0803CC50: .4byte gSprites _0803CC54: .4byte gUnknown_2023D44 _0803CC58: .4byte sub_8011EA0 _0803CC5C: .4byte gUnknown_3004FE0 @@ -5436,7 +5436,7 @@ _0803D2F0: .4byte gUnknown_2022870 thumb_func_start RecordedOpponentHandleHitAnimation RecordedOpponentHandleHitAnimation: @ 803D2F4 push {r4,lr} - ldr r3, _0803D31C @ =gUnknown_202063C + ldr r3, _0803D31C @ =gSprites ldr r2, _0803D320 @ =gUnknown_2023D44 ldr r4, _0803D324 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -5454,7 +5454,7 @@ RecordedOpponentHandleHitAnimation: @ 803D2F4 bl RecordedOpponentBufferExecCompleted b _0803D352 .align 2, 0 -_0803D31C: .4byte gUnknown_202063C +_0803D31C: .4byte gSprites _0803D320: .4byte gUnknown_2023D44 _0803D324: .4byte gUnknown_2023BC4 _0803D328: @@ -5620,7 +5620,7 @@ sub_803D454: @ 803D454 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0803D53C @ =gUnknown_202063C + ldr r4, _0803D53C @ =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -5724,7 +5724,7 @@ _0803D516: .align 2, 0 _0803D534: .4byte gUnknown_2023D44 _0803D538: .4byte gUnknown_2023BC4 -_0803D53C: .4byte gUnknown_202063C +_0803D53C: .4byte gSprites _0803D540: .4byte sub_8075590 _0803D544: .4byte sub_803D648 _0803D548: .4byte sub_803D564 @@ -6099,7 +6099,7 @@ RecordedOpponentHandleSpriteInvisibility: @ 803D834 lsls r0, 24 cmp r0, 0 beq _0803D87A - ldr r3, _0803D888 @ =gUnknown_202063C + ldr r3, _0803D888 @ =gSprites ldr r0, _0803D88C @ =gUnknown_2023D44 ldrb r1, [r4] adds r0, r1, r0 @@ -6132,7 +6132,7 @@ _0803D87A: bx r0 .align 2, 0 _0803D884: .4byte gUnknown_2023BC4 -_0803D888: .4byte gUnknown_202063C +_0803D888: .4byte gSprites _0803D88C: .4byte gUnknown_2023D44 _0803D890: .4byte gUnknown_2022BC4 thumb_func_end RecordedOpponentHandleSpriteInvisibility diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s index ed63591cb..33d0f6ff3 100644 --- a/asm/battle_controller_link_partner.s +++ b/asm/battle_controller_link_partner.s @@ -69,7 +69,7 @@ _080D426C: thumb_func_start sub_80D4270 sub_80D4270: @ 80D4270 push {lr} - ldr r2, _080D4298 @ =gUnknown_202063C + ldr r2, _080D4298 @ =gSprites ldr r1, _080D429C @ =gUnknown_2023D44 ldr r0, _080D42A0 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -81,7 +81,7 @@ sub_80D4270: @ 80D4270 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080D42A4 @ =nullsub_8 + ldr r0, _080D42A4 @ =SpriteCallbackDummy cmp r1, r0 bne _080D4294 bl sub_80D49E8 @@ -89,16 +89,16 @@ _080D4294: pop {r0} bx r0 .align 2, 0 -_080D4298: .4byte gUnknown_202063C +_080D4298: .4byte gSprites _080D429C: .4byte gUnknown_2023D44 _080D42A0: .4byte gUnknown_2023BC4 -_080D42A4: .4byte nullsub_8 +_080D42A4: .4byte SpriteCallbackDummy thumb_func_end sub_80D4270 thumb_func_start sub_80D42A8 sub_80D42A8: @ 80D42A8 push {r4-r6,lr} - ldr r6, _080D4300 @ =gUnknown_202063C + ldr r6, _080D4300 @ =gSprites ldr r5, _080D4304 @ =gUnknown_2023D44 ldr r4, _080D4308 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -111,7 +111,7 @@ sub_80D42A8: @ 80D42A8 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _080D430C @ =nullsub_8 + ldr r0, _080D430C @ =SpriteCallbackDummy cmp r1, r0 bne _080D42F8 movs r0, 0 @@ -138,10 +138,10 @@ _080D42F8: pop {r0} bx r0 .align 2, 0 -_080D4300: .4byte gUnknown_202063C +_080D4300: .4byte gSprites _080D4304: .4byte gUnknown_2023D44 _080D4308: .4byte gUnknown_2023BC4 -_080D430C: .4byte nullsub_8 +_080D430C: .4byte SpriteCallbackDummy thumb_func_end sub_80D42A8 thumb_func_start sub_80D4310 @@ -201,7 +201,7 @@ sub_80D4358: @ 80D4358 cmp r0, 0 beq _080D43B0 _080D437C: - ldr r2, _080D43A0 @ =gUnknown_202063C + ldr r2, _080D43A0 @ =gSprites ldr r1, _080D43A4 @ =gUnknown_3004FF0 ldr r0, _080D43A8 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -213,18 +213,18 @@ _080D437C: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080D43AC @ =nullsub_8 + ldr r0, _080D43AC @ =SpriteCallbackDummy cmp r1, r0 bne _080D43E8 b _080D43E6 .align 2, 0 _080D439C: .4byte gUnknown_2022B4C -_080D43A0: .4byte gUnknown_202063C +_080D43A0: .4byte gSprites _080D43A4: .4byte gUnknown_3004FF0 _080D43A8: .4byte gUnknown_2023BC4 -_080D43AC: .4byte nullsub_8 +_080D43AC: .4byte SpriteCallbackDummy _080D43B0: - ldr r2, _080D4420 @ =gUnknown_202063C + ldr r2, _080D4420 @ =gSprites ldr r5, _080D4424 @ =gUnknown_3004FF0 ldr r0, _080D4428 @ =gUnknown_2023BC4 ldrb r3, [r0] @@ -237,7 +237,7 @@ _080D43B0: adds r4, 0x1C adds r0, r4 ldr r2, [r0] - ldr r0, _080D442C @ =nullsub_8 + ldr r0, _080D442C @ =SpriteCallbackDummy cmp r2, r0 bne _080D43E8 movs r0, 0x2 @@ -284,10 +284,10 @@ _080D441A: pop {r0} bx r0 .align 2, 0 -_080D4420: .4byte gUnknown_202063C +_080D4420: .4byte gSprites _080D4424: .4byte gUnknown_3004FF0 _080D4428: .4byte gUnknown_2023BC4 -_080D442C: .4byte nullsub_8 +_080D442C: .4byte SpriteCallbackDummy _080D4430: .4byte gUnknown_2024018 _080D4434: .4byte gUnknown_3004FE0 _080D4438: .4byte sub_80D4310 @@ -362,7 +362,7 @@ _080D4460: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080D4578 @ =gUnknown_202063C + ldr r1, _080D4578 @ =gSprites adds r0, r1 bl DestroySprite ldr r4, _080D457C @ =gUnknown_3004FF0 @@ -398,7 +398,7 @@ _080D4500: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080D4578 @ =gUnknown_202063C + ldr r1, _080D4578 @ =gSprites adds r0, r1 bl DestroySprite ldr r5, _080D457C @ =gUnknown_3004FF0 @@ -444,7 +444,7 @@ _080D4568: .4byte gUnknown_2024018 _080D456C: .4byte gUnknown_2023BC4 _080D4570: .4byte gUnknown_2022B4C _080D4574: .4byte gUnknown_3004FFC -_080D4578: .4byte gUnknown_202063C +_080D4578: .4byte gSprites _080D457C: .4byte gUnknown_3004FF0 _080D4580: .4byte gUnknown_2023BCE _080D4584: .4byte gUnknown_2024284 @@ -455,7 +455,7 @@ _080D458C: .4byte sub_80D4358 thumb_func_start sub_80D4590 sub_80D4590: @ 80D4590 push {lr} - ldr r2, _080D45C4 @ =gUnknown_202063C + ldr r2, _080D45C4 @ =gSprites ldr r1, _080D45C8 @ =gUnknown_2023D44 ldr r0, _080D45CC @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -480,7 +480,7 @@ _080D45BE: pop {r0} bx r0 .align 2, 0 -_080D45C4: .4byte gUnknown_202063C +_080D45C4: .4byte gSprites _080D45C8: .4byte gUnknown_2023D44 _080D45CC: .4byte gUnknown_2023BC4 thumb_func_end sub_80D4590 @@ -542,7 +542,7 @@ _080D463C: .4byte gUnknown_2024284 thumb_func_start sub_80D4640 sub_80D4640: @ 80D4640 push {r4-r6,lr} - ldr r6, _080D4698 @ =gUnknown_202063C + ldr r6, _080D4698 @ =gSprites ldr r5, _080D469C @ =gUnknown_2023D44 ldr r4, _080D46A0 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -582,7 +582,7 @@ _080D4690: pop {r0} bx r0 .align 2, 0 -_080D4698: .4byte gUnknown_202063C +_080D4698: .4byte gSprites _080D469C: .4byte gUnknown_2023D44 _080D46A0: .4byte gUnknown_2023BC4 _080D46A4: .4byte gUnknown_3004FF0 @@ -611,7 +611,7 @@ sub_80D46A8: @ 80D46A8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080D4710 @ =gUnknown_202063C + ldr r4, _080D4710 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -636,7 +636,7 @@ _080D46FC: _080D4704: .4byte gUnknown_2024018 _080D4708: .4byte gUnknown_2023BC4 _080D470C: .4byte gUnknown_2023D44 -_080D4710: .4byte gUnknown_202063C +_080D4710: .4byte gSprites _080D4714: .4byte gUnknown_3004FF0 thumb_func_end sub_80D46A8 @@ -662,7 +662,7 @@ sub_80D4730: @ 80D4730 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _080D4774 @ =gUnknown_202063C + ldr r2, _080D4774 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -687,7 +687,7 @@ sub_80D4730: @ 80D4730 .align 2, 0 _080D476C: .4byte gUnknown_2023D44 _080D4770: .4byte gUnknown_2023BC4 -_080D4774: .4byte gUnknown_202063C +_080D4774: .4byte gSprites _080D4778: .4byte gUnknown_2024005 _080D477C: ldrh r0, [r4, 0x30] @@ -721,7 +721,7 @@ _080D47A6: thumb_func_start sub_80D47AC sub_80D47AC: @ 80D47AC push {r4,lr} - ldr r2, _080D4800 @ =gUnknown_202063C + ldr r2, _080D4800 @ =gSprites ldr r0, _080D4804 @ =gUnknown_3004FF0 ldr r4, _080D4808 @ =gUnknown_2023BC4 ldrb r3, [r4] @@ -733,7 +733,7 @@ sub_80D47AC: @ 80D47AC adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080D480C @ =nullsub_8 + ldr r0, _080D480C @ =SpriteCallbackDummy cmp r1, r0 bne _080D47F8 ldr r0, _080D4810 @ =gUnknown_2024018 @@ -763,10 +763,10 @@ _080D47F8: pop {r0} bx r0 .align 2, 0 -_080D4800: .4byte gUnknown_202063C +_080D4800: .4byte gSprites _080D4804: .4byte gUnknown_3004FF0 _080D4808: .4byte gUnknown_2023BC4 -_080D480C: .4byte nullsub_8 +_080D480C: .4byte SpriteCallbackDummy _080D4810: .4byte gUnknown_2024018 _080D4814: .4byte gUnknown_3004FE0 _080D4818: .4byte sub_80D481C @@ -859,7 +859,7 @@ sub_80D484C: @ 80D484C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080D4934 @ =gUnknown_202063C + ldr r1, _080D4934 @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAnim @@ -902,7 +902,7 @@ _080D4924: .4byte c3_0802FDF4 _080D4928: .4byte gUnknown_2023BCE _080D492C: .4byte gUnknown_2024284 _080D4930: .4byte gUnknown_2023D44 -_080D4934: .4byte gUnknown_202063C +_080D4934: .4byte gSprites _080D4938: .4byte gUnknown_3004FF0 _080D493C: .4byte gUnknown_3004FE0 _080D4940: .4byte sub_80D47AC @@ -935,7 +935,7 @@ sub_80D4944: @ 80D4944 adds r0, r2, 0 bl sub_80F1720 _080D4976: - ldr r5, _080D49D4 @ =gUnknown_202063C + ldr r5, _080D49D4 @ =gSprites ldr r0, _080D49D8 @ =gUnknown_3004FFC ldrb r2, [r4] adds r0, r2, r0 @@ -947,7 +947,7 @@ _080D4976: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _080D49DC @ =nullsub_8 + ldr r0, _080D49DC @ =SpriteCallbackDummy cmp r1, r0 bne _080D49BC ldr r0, [r6] @@ -978,9 +978,9 @@ _080D49C4: .4byte gUnknown_2024018 _080D49C8: .4byte gUnknown_2023BC4 _080D49CC: .4byte gUnknown_2023BCE _080D49D0: .4byte gUnknown_2024284 -_080D49D4: .4byte gUnknown_202063C +_080D49D4: .4byte gSprites _080D49D8: .4byte gUnknown_3004FFC -_080D49DC: .4byte nullsub_8 +_080D49DC: .4byte SpriteCallbackDummy _080D49E0: .4byte gUnknown_3004FE0 _080D49E4: .4byte sub_80D484C thumb_func_end sub_80D4944 @@ -3397,7 +3397,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _080D5EBC @ =gUnknown_202063C + ldr r5, _080D5EBC @ =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -3456,7 +3456,7 @@ _080D5EAC: .4byte gUnknown_2023BC4 _080D5EB0: .4byte gUnknown_2024284 _080D5EB4: .4byte gUnknown_20244DC _080D5EB8: .4byte gUnknown_2023D44 -_080D5EBC: .4byte gUnknown_202063C +_080D5EBC: .4byte gSprites _080D5EC0: .4byte 0x0000ff10 _080D5EC4: .4byte gUnknown_2024024 _080D5EC8: .4byte gUnknown_3004FE0 @@ -3588,7 +3588,7 @@ sub_80D5F40: @ 80D5F40 ldr r4, _080D609C @ =gUnknown_2023D44 adds r4, r6, r4 strb r0, [r4] - ldr r5, _080D60A0 @ =gUnknown_202063C + ldr r5, _080D60A0 @ =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -3647,7 +3647,7 @@ sub_80D5F40: @ 80D5F40 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080D60A8 @ =nullsub_8 + ldr r1, _080D60A8 @ =SpriteCallbackDummy str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -3676,9 +3676,9 @@ _080D6090: .4byte sub_8033E3C _080D6094: .4byte gUnknown_3004FFC _080D6098: .4byte gUnknown_20244DC _080D609C: .4byte gUnknown_2023D44 -_080D60A0: .4byte gUnknown_202063C +_080D60A0: .4byte gSprites _080D60A4: .4byte gUnknown_2024024 -_080D60A8: .4byte nullsub_8 +_080D60A8: .4byte SpriteCallbackDummy thumb_func_end sub_80D5F40 thumb_func_start LinkPartnerHandleReturnPokeToBall @@ -3721,7 +3721,7 @@ _080D60F4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080D6134 @ =gUnknown_202063C + ldr r4, _080D6134 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -3744,7 +3744,7 @@ _080D612A: bx r0 .align 2, 0 _080D6130: .4byte gUnknown_2023D44 -_080D6134: .4byte gUnknown_202063C +_080D6134: .4byte gSprites _080D6138: .4byte gUnknown_3004FF0 thumb_func_end LinkPartnerHandleReturnPokeToBall @@ -3930,7 +3930,7 @@ _080D6258: ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _080D6328 @ =gUnknown_202063C + ldr r4, _080D6328 @ =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -3988,7 +3988,7 @@ _080D6318: .4byte gUnknown_2023BC4 _080D631C: .4byte gUnknown_20244DC _080D6320: .4byte gUnknown_8239F8C _080D6324: .4byte gUnknown_2023D44 -_080D6328: .4byte gUnknown_202063C +_080D6328: .4byte gSprites _080D632C: .4byte 0x0000fffe _080D6330: .4byte sub_8033EEC _080D6334: .4byte gUnknown_3004FE0 @@ -4014,7 +4014,7 @@ sub_80D6348: @ 80D6348 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _080D63DC @ =gUnknown_202063C + ldr r5, _080D63DC @ =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -4062,7 +4062,7 @@ sub_80D6348: @ 80D6348 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _080D63E8 @ =nullsub_8 + ldr r1, _080D63E8 @ =SpriteCallbackDummy bl StoreSpriteCallbackInData6 ldr r1, _080D63EC @ =gUnknown_3004FE0 ldrb r0, [r4] @@ -4076,10 +4076,10 @@ sub_80D6348: @ 80D6348 .align 2, 0 _080D63D4: .4byte gUnknown_2023D44 _080D63D8: .4byte gUnknown_2023BC4 -_080D63DC: .4byte gUnknown_202063C +_080D63DC: .4byte gSprites _080D63E0: .4byte 0x0000ffd8 _080D63E4: .4byte sub_8075590 -_080D63E8: .4byte nullsub_8 +_080D63E8: .4byte SpriteCallbackDummy _080D63EC: .4byte gUnknown_3004FE0 _080D63F0: .4byte sub_80D42A8 thumb_func_end sub_80D6348 @@ -4149,7 +4149,7 @@ _080D6448: negs r1, r1 movs r0, 0x10 bl PlaySE12WithPanning - ldr r2, _080D64CC @ =gUnknown_202063C + ldr r2, _080D64CC @ =gSprites ldr r3, _080D64D0 @ =gUnknown_2023D44 ldrb r0, [r5] adds r0, r3 @@ -4191,7 +4191,7 @@ _080D64BE: .align 2, 0 _080D64C4: .4byte gUnknown_2023BCE _080D64C8: .4byte gUnknown_2024284 -_080D64CC: .4byte gUnknown_202063C +_080D64CC: .4byte gSprites _080D64D0: .4byte gUnknown_2023D44 _080D64D4: .4byte sub_8012110 _080D64D8: .4byte gUnknown_3004FE0 @@ -5057,7 +5057,7 @@ _080D6B6C: .4byte gUnknown_2022870 thumb_func_start LinkPartnerHandleHitAnimation LinkPartnerHandleHitAnimation: @ 80D6B70 push {r4,lr} - ldr r3, _080D6B98 @ =gUnknown_202063C + ldr r3, _080D6B98 @ =gSprites ldr r2, _080D6B9C @ =gUnknown_2023D44 ldr r4, _080D6BA0 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -5075,7 +5075,7 @@ LinkPartnerHandleHitAnimation: @ 80D6B70 bl sub_80D49E8 b _080D6BCE .align 2, 0 -_080D6B98: .4byte gUnknown_202063C +_080D6B98: .4byte gSprites _080D6B9C: .4byte gUnknown_2023D44 _080D6BA0: .4byte gUnknown_2023BC4 _080D6BA4: @@ -5242,7 +5242,7 @@ sub_80D6CD4: @ 80D6CD4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080D6DE4 @ =gUnknown_202063C + ldr r4, _080D6DE4 @ =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -5360,7 +5360,7 @@ _080D6DC2: .align 2, 0 _080D6DDC: .4byte gUnknown_2023D44 _080D6DE0: .4byte gUnknown_2023BC4 -_080D6DE4: .4byte gUnknown_202063C +_080D6DE4: .4byte gSprites _080D6DE8: .4byte 0x0000ffd8 _080D6DEC: .4byte sub_8075590 _080D6DF0: .4byte sub_80335F8 @@ -5385,7 +5385,7 @@ _080D6E0C: adds r1, r4, r2 movs r2, 0x20 bl LoadCompressedPalette - ldr r2, _080D6EA8 @ =gUnknown_202063C + ldr r2, _080D6EA8 @ =gSprites ldr r1, _080D6EAC @ =gUnknown_2023D44 ldr r5, _080D6EB0 @ =gUnknown_2023BC4 ldrb r0, [r5] @@ -5452,7 +5452,7 @@ _080D6E86: bx r0 .align 2, 0 _080D6EA4: .4byte gUnknown_8239FD4 -_080D6EA8: .4byte gUnknown_202063C +_080D6EA8: .4byte gSprites _080D6EAC: .4byte gUnknown_2023D44 _080D6EB0: .4byte gUnknown_2023BC4 _080D6EB4: .4byte sub_80D6ED0 @@ -5780,7 +5780,7 @@ LinkPartnerHandleSpriteInvisibility: @ 80D7144 lsls r0, 24 cmp r0, 0 beq _080D718A - ldr r3, _080D7198 @ =gUnknown_202063C + ldr r3, _080D7198 @ =gSprites ldr r0, _080D719C @ =gUnknown_2023D44 ldrb r1, [r4] adds r0, r1, r0 @@ -5813,7 +5813,7 @@ _080D718A: bx r0 .align 2, 0 _080D7194: .4byte gUnknown_2023BC4 -_080D7198: .4byte gUnknown_202063C +_080D7198: .4byte gSprites _080D719C: .4byte gUnknown_2023D44 _080D71A0: .4byte gUnknown_2022BC4 thumb_func_end LinkPartnerHandleSpriteInvisibility diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s index 99f8d7201..0beda379a 100644 --- a/asm/battle_controller_oak.s +++ b/asm/battle_controller_oak.s @@ -421,7 +421,7 @@ _080E78D8: thumb_func_start sub_80E78E0 sub_80E78E0: @ 80E78E0 push {lr} - ldr r2, _080E7908 @ =gUnknown_202063C + ldr r2, _080E7908 @ =gSprites ldr r1, _080E790C @ =gUnknown_2023D44 ldr r0, _080E7910 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -433,7 +433,7 @@ sub_80E78E0: @ 80E78E0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080E7914 @ =nullsub_8 + ldr r0, _080E7914 @ =SpriteCallbackDummy cmp r1, r0 bne _080E7904 bl WallyBufferExecCompleted @@ -441,10 +441,10 @@ _080E7904: pop {r0} bx r0 .align 2, 0 -_080E7908: .4byte gUnknown_202063C +_080E7908: .4byte gSprites _080E790C: .4byte gUnknown_2023D44 _080E7910: .4byte gUnknown_2023BC4 -_080E7914: .4byte nullsub_8 +_080E7914: .4byte SpriteCallbackDummy thumb_func_end sub_80E78E0 thumb_func_start sub_80E7918 @@ -814,7 +814,7 @@ _080E7BB2: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E7CC8 @ =gUnknown_202063C + ldr r1, _080E7CC8 @ =gSprites adds r0, r1 bl DestroySprite ldr r4, _080E7CCC @ =gUnknown_3004FF0 @@ -850,7 +850,7 @@ _080E7C46: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080E7CC8 @ =gUnknown_202063C + ldr r1, _080E7CC8 @ =gSprites adds r0, r1 bl DestroySprite ldr r5, _080E7CCC @ =gUnknown_3004FF0 @@ -898,7 +898,7 @@ _080E7CB8: .4byte gUnknown_2023BCE _080E7CBC: .4byte gUnknown_2024284 _080E7CC0: .4byte gUnknown_2022B4C _080E7CC4: .4byte gUnknown_3004FFC -_080E7CC8: .4byte gUnknown_202063C +_080E7CC8: .4byte gSprites _080E7CCC: .4byte gUnknown_3004FF0 _080E7CD0: .4byte gUnknown_3004FE0 _080E7CD4: .4byte sub_80E7CD8 @@ -910,7 +910,7 @@ sub_80E7CD8: @ 80E7CD8 mov r7, r8 push {r7} movs r4, 0 - ldr r2, _080E7DD8 @ =gUnknown_202063C + ldr r2, _080E7DD8 @ =gSprites ldr r0, _080E7DDC @ =gUnknown_3004FF0 ldr r1, _080E7DE0 @ =gUnknown_2023BC4 mov r8, r1 @@ -923,7 +923,7 @@ sub_80E7CD8: @ 80E7CD8 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080E7DE4 @ =nullsub_8 + ldr r0, _080E7DE4 @ =SpriteCallbackDummy cmp r1, r0 bne _080E7D02 movs r4, 0x1 @@ -1033,10 +1033,10 @@ _080E7DCE: pop {r0} bx r0 .align 2, 0 -_080E7DD8: .4byte gUnknown_202063C +_080E7DD8: .4byte gSprites _080E7DDC: .4byte gUnknown_3004FF0 _080E7DE0: .4byte gUnknown_2023BC4 -_080E7DE4: .4byte nullsub_8 +_080E7DE4: .4byte SpriteCallbackDummy _080E7DE8: .4byte gUnknown_2024018 _080E7DEC: .4byte 0x000027f9 _080E7DF0: .4byte c3_0802FDF4 @@ -1652,7 +1652,7 @@ _080E82F0: .4byte sub_80E8930 thumb_func_start sub_80E82F4 sub_80E82F4: @ 80E82F4 push {r4-r6,lr} - ldr r6, _080E834C @ =gUnknown_202063C + ldr r6, _080E834C @ =gSprites ldr r5, _080E8350 @ =gUnknown_2023D44 ldr r4, _080E8354 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -1692,7 +1692,7 @@ _080E8344: pop {r0} bx r0 .align 2, 0 -_080E834C: .4byte gUnknown_202063C +_080E834C: .4byte gSprites _080E8350: .4byte gUnknown_2023D44 _080E8354: .4byte gUnknown_2023BC4 _080E8358: .4byte gUnknown_3004FF0 @@ -2437,7 +2437,7 @@ DoHitAnimBlinkSpriteEffect_3: @ 80E8948 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _080E898C @ =gUnknown_202063C + ldr r2, _080E898C @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2462,7 +2462,7 @@ DoHitAnimBlinkSpriteEffect_3: @ 80E8948 .align 2, 0 _080E8984: .4byte gUnknown_2023D44 _080E8988: .4byte gUnknown_2023BC4 -_080E898C: .4byte gUnknown_202063C +_080E898C: .4byte gSprites _080E8990: .4byte gUnknown_2024005 _080E8994: ldrh r0, [r4, 0x30] @@ -2516,7 +2516,7 @@ sub_80E89C4: @ 80E89C4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080E8A2C @ =gUnknown_202063C + ldr r4, _080E8A2C @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -2541,14 +2541,14 @@ _080E8A18: _080E8A20: .4byte gUnknown_2024018 _080E8A24: .4byte gUnknown_2023BC4 _080E8A28: .4byte gUnknown_2023D44 -_080E8A2C: .4byte gUnknown_202063C +_080E8A2C: .4byte gSprites _080E8A30: .4byte gUnknown_3004FF0 thumb_func_end sub_80E89C4 thumb_func_start sub_80E8A34 sub_80E8A34: @ 80E8A34 push {lr} - ldr r2, _080E8A5C @ =gUnknown_202063C + ldr r2, _080E8A5C @ =gSprites ldr r1, _080E8A60 @ =gUnknown_2023D44 ldr r0, _080E8A64 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -2560,7 +2560,7 @@ sub_80E8A34: @ 80E8A34 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080E8A68 @ =nullsub_8 + ldr r0, _080E8A68 @ =SpriteCallbackDummy cmp r1, r0 bne _080E8A58 bl WallyBufferExecCompleted @@ -2568,10 +2568,10 @@ _080E8A58: pop {r0} bx r0 .align 2, 0 -_080E8A5C: .4byte gUnknown_202063C +_080E8A5C: .4byte gSprites _080E8A60: .4byte gUnknown_2023D44 _080E8A64: .4byte gUnknown_2023BC4 -_080E8A68: .4byte nullsub_8 +_080E8A68: .4byte SpriteCallbackDummy thumb_func_end sub_80E8A34 thumb_func_start CompleteOnFinishedBattleAnimation_4 @@ -4925,7 +4925,7 @@ _080E9E24: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080E9E64 @ =gUnknown_202063C + ldr r4, _080E9E64 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -4948,7 +4948,7 @@ _080E9E5A: bx r0 .align 2, 0 _080E9E60: .4byte gUnknown_2023D44 -_080E9E64: .4byte gUnknown_202063C +_080E9E64: .4byte gSprites _080E9E68: .4byte gUnknown_3004FF0 thumb_func_end WallyHandleReturnMonToBall @@ -5033,7 +5033,7 @@ _080E9EE0: _080E9F1C: adds r1, r2 strb r0, [r1] - ldr r4, _080E9F9C @ =gUnknown_202063C + ldr r4, _080E9F9C @ =gSprites ldr r5, _080E9F98 @ =gUnknown_2023D44 ldr r6, _080E9F8C @ =gUnknown_2023BC4 ldrb r3, [r6] @@ -5091,7 +5091,7 @@ _080E9F8C: .4byte gUnknown_2023BC4 _080E9F90: .4byte gUnknown_20244DC _080E9F94: .4byte gUnknown_8239F8C _080E9F98: .4byte gUnknown_2023D44 -_080E9F9C: .4byte gUnknown_202063C +_080E9F9C: .4byte gSprites _080E9FA0: .4byte 0x0000fffe _080E9FA4: .4byte sub_8033EEC _080E9FA8: .4byte gUnknown_3004FE0 @@ -5179,7 +5179,7 @@ _080EA024: _080EA060: adds r1, r2 strb r0, [r1] - ldr r4, _080EA0E0 @ =gUnknown_202063C + ldr r4, _080EA0E0 @ =gSprites ldr r5, _080EA0DC @ =gUnknown_2023D44 ldr r6, _080EA0D0 @ =gUnknown_2023BC4 ldrb r3, [r6] @@ -5237,7 +5237,7 @@ _080EA0D0: .4byte gUnknown_2023BC4 _080EA0D4: .4byte gUnknown_20244DC _080EA0D8: .4byte gUnknown_8239F8C _080EA0DC: .4byte gUnknown_2023D44 -_080EA0E0: .4byte gUnknown_202063C +_080EA0E0: .4byte gSprites _080EA0E4: .4byte 0x0000ffa0 _080EA0E8: .4byte sub_8033EEC _080EA0EC: .4byte gUnknown_3004FE0 @@ -5317,7 +5317,7 @@ _080EA154: negs r1, r1 movs r0, 0x10 bl PlaySE12WithPanning - ldr r2, _080EA1D8 @ =gUnknown_202063C + ldr r2, _080EA1D8 @ =gSprites ldr r3, _080EA1DC @ =gUnknown_2023D44 ldrb r0, [r5] adds r0, r3 @@ -5359,7 +5359,7 @@ _080EA1CA: .align 2, 0 _080EA1D0: .4byte gUnknown_2023BCE _080EA1D4: .4byte gUnknown_2024284 -_080EA1D8: .4byte gUnknown_202063C +_080EA1D8: .4byte gSprites _080EA1DC: .4byte gUnknown_2023D44 _080EA1E0: .4byte sub_8012110 _080EA1E4: .4byte gUnknown_3004FE0 @@ -6640,7 +6640,7 @@ sub_80EABFC: @ 80EABFC thumb_func_start sub_80EAC08 sub_80EAC08: @ 80EAC08 push {r4,lr} - ldr r3, _080EAC30 @ =gUnknown_202063C + ldr r3, _080EAC30 @ =gSprites ldr r2, _080EAC34 @ =gUnknown_2023D44 ldr r4, _080EAC38 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -6658,7 +6658,7 @@ sub_80EAC08: @ 80EAC08 bl WallyBufferExecCompleted b _080EAC66 .align 2, 0 -_080EAC30: .4byte gUnknown_202063C +_080EAC30: .4byte gSprites _080EAC34: .4byte gUnknown_2023D44 _080EAC38: .4byte gUnknown_2023BC4 _080EAC3C: @@ -6820,7 +6820,7 @@ _080EAD64: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _080EAEAC @ =gUnknown_202063C + ldr r5, _080EAEAC @ =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r7] @@ -6968,7 +6968,7 @@ _080EAE84: _080EAEA0: .4byte gUnknown_2022B4C _080EAEA4: .4byte gUnknown_2023D44 _080EAEA8: .4byte gUnknown_2023BC4 -_080EAEAC: .4byte gUnknown_202063C +_080EAEAC: .4byte gSprites _080EAEB0: .4byte 0x0000ffd8 _080EAEB4: .4byte sub_8075590 _080EAEB8: .4byte sub_80335F8 @@ -7097,7 +7097,7 @@ sub_80EAF34: @ 80EAF34 ldr r4, _080EB098 @ =gUnknown_2023D44 adds r4, r6, r4 strb r0, [r4] - ldr r5, _080EB09C @ =gUnknown_202063C + ldr r5, _080EB09C @ =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -7156,7 +7156,7 @@ sub_80EAF34: @ 80EAF34 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _080EB0A4 @ =nullsub_8 + ldr r1, _080EB0A4 @ =SpriteCallbackDummy str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -7186,9 +7186,9 @@ _080EB08C: .4byte sub_8033E3C _080EB090: .4byte gUnknown_3004FFC _080EB094: .4byte gUnknown_20244DC _080EB098: .4byte gUnknown_2023D44 -_080EB09C: .4byte gUnknown_202063C +_080EB09C: .4byte gSprites _080EB0A0: .4byte gUnknown_2024024 -_080EB0A4: .4byte nullsub_8 +_080EB0A4: .4byte SpriteCallbackDummy thumb_func_end sub_80EAF34 thumb_func_start sub_80EB0A8 diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index 0571de07a..e73268b38 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -69,7 +69,7 @@ _08035AE4: thumb_func_start sub_8035AE8 sub_8035AE8: @ 8035AE8 push {lr} - ldr r2, _08035B10 @ =gUnknown_202063C + ldr r2, _08035B10 @ =gSprites ldr r1, _08035B14 @ =gUnknown_2023D44 ldr r0, _08035B18 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -81,7 +81,7 @@ sub_8035AE8: @ 8035AE8 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08035B1C @ =nullsub_8 + ldr r0, _08035B1C @ =SpriteCallbackDummy cmp r1, r0 bne _08035B0C bl OpponentBufferExecCompleted @@ -89,16 +89,16 @@ _08035B0C: pop {r0} bx r0 .align 2, 0 -_08035B10: .4byte gUnknown_202063C +_08035B10: .4byte gSprites _08035B14: .4byte gUnknown_2023D44 _08035B18: .4byte gUnknown_2023BC4 -_08035B1C: .4byte nullsub_8 +_08035B1C: .4byte SpriteCallbackDummy thumb_func_end sub_8035AE8 thumb_func_start sub_8035B20 sub_8035B20: @ 8035B20 push {lr} - ldr r2, _08035B48 @ =gUnknown_202063C + ldr r2, _08035B48 @ =gSprites ldr r1, _08035B4C @ =gUnknown_2023D44 ldr r0, _08035B50 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -110,7 +110,7 @@ sub_8035B20: @ 8035B20 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08035B54 @ =nullsub_8 + ldr r0, _08035B54 @ =SpriteCallbackDummy cmp r1, r0 bne _08035B44 bl OpponentBufferExecCompleted @@ -118,16 +118,16 @@ _08035B44: pop {r0} bx r0 .align 2, 0 -_08035B48: .4byte gUnknown_202063C +_08035B48: .4byte gSprites _08035B4C: .4byte gUnknown_2023D44 _08035B50: .4byte gUnknown_2023BC4 -_08035B54: .4byte nullsub_8 +_08035B54: .4byte SpriteCallbackDummy thumb_func_end sub_8035B20 thumb_func_start sub_8035B58 sub_8035B58: @ 8035B58 push {r4-r6,lr} - ldr r4, _08035BD0 @ =gUnknown_202063C + ldr r4, _08035BD0 @ =gSprites ldr r6, _08035BD4 @ =gUnknown_2023D44 ldr r5, _08035BD8 @ =gUnknown_2023BC4 ldrb r0, [r5] @@ -140,7 +140,7 @@ sub_8035B58: @ 8035B58 adds r0, 0x1C adds r0, r2, r0 ldr r1, [r0] - ldr r0, _08035BDC @ =nullsub_8 + ldr r0, _08035BDC @ =SpriteCallbackDummy cmp r1, r0 bne _08035BC8 adds r0, r2, r4 @@ -183,10 +183,10 @@ _08035BC8: pop {r0} bx r0 .align 2, 0 -_08035BD0: .4byte gUnknown_202063C +_08035BD0: .4byte gSprites _08035BD4: .4byte gUnknown_2023D44 _08035BD8: .4byte gUnknown_2023BC4 -_08035BDC: .4byte nullsub_8 +_08035BDC: .4byte SpriteCallbackDummy _08035BE0: .4byte 0x000003ff _08035BE4: .4byte 0xfffffc00 thumb_func_end sub_8035B58 @@ -248,7 +248,7 @@ sub_8035C30: @ 8035C30 cmp r0, 0 beq _08035C88 _08035C54: - ldr r2, _08035C78 @ =gUnknown_202063C + ldr r2, _08035C78 @ =gSprites ldr r1, _08035C7C @ =gUnknown_3004FF0 ldr r0, _08035C80 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -260,18 +260,18 @@ _08035C54: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08035C84 @ =nullsub_8 + ldr r0, _08035C84 @ =SpriteCallbackDummy cmp r1, r0 bne _08035CBE b _08035CBC .align 2, 0 _08035C74: .4byte gUnknown_2022B4C -_08035C78: .4byte gUnknown_202063C +_08035C78: .4byte gSprites _08035C7C: .4byte gUnknown_3004FF0 _08035C80: .4byte gUnknown_2023BC4 -_08035C84: .4byte nullsub_8 +_08035C84: .4byte SpriteCallbackDummy _08035C88: - ldr r2, _08035D84 @ =gUnknown_202063C + ldr r2, _08035D84 @ =gSprites ldr r5, _08035D88 @ =gUnknown_3004FF0 ldr r0, _08035D8C @ =gUnknown_2023BC4 ldrb r3, [r0] @@ -283,7 +283,7 @@ _08035C88: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _08035D90 @ =nullsub_8 + ldr r0, _08035D90 @ =SpriteCallbackDummy cmp r4, r0 bne _08035CBE movs r0, 0x2 @@ -398,10 +398,10 @@ _08035CD0: bl m4aMPlayContinue b _08035DB0 .align 2, 0 -_08035D84: .4byte gUnknown_202063C +_08035D84: .4byte gSprites _08035D88: .4byte gUnknown_3004FF0 _08035D8C: .4byte gUnknown_2023BC4 -_08035D90: .4byte nullsub_8 +_08035D90: .4byte SpriteCallbackDummy _08035D94: .4byte gUnknown_2024018 _08035D98: .4byte 0x000027f9 _08035D9C: .4byte gUnknown_2022B4C @@ -549,7 +549,7 @@ _08035E96: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08035FD8 @ =gUnknown_202063C + ldr r1, _08035FD8 @ =gSprites adds r0, r1 bl DestroySprite ldr r4, _08035FDC @ =gUnknown_3004FF0 @@ -605,7 +605,7 @@ _08035F28: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08035FD8 @ =gUnknown_202063C + ldr r1, _08035FD8 @ =gSprites adds r0, r1 bl DestroySprite ldr r4, _08035FDC @ =gUnknown_3004FF0 @@ -675,7 +675,7 @@ _08035FC8: .4byte gUnknown_2023BCE _08035FCC: .4byte gUnknown_202402C _08035FD0: .4byte gUnknown_2022B4C _08035FD4: .4byte gUnknown_3004FFC -_08035FD8: .4byte gUnknown_202063C +_08035FD8: .4byte gSprites _08035FDC: .4byte gUnknown_3004FF0 _08035FE0: .4byte gUnknown_3004FE0 _08035FE4: .4byte sub_8035C30 @@ -684,7 +684,7 @@ _08035FE4: .4byte sub_8035C30 thumb_func_start sub_8035FE8 sub_8035FE8: @ 8035FE8 push {r4-r7,lr} - ldr r2, _08036044 @ =gUnknown_202063C + ldr r2, _08036044 @ =gSprites ldr r0, _08036048 @ =gUnknown_2023D44 ldr r7, _0803604C @ =gUnknown_2023BC4 ldrb r3, [r7] @@ -728,7 +728,7 @@ sub_8035FE8: @ 8035FE8 bl sub_80F1720 b _08036094 .align 2, 0 -_08036044: .4byte gUnknown_202063C +_08036044: .4byte gSprites _08036048: .4byte gUnknown_2023D44 _0803604C: .4byte gUnknown_2023BC4 _08036050: .4byte gUnknown_2024018 @@ -837,7 +837,7 @@ _08036124: thumb_func_start sub_803612C sub_803612C: @ 803612C push {lr} - ldr r2, _08036160 @ =gUnknown_202063C + ldr r2, _08036160 @ =gSprites ldr r0, _08036164 @ =gUnknown_2023D44 ldr r1, _08036168 @ =gUnknown_2023BC4 ldrb r3, [r1] @@ -861,7 +861,7 @@ _0803615A: pop {r0} bx r0 .align 2, 0 -_08036160: .4byte gUnknown_202063C +_08036160: .4byte gSprites _08036164: .4byte gUnknown_2023D44 _08036168: .4byte gUnknown_2023BC4 _0803616C: .4byte gUnknown_3004FF0 @@ -890,7 +890,7 @@ sub_8036170: @ 8036170 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080361DC @ =gUnknown_202063C + ldr r4, _080361DC @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -917,7 +917,7 @@ _080361CA: _080361D0: .4byte gUnknown_2024018 _080361D4: .4byte gUnknown_2023BC4 _080361D8: .4byte gUnknown_2023D44 -_080361DC: .4byte gUnknown_202063C +_080361DC: .4byte gSprites _080361E0: .4byte gUnknown_3004FF0 thumb_func_end sub_8036170 @@ -943,7 +943,7 @@ sub_80361FC: @ 80361FC ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _08036240 @ =gUnknown_202063C + ldr r2, _08036240 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -968,7 +968,7 @@ sub_80361FC: @ 80361FC .align 2, 0 _08036238: .4byte gUnknown_2023D44 _0803623C: .4byte gUnknown_2023BC4 -_08036240: .4byte gUnknown_202063C +_08036240: .4byte gSprites _08036244: .4byte gUnknown_2024005 _08036248: ldrh r0, [r4, 0x30] @@ -1002,7 +1002,7 @@ _08036272: thumb_func_start sub_8036278 sub_8036278: @ 8036278 push {r4,lr} - ldr r2, _080362CC @ =gUnknown_202063C + ldr r2, _080362CC @ =gSprites ldr r0, _080362D0 @ =gUnknown_3004FF0 ldr r4, _080362D4 @ =gUnknown_2023BC4 ldrb r3, [r4] @@ -1014,7 +1014,7 @@ sub_8036278: @ 8036278 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080362D8 @ =nullsub_8 + ldr r0, _080362D8 @ =SpriteCallbackDummy cmp r1, r0 bne _080362C4 ldr r0, _080362DC @ =gUnknown_2024018 @@ -1044,10 +1044,10 @@ _080362C4: pop {r0} bx r0 .align 2, 0 -_080362CC: .4byte gUnknown_202063C +_080362CC: .4byte gSprites _080362D0: .4byte gUnknown_3004FF0 _080362D4: .4byte gUnknown_2023BC4 -_080362D8: .4byte nullsub_8 +_080362D8: .4byte SpriteCallbackDummy _080362DC: .4byte gUnknown_2024018 _080362E0: .4byte gUnknown_3004FE0 _080362E4: .4byte sub_80362E8 @@ -1135,7 +1135,7 @@ sub_8036334: @ 8036334 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080363F0 @ =gUnknown_202063C + ldr r1, _080363F0 @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAnim @@ -1176,7 +1176,7 @@ _080363E0: .4byte gUnknown_2024018 _080363E4: .4byte gUnknown_2023BC4 _080363E8: .4byte 0x000027f9 _080363EC: .4byte gUnknown_2023D44 -_080363F0: .4byte gUnknown_202063C +_080363F0: .4byte gSprites _080363F4: .4byte gUnknown_3004FF0 _080363F8: .4byte gUnknown_2023BCE _080363FC: .4byte gUnknown_202402C @@ -1211,7 +1211,7 @@ sub_8036408: @ 8036408 adds r0, r2, 0 bl sub_80F1720 _0803643A: - ldr r4, _080364BC @ =gUnknown_202063C + ldr r4, _080364BC @ =gSprites ldr r0, _080364C0 @ =gUnknown_3004FFC ldrb r2, [r5] adds r0, r2, r0 @@ -1223,7 +1223,7 @@ _0803643A: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _080364C4 @ =nullsub_8 + ldr r0, _080364C4 @ =SpriteCallbackDummy cmp r1, r0 bne _080364A4 ldr r0, [r6] @@ -1270,9 +1270,9 @@ _080364AC: .4byte gUnknown_2024018 _080364B0: .4byte gUnknown_2023BC4 _080364B4: .4byte gUnknown_2023BCE _080364B8: .4byte gUnknown_202402C -_080364BC: .4byte gUnknown_202063C +_080364BC: .4byte gSprites _080364C0: .4byte gUnknown_3004FFC -_080364C4: .4byte nullsub_8 +_080364C4: .4byte SpriteCallbackDummy _080364C8: .4byte gUnknown_3004FE0 _080364CC: .4byte sub_8036334 thumb_func_end sub_8036408 @@ -3670,7 +3670,7 @@ _080378AA: ldrb r1, [r7] adds r1, r4 strb r0, [r1] - ldr r5, _080379A8 @ =gUnknown_202063C + ldr r5, _080379A8 @ =gSprites ldrb r0, [r7] adds r0, r4 ldrb r1, [r0] @@ -3760,7 +3760,7 @@ _08037986: _0803799C: .4byte gUnknown_2023BC4 _080379A0: .4byte gUnknown_20244DC _080379A4: .4byte gUnknown_2023D44 -_080379A8: .4byte gUnknown_202063C +_080379A8: .4byte gSprites _080379AC: .4byte 0x0000ff10 _080379B0: .4byte gUnknown_2024024 _080379B4: .4byte gUnknown_2022B4C @@ -3898,7 +3898,7 @@ sub_8037A28: @ 8037A28 ldr r4, _08037B9C @ =gUnknown_2023D44 adds r4, r6, r4 strb r0, [r4] - ldr r5, _08037BA0 @ =gUnknown_202063C + ldr r5, _08037BA0 @ =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -3957,7 +3957,7 @@ sub_8037A28: @ 8037A28 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08037BA8 @ =nullsub_8 + ldr r1, _08037BA8 @ =SpriteCallbackDummy str r1, [r0] movs r0, 0 movs r1, 0xFE @@ -3986,9 +3986,9 @@ _08037B90: .4byte sub_8033E3C _08037B94: .4byte gUnknown_3004FFC _08037B98: .4byte gUnknown_20244DC _08037B9C: .4byte gUnknown_2023D44 -_08037BA0: .4byte gUnknown_202063C +_08037BA0: .4byte gSprites _08037BA4: .4byte gUnknown_2024024 -_08037BA8: .4byte nullsub_8 +_08037BA8: .4byte SpriteCallbackDummy thumb_func_end sub_8037A28 thumb_func_start sub_8037BAC @@ -4031,7 +4031,7 @@ _08037BF4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08037C3C @ =gUnknown_202063C + ldr r4, _08037C3C @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -4056,7 +4056,7 @@ _08037C30: bx r0 .align 2, 0 _08037C38: .4byte gUnknown_2023D44 -_08037C3C: .4byte gUnknown_202063C +_08037C3C: .4byte gSprites _08037C40: .4byte gUnknown_3004FF0 thumb_func_end sub_8037BAC @@ -4232,7 +4232,7 @@ _08037D3A: ldrb r1, [r2] adds r1, r5 strb r0, [r1] - ldr r4, _08037E80 @ =gUnknown_202063C + ldr r4, _08037E80 @ =gSprites ldrb r0, [r2] adds r0, r5 ldrb r1, [r0] @@ -4342,7 +4342,7 @@ _08037E70: .4byte gUnknown_2023BC4 _08037E74: .4byte gUnknown_20244DC _08037E78: .4byte gUnknown_823932C _08037E7C: .4byte gUnknown_2023D44 -_08037E80: .4byte gUnknown_202063C +_08037E80: .4byte gSprites _08037E84: .4byte 0x0000ff10 _08037E88: .4byte gUnknown_8239A1C _08037E8C: .4byte gUnknown_823957C @@ -4444,7 +4444,7 @@ _08037F0E: ldrb r1, [r2] adds r1, r5 strb r0, [r1] - ldr r4, _08038054 @ =gUnknown_202063C + ldr r4, _08038054 @ =gSprites ldrb r0, [r2] adds r0, r5 ldrb r1, [r0] @@ -4562,7 +4562,7 @@ _08038044: .4byte gUnknown_2023BC4 _08038048: .4byte gUnknown_20244DC _0803804C: .4byte gUnknown_823932C _08038050: .4byte gUnknown_2023D44 -_08038054: .4byte gUnknown_202063C +_08038054: .4byte gSprites _08038058: .4byte 0x0000fffe _0803805C: .4byte gUnknown_8239A1C _08038060: .4byte gUnknown_823957C @@ -4584,7 +4584,7 @@ sub_8038078: @ 8038078 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08038110 @ =gUnknown_202063C + ldr r5, _08038110 @ =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r4] @@ -4633,7 +4633,7 @@ sub_8038078: @ 8038078 adds r0, r1 lsls r0, 2 adds r0, r5 - ldr r1, _08038118 @ =nullsub_8 + ldr r1, _08038118 @ =SpriteCallbackDummy bl StoreSpriteCallbackInData6 ldr r1, _0803811C @ =gUnknown_3004FE0 ldrb r0, [r4] @@ -4647,9 +4647,9 @@ sub_8038078: @ 8038078 .align 2, 0 _08038108: .4byte gUnknown_2023D44 _0803810C: .4byte gUnknown_2023BC4 -_08038110: .4byte gUnknown_202063C +_08038110: .4byte gSprites _08038114: .4byte sub_8075590 -_08038118: .4byte nullsub_8 +_08038118: .4byte SpriteCallbackDummy _0803811C: .4byte gUnknown_3004FE0 _08038120: .4byte sub_8035B58 thumb_func_end sub_8038078 @@ -4708,7 +4708,7 @@ _08038178: movs r0, 0x10 movs r1, 0x3F bl PlaySE12WithPanning - ldr r2, _080381BC @ =gUnknown_202063C + ldr r2, _080381BC @ =gSprites ldr r1, _080381C0 @ =gUnknown_2023D44 ldrb r0, [r5] adds r0, r1 @@ -4731,7 +4731,7 @@ _080381B4: pop {r0} bx r0 .align 2, 0 -_080381BC: .4byte gUnknown_202063C +_080381BC: .4byte gSprites _080381C0: .4byte gUnknown_2023D44 _080381C4: .4byte sub_8011EA0 _080381C8: .4byte gUnknown_3004FE0 @@ -5925,7 +5925,7 @@ _08038B1C: .4byte gUnknown_2022870 thumb_func_start OpponentHandleHitAnimation OpponentHandleHitAnimation: @ 8038B20 push {r4,lr} - ldr r3, _08038B48 @ =gUnknown_202063C + ldr r3, _08038B48 @ =gSprites ldr r2, _08038B4C @ =gUnknown_2023D44 ldr r4, _08038B50 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -5943,7 +5943,7 @@ OpponentHandleHitAnimation: @ 8038B20 bl OpponentBufferExecCompleted b _08038B7E .align 2, 0 -_08038B48: .4byte gUnknown_202063C +_08038B48: .4byte gSprites _08038B4C: .4byte gUnknown_2023D44 _08038B50: .4byte gUnknown_2023BC4 _08038B54: @@ -6109,7 +6109,7 @@ sub_8038C80: @ 8038C80 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08038D68 @ =gUnknown_202063C + ldr r4, _08038D68 @ =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -6213,7 +6213,7 @@ _08038D42: .align 2, 0 _08038D60: .4byte gUnknown_2023D44 _08038D64: .4byte gUnknown_2023BC4 -_08038D68: .4byte gUnknown_202063C +_08038D68: .4byte gSprites _08038D6C: .4byte sub_8075590 _08038D70: .4byte sub_8038D90 _08038D74: .4byte sub_8038DC4 @@ -6588,7 +6588,7 @@ sub_8039060: @ 8039060 lsls r0, 24 cmp r0, 0 beq _080390A6 - ldr r3, _080390B4 @ =gUnknown_202063C + ldr r3, _080390B4 @ =gSprites ldr r0, _080390B8 @ =gUnknown_2023D44 ldrb r1, [r4] adds r0, r1, r0 @@ -6621,7 +6621,7 @@ _080390A6: bx r0 .align 2, 0 _080390B0: .4byte gUnknown_2023BC4 -_080390B4: .4byte gUnknown_202063C +_080390B4: .4byte gSprites _080390B8: .4byte gUnknown_2023D44 _080390BC: .4byte gUnknown_2022BC4 thumb_func_end sub_8039060 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index 59e807fb3..3c7d225f2 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -130,7 +130,7 @@ _0802E400: thumb_func_start CompleteOnBankSpritePosX_0 CompleteOnBankSpritePosX_0: @ 802E404 push {lr} - ldr r2, _0802E42C @ =gUnknown_202063C + ldr r2, _0802E42C @ =gSprites ldr r1, _0802E430 @ =gUnknown_2023D44 ldr r0, _0802E434 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -149,7 +149,7 @@ _0802E426: pop {r0} bx r0 .align 2, 0 -_0802E42C: .4byte gUnknown_202063C +_0802E42C: .4byte gSprites _0802E430: .4byte gUnknown_2023D44 _0802E434: .4byte gUnknown_2023BC4 thumb_func_end CompleteOnBankSpritePosX_0 @@ -479,7 +479,7 @@ _0802E6B6: beq _0802E72C movs r0, 0x5 bl PlaySE - ldr r2, _0802E718 @ =gUnknown_202063C + ldr r2, _0802E718 @ =gSprites ldr r1, _0802E71C @ =gUnknown_2023D44 ldr r4, _0802E70C @ =gUnknown_3004FF4 ldrb r0, [r4] @@ -513,7 +513,7 @@ _0802E708: .4byte gUnknown_8250980 _0802E70C: .4byte gUnknown_3004FF4 _0802E710: .4byte gUnknown_2023BCC _0802E714: .4byte gMain -_0802E718: .4byte gUnknown_202063C +_0802E718: .4byte gSprites _0802E71C: .4byte gUnknown_2023D44 _0802E720: .4byte sub_8012098 _0802E724: .4byte gUnknown_2023FFC @@ -525,7 +525,7 @@ _0802E72C: beq _0802E7A0 movs r0, 0x5 bl PlaySE - ldr r2, _0802E784 @ =gUnknown_202063C + ldr r2, _0802E784 @ =gSprites ldr r1, _0802E788 @ =gUnknown_2023D44 ldr r5, _0802E78C @ =gUnknown_3004FF4 ldrb r0, [r5] @@ -560,7 +560,7 @@ _0802E72C: bl dp11b_obj_free b _0802E9DC .align 2, 0 -_0802E784: .4byte gUnknown_202063C +_0802E784: .4byte gSprites _0802E788: .4byte gUnknown_2023D44 _0802E78C: .4byte gUnknown_3004FF4 _0802E790: .4byte sub_8012098 @@ -576,7 +576,7 @@ _0802E7A0: _0802E7AA: movs r0, 0x5 bl PlaySE - ldr r2, _0802E7DC @ =gUnknown_202063C + ldr r2, _0802E7DC @ =gSprites ldr r1, _0802E7E0 @ =gUnknown_2023D44 ldr r3, _0802E7E4 @ =gUnknown_3004FF4 ldrb r0, [r3] @@ -599,7 +599,7 @@ _0802E7CC: mov r0, sp b _0802E7F6 .align 2, 0 -_0802E7DC: .4byte gUnknown_202063C +_0802E7DC: .4byte gSprites _0802E7E0: .4byte gUnknown_2023D44 _0802E7E4: .4byte gUnknown_3004FF4 _0802E7E8: .4byte sub_8012098 @@ -717,7 +717,7 @@ _0802E8C4: _0802E8CE: movs r0, 0x5 bl PlaySE - ldr r2, _0802E900 @ =gUnknown_202063C + ldr r2, _0802E900 @ =gSprites ldr r1, _0802E904 @ =gUnknown_2023D44 ldr r3, _0802E908 @ =gUnknown_3004FF4 ldrb r0, [r3] @@ -740,7 +740,7 @@ _0802E8F0: mov r0, sp b _0802E91A .align 2, 0 -_0802E900: .4byte gUnknown_202063C +_0802E900: .4byte gSprites _0802E904: .4byte gUnknown_2023D44 _0802E908: .4byte gUnknown_3004FF4 _0802E90C: .4byte sub_8012098 @@ -840,7 +840,7 @@ _0802E9C0: cmp r4, 0 beq _0802E8F0 _0802E9C4: - ldr r2, _0802EA04 @ =gUnknown_202063C + ldr r2, _0802EA04 @ =gSprites ldr r1, _0802EA08 @ =gUnknown_2023D44 ldrb r0, [r0] adds r0, r1 @@ -866,7 +866,7 @@ _0802E9F4: .4byte gUnknown_8250C04 _0802E9F8: .4byte gUnknown_2023D70 _0802E9FC: .4byte gUnknown_825E45C _0802EA00: .4byte gUnknown_3004FF4 -_0802EA04: .4byte gUnknown_202063C +_0802EA04: .4byte gSprites _0802EA08: .4byte gUnknown_2023D44 _0802EA0C: .4byte sub_8012044 thumb_func_end sub_802E674 @@ -1094,7 +1094,7 @@ _0802EBDE: ldr r1, _0802EC00 @ =gUnknown_3004FF4 _0802EBE4: strb r0, [r1] - ldr r2, _0802EC04 @ =gUnknown_202063C + ldr r2, _0802EC04 @ =gSprites ldr r1, _0802EC08 @ =gUnknown_2023D44 ldr r0, _0802EC00 @ =gUnknown_3004FF4 ldrb r0, [r0] @@ -1109,7 +1109,7 @@ _0802EBE4: b _0802EDB8 .align 2, 0 _0802EC00: .4byte gUnknown_3004FF4 -_0802EC04: .4byte gUnknown_202063C +_0802EC04: .4byte gSprites _0802EC08: .4byte gUnknown_2023D44 _0802EC0C: .4byte sub_8012044 _0802EC10: @@ -2461,7 +2461,7 @@ _0802F72C: .4byte gUnknown_3004F80 thumb_func_start sub_802F730 sub_802F730: @ 802F730 push {lr} - ldr r2, _0802F758 @ =gUnknown_202063C + ldr r2, _0802F758 @ =gSprites ldr r1, _0802F75C @ =gUnknown_2023D44 ldr r0, _0802F760 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -2473,7 +2473,7 @@ sub_802F730: @ 802F730 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0802F764 @ =nullsub_8 + ldr r0, _0802F764 @ =SpriteCallbackDummy cmp r1, r0 bne _0802F754 bl PlayerBufferExecCompleted @@ -2481,16 +2481,16 @@ _0802F754: pop {r0} bx r0 .align 2, 0 -_0802F758: .4byte gUnknown_202063C +_0802F758: .4byte gSprites _0802F75C: .4byte gUnknown_2023D44 _0802F760: .4byte gUnknown_2023BC4 -_0802F764: .4byte nullsub_8 +_0802F764: .4byte SpriteCallbackDummy thumb_func_end sub_802F730 thumb_func_start sub_802F768 sub_802F768: @ 802F768 push {lr} - ldr r2, _0802F790 @ =gUnknown_202063C + ldr r2, _0802F790 @ =gSprites ldr r1, _0802F794 @ =gUnknown_2023D44 ldr r0, _0802F798 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -2502,7 +2502,7 @@ sub_802F768: @ 802F768 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0802F79C @ =nullsub_8 + ldr r0, _0802F79C @ =SpriteCallbackDummy cmp r1, r0 bne _0802F78C bl PlayerBufferExecCompleted @@ -2510,16 +2510,16 @@ _0802F78C: pop {r0} bx r0 .align 2, 0 -_0802F790: .4byte gUnknown_202063C +_0802F790: .4byte gSprites _0802F794: .4byte gUnknown_2023D44 _0802F798: .4byte gUnknown_2023BC4 -_0802F79C: .4byte nullsub_8 +_0802F79C: .4byte SpriteCallbackDummy thumb_func_end sub_802F768 thumb_func_start sub_802F7A0 sub_802F7A0: @ 802F7A0 push {r4-r6,lr} - ldr r6, _0802F7FC @ =gUnknown_202063C + ldr r6, _0802F7FC @ =gSprites ldr r5, _0802F800 @ =gUnknown_2023D44 ldr r4, _0802F804 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -2532,7 +2532,7 @@ sub_802F7A0: @ 802F7A0 adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _0802F808 @ =nullsub_8 + ldr r0, _0802F808 @ =SpriteCallbackDummy cmp r1, r0 bne _0802F7F4 ldr r0, _0802F80C @ =gSaveBlock2Ptr @@ -2561,10 +2561,10 @@ _0802F7F4: pop {r0} bx r0 .align 2, 0 -_0802F7FC: .4byte gUnknown_202063C +_0802F7FC: .4byte gSprites _0802F800: .4byte gUnknown_2023D44 _0802F804: .4byte gUnknown_2023BC4 -_0802F808: .4byte nullsub_8 +_0802F808: .4byte SpriteCallbackDummy _0802F80C: .4byte gSaveBlock2Ptr thumb_func_end sub_802F7A0 @@ -2625,7 +2625,7 @@ sub_802F858: @ 802F858 cmp r0, 0 beq _0802F8B0 _0802F87C: - ldr r2, _0802F8A0 @ =gUnknown_202063C + ldr r2, _0802F8A0 @ =gSprites ldr r1, _0802F8A4 @ =gUnknown_3004FF0 ldr r0, _0802F8A8 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -2637,18 +2637,18 @@ _0802F87C: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0802F8AC @ =nullsub_8 + ldr r0, _0802F8AC @ =SpriteCallbackDummy cmp r1, r0 bne _0802F8E6 b _0802F8E4 .align 2, 0 _0802F89C: .4byte gUnknown_2022B4C -_0802F8A0: .4byte gUnknown_202063C +_0802F8A0: .4byte gSprites _0802F8A4: .4byte gUnknown_3004FF0 _0802F8A8: .4byte gUnknown_2023BC4 -_0802F8AC: .4byte nullsub_8 +_0802F8AC: .4byte SpriteCallbackDummy _0802F8B0: - ldr r2, _0802F9B0 @ =gUnknown_202063C + ldr r2, _0802F9B0 @ =gSprites ldr r5, _0802F9B4 @ =gUnknown_3004FF0 ldr r0, _0802F9B8 @ =gUnknown_2023BC4 ldrb r3, [r0] @@ -2660,7 +2660,7 @@ _0802F8B0: adds r2, 0x1C adds r0, r2 ldr r4, [r0] - ldr r0, _0802F9BC @ =nullsub_8 + ldr r0, _0802F9BC @ =SpriteCallbackDummy cmp r4, r0 bne _0802F8E6 movs r0, 0x2 @@ -2779,10 +2779,10 @@ _0802F934: bl m4aMPlayContinue b _0802F9DC .align 2, 0 -_0802F9B0: .4byte gUnknown_202063C +_0802F9B0: .4byte gSprites _0802F9B4: .4byte gUnknown_3004FF0 _0802F9B8: .4byte gUnknown_2023BC4 -_0802F9BC: .4byte nullsub_8 +_0802F9BC: .4byte SpriteCallbackDummy _0802F9C0: .4byte gUnknown_2024018 _0802F9C4: .4byte 0x000027f9 _0802F9C8: .4byte gUnknown_2022B4C @@ -2949,7 +2949,7 @@ _0802FAF0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0802FBE4 @ =gUnknown_202063C + ldr r1, _0802FBE4 @ =gSprites adds r0, r1 bl DestroySprite ldr r4, _0802FBE8 @ =gUnknown_3004FF0 @@ -2988,7 +2988,7 @@ _0802FB5C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0802FBE4 @ =gUnknown_202063C + ldr r1, _0802FBE4 @ =gSprites adds r0, r1 bl DestroySprite ldr r5, _0802FBE8 @ =gUnknown_3004FF0 @@ -3039,7 +3039,7 @@ _0802FBD4: .4byte gUnknown_2023BCE _0802FBD8: .4byte gUnknown_2024284 _0802FBDC: .4byte gUnknown_2022B4C _0802FBE0: .4byte gUnknown_3004FFC -_0802FBE4: .4byte gUnknown_202063C +_0802FBE4: .4byte gSprites _0802FBE8: .4byte gUnknown_3004FF0 _0802FBEC: .4byte gUnknown_3004FE0 _0802FBF0: .4byte sub_802F858 @@ -3048,7 +3048,7 @@ _0802FBF0: .4byte sub_802F858 thumb_func_start sub_802FBF4 sub_802FBF4: @ 802FBF4 push {r4-r6,lr} - ldr r2, _0802FC8C @ =gUnknown_202063C + ldr r2, _0802FC8C @ =gSprites ldr r0, _0802FC90 @ =gUnknown_3004FF0 ldr r6, _0802FC94 @ =gUnknown_2023BC4 ldrb r3, [r6] @@ -3060,7 +3060,7 @@ sub_802FBF4: @ 802FBF4 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _0802FC98 @ =nullsub_8 + ldr r0, _0802FC98 @ =SpriteCallbackDummy cmp r1, r0 bne _0802FC84 ldr r5, _0802FC9C @ =gUnknown_2024018 @@ -3122,10 +3122,10 @@ _0802FC84: pop {r0} bx r0 .align 2, 0 -_0802FC8C: .4byte gUnknown_202063C +_0802FC8C: .4byte gSprites _0802FC90: .4byte gUnknown_3004FF0 _0802FC94: .4byte gUnknown_2023BC4 -_0802FC98: .4byte nullsub_8 +_0802FC98: .4byte SpriteCallbackDummy _0802FC9C: .4byte gUnknown_2024018 _0802FCA0: .4byte 0x000027f9 _0802FCA4: .4byte gUnknown_3004FE0 @@ -3209,7 +3209,7 @@ sub_802FD18: @ 802FD18 adds r0, r2, 0 bl sub_80F1720 _0802FD4A: - ldr r4, _0802FDDC @ =gUnknown_202063C + ldr r4, _0802FDDC @ =gSprites ldr r0, _0802FDE0 @ =gUnknown_3004FFC ldrb r2, [r5] adds r0, r2, r0 @@ -3221,7 +3221,7 @@ _0802FD4A: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _0802FDE4 @ =nullsub_8 + ldr r0, _0802FDE4 @ =SpriteCallbackDummy cmp r1, r0 bne _0802FDC4 ldr r0, [r6] @@ -3274,9 +3274,9 @@ _0802FDCC: .4byte gUnknown_2024018 _0802FDD0: .4byte gUnknown_2023BC4 _0802FDD4: .4byte gUnknown_2023BCE _0802FDD8: .4byte gUnknown_2024284 -_0802FDDC: .4byte gUnknown_202063C +_0802FDDC: .4byte gSprites _0802FDE0: .4byte gUnknown_3004FFC -_0802FDE4: .4byte nullsub_8 +_0802FDE4: .4byte SpriteCallbackDummy _0802FDE8: .4byte gUnknown_3004FF0 _0802FDEC: .4byte gUnknown_3004FE0 _0802FDF0: .4byte sub_802FBF4 @@ -4016,7 +4016,7 @@ sub_80303A8: @ 80303A8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08030404 @ =gUnknown_202063C + ldr r1, _08030404 @ =gSprites adds r4, r0, r1 movs r1, 0x1E ldrsh r0, [r5, r1] @@ -4032,7 +4032,7 @@ _080303F0: .align 2, 0 _080303FC: .4byte gUnknown_3005098 _08030400: .4byte gUnknown_2023D44 -_08030404: .4byte gUnknown_202063C +_08030404: .4byte gSprites _08030408: .4byte _0803040C .align 2, 0 _0803040C: @@ -4178,7 +4178,7 @@ _08030534: .4byte sub_802FE94 thumb_func_start sub_8030538 sub_8030538: @ 8030538 push {r4-r6,lr} - ldr r6, _08030590 @ =gUnknown_202063C + ldr r6, _08030590 @ =gSprites ldr r5, _08030594 @ =gUnknown_2023D44 ldr r4, _08030598 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -4218,7 +4218,7 @@ _08030588: pop {r0} bx r0 .align 2, 0 -_08030590: .4byte gUnknown_202063C +_08030590: .4byte gSprites _08030594: .4byte gUnknown_2023D44 _08030598: .4byte gUnknown_2023BC4 _0803059C: .4byte gUnknown_3004FF0 @@ -4247,7 +4247,7 @@ sub_80305A0: @ 80305A0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08030608 @ =gUnknown_202063C + ldr r4, _08030608 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -4272,7 +4272,7 @@ _080305F4: _080305FC: .4byte gUnknown_2024018 _08030600: .4byte gUnknown_2023BC4 _08030604: .4byte gUnknown_2023D44 -_08030608: .4byte gUnknown_202063C +_08030608: .4byte gSprites _0803060C: .4byte gUnknown_3004FF0 thumb_func_end sub_80305A0 @@ -4490,7 +4490,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _080307F8 @ =gUnknown_202063C + ldr r2, _080307F8 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -4515,7 +4515,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4 .align 2, 0 _080307F0: .4byte gUnknown_2023D44 _080307F4: .4byte gUnknown_2023BC4 -_080307F8: .4byte gUnknown_202063C +_080307F8: .4byte gSprites _080307FC: .4byte gUnknown_2024005 _08030800: ldrh r0, [r4, 0x30] @@ -7298,7 +7298,7 @@ PlayerHandleLoadMonSprite: @ 8031F00 ldr r2, _08031F54 @ =gUnknown_2024284 adds r0, r2 bl sub_8034498 - ldr r2, _08031F58 @ =gUnknown_202063C + ldr r2, _08031F58 @ =gSprites ldr r0, _08031F5C @ =gUnknown_2023D44 ldrb r3, [r4] adds r0, r3, r0 @@ -7326,7 +7326,7 @@ PlayerHandleLoadMonSprite: @ 8031F00 _08031F4C: .4byte gUnknown_2023BCE _08031F50: .4byte gUnknown_2023BC4 _08031F54: .4byte gUnknown_2024284 -_08031F58: .4byte gUnknown_202063C +_08031F58: .4byte gSprites _08031F5C: .4byte gUnknown_2023D44 _08031F60: .4byte gUnknown_3004FE0 _08031F64: .4byte CompleteOnBankSpritePosX_0 @@ -7468,7 +7468,7 @@ sub_8031FF4: @ 8031FF4 ldr r4, _08032150 @ =gUnknown_2023D44 adds r4, r6, r4 strb r0, [r4] - ldr r5, _08032154 @ =gUnknown_202063C + ldr r5, _08032154 @ =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -7527,7 +7527,7 @@ sub_8031FF4: @ 8031FF4 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _0803215C @ =nullsub_8 + ldr r1, _0803215C @ =SpriteCallbackDummy str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -7556,9 +7556,9 @@ _08032144: .4byte sub_8033E3C _08032148: .4byte gUnknown_3004FFC _0803214C: .4byte gUnknown_20244DC _08032150: .4byte gUnknown_2023D44 -_08032154: .4byte gUnknown_202063C +_08032154: .4byte gSprites _08032158: .4byte gUnknown_2024024 -_0803215C: .4byte nullsub_8 +_0803215C: .4byte SpriteCallbackDummy thumb_func_end sub_8031FF4 thumb_func_start PlayerHandleReturnPokeToBall @@ -7601,7 +7601,7 @@ _080321A8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080321E8 @ =gUnknown_202063C + ldr r4, _080321E8 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -7624,7 +7624,7 @@ _080321DE: bx r0 .align 2, 0 _080321E4: .4byte gUnknown_2023D44 -_080321E8: .4byte gUnknown_202063C +_080321E8: .4byte gSprites _080321EC: .4byte gUnknown_3004FF0 thumb_func_end PlayerHandleReturnPokeToBall @@ -7837,7 +7837,7 @@ _08032342: ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _08032414 @ =gUnknown_202063C + ldr r4, _08032414 @ =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -7896,7 +7896,7 @@ _08032404: .4byte gUnknown_2023BC4 _08032408: .4byte gUnknown_20244DC _0803240C: .4byte gUnknown_8239F8C _08032410: .4byte gUnknown_2023D44 -_08032414: .4byte gUnknown_202063C +_08032414: .4byte gSprites _08032418: .4byte 0x0000fffe _0803241C: .4byte sub_8033EEC _08032420: .4byte gUnknown_3004FE0 @@ -8007,7 +8007,7 @@ _080324BE: ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _0803257C @ =gUnknown_202063C + ldr r4, _0803257C @ =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -8064,7 +8064,7 @@ _0803256C: .4byte gUnknown_2023BC4 _08032570: .4byte gUnknown_20244DC _08032574: .4byte gUnknown_8239F8C _08032578: .4byte gUnknown_2023D44 -_0803257C: .4byte gUnknown_202063C +_0803257C: .4byte gSprites _08032580: .4byte 0x0000ffa0 _08032584: .4byte sub_8033EEC _08032588: .4byte gUnknown_3004FE0 @@ -8082,7 +8082,7 @@ PlayerHandleTrainerSlideBack: @ 8032590 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08032638 @ =gUnknown_202063C + ldr r4, _08032638 @ =gSprites adds r0, r4 bl oamt_add_pos2_onto_pos1 ldrb r0, [r6] @@ -8130,7 +8130,7 @@ PlayerHandleTrainerSlideBack: @ 8032590 adds r0, r1 lsls r0, 2 adds r0, r4 - ldr r1, _08032644 @ =nullsub_8 + ldr r1, _08032644 @ =SpriteCallbackDummy bl StoreSpriteCallbackInData6 ldrb r0, [r6] adds r0, r5 @@ -8153,10 +8153,10 @@ PlayerHandleTrainerSlideBack: @ 8032590 .align 2, 0 _08032630: .4byte gUnknown_2023D44 _08032634: .4byte gUnknown_2023BC4 -_08032638: .4byte gUnknown_202063C +_08032638: .4byte gSprites _0803263C: .4byte 0x0000ffd8 _08032640: .4byte sub_8075590 -_08032644: .4byte nullsub_8 +_08032644: .4byte SpriteCallbackDummy _08032648: .4byte gUnknown_3004FE0 _0803264C: .4byte sub_802F7A0 thumb_func_end PlayerHandleTrainerSlideBack @@ -8226,7 +8226,7 @@ _080326A4: negs r1, r1 movs r0, 0x10 bl PlaySE12WithPanning - ldr r2, _08032728 @ =gUnknown_202063C + ldr r2, _08032728 @ =gSprites ldr r3, _0803272C @ =gUnknown_2023D44 ldrb r0, [r5] adds r0, r3 @@ -8268,7 +8268,7 @@ _0803271A: .align 2, 0 _08032720: .4byte gUnknown_2023BCE _08032724: .4byte gUnknown_2024284 -_08032728: .4byte gUnknown_202063C +_08032728: .4byte gSprites _0803272C: .4byte gUnknown_2023D44 _08032730: .4byte sub_8012110 _08032734: .4byte gUnknown_3004FE0 @@ -9753,7 +9753,7 @@ _08033310: .4byte gUnknown_2022870 thumb_func_start PlayerHandleHitAnimation PlayerHandleHitAnimation: @ 8033314 push {r4,lr} - ldr r3, _0803333C @ =gUnknown_202063C + ldr r3, _0803333C @ =gSprites ldr r2, _08033340 @ =gUnknown_2023D44 ldr r4, _08033344 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -9771,7 +9771,7 @@ PlayerHandleHitAnimation: @ 8033314 bl PlayerBufferExecCompleted b _08033372 .align 2, 0 -_0803333C: .4byte gUnknown_202063C +_0803333C: .4byte gSprites _08033340: .4byte gUnknown_2023D44 _08033344: .4byte gUnknown_2023BC4 _08033348: @@ -9938,7 +9938,7 @@ PlayerHandleIntroTrainerBallThrow: @ 8033478 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _080335C0 @ =gUnknown_202063C + ldr r5, _080335C0 @ =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r7] @@ -10087,7 +10087,7 @@ _0803359A: .align 2, 0 _080335B8: .4byte gUnknown_2023D44 _080335BC: .4byte gUnknown_2023BC4 -_080335C0: .4byte gUnknown_202063C +_080335C0: .4byte gSprites _080335C4: .4byte 0x0000ffd8 _080335C8: .4byte sub_80755B8 _080335CC: .4byte sub_80335F8 @@ -10135,7 +10135,7 @@ sub_80335F8: @ 80335F8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0803365C @ =gUnknown_202063C + ldr r1, _0803365C @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAnim @@ -10146,7 +10146,7 @@ sub_80335F8: @ 80335F8 _08033650: .4byte gUnknown_2023BCE _08033654: .4byte gUnknown_2024284 _08033658: .4byte gUnknown_2023D44 -_0803365C: .4byte gUnknown_202063C +_0803365C: .4byte gSprites thumb_func_end sub_80335F8 thumb_func_start task05_08033660 @@ -10475,7 +10475,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC lsls r0, 24 cmp r0, 0 beq _08033932 - ldr r3, _08033940 @ =gUnknown_202063C + ldr r3, _08033940 @ =gSprites ldr r0, _08033944 @ =gUnknown_2023D44 ldrb r1, [r4] adds r0, r1, r0 @@ -10508,7 +10508,7 @@ _08033932: bx r0 .align 2, 0 _0803393C: .4byte gUnknown_2023BC4 -_08033940: .4byte gUnknown_202063C +_08033940: .4byte gSprites _08033944: .4byte gUnknown_2023D44 _08033948: .4byte gUnknown_2022BC4 thumb_func_end PlayerHandleSpriteInvisibility diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s index 7326f6728..ede49cd61 100644 --- a/asm/battle_controller_pokedude.s +++ b/asm/battle_controller_pokedude.s @@ -97,7 +97,7 @@ sub_8156140: @ 8156140 thumb_func_start sub_815614C sub_815614C: @ 815614C push {lr} - ldr r2, _08156174 @ =gUnknown_202063C + ldr r2, _08156174 @ =gSprites ldr r1, _08156178 @ =gUnknown_2023D44 ldr r0, _0815617C @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -109,7 +109,7 @@ sub_815614C: @ 815614C adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08156180 @ =nullsub_8 + ldr r0, _08156180 @ =SpriteCallbackDummy cmp r1, r0 bne _08156170 bl PlayerPartnerBufferExecCompleted @@ -117,16 +117,16 @@ _08156170: pop {r0} bx r0 .align 2, 0 -_08156174: .4byte gUnknown_202063C +_08156174: .4byte gSprites _08156178: .4byte gUnknown_2023D44 _0815617C: .4byte gUnknown_2023BC4 -_08156180: .4byte nullsub_8 +_08156180: .4byte SpriteCallbackDummy thumb_func_end sub_815614C thumb_func_start sub_8156184 sub_8156184: @ 8156184 push {r4-r7,lr} - ldr r2, _081561E0 @ =gUnknown_202063C + ldr r2, _081561E0 @ =gSprites ldr r0, _081561E4 @ =gUnknown_2023D44 ldr r7, _081561E8 @ =gUnknown_2023BC4 ldrb r3, [r7] @@ -170,7 +170,7 @@ sub_8156184: @ 8156184 bl sub_80F1720 b _08156230 .align 2, 0 -_081561E0: .4byte gUnknown_202063C +_081561E0: .4byte gSprites _081561E4: .4byte gUnknown_2023D44 _081561E8: .4byte gUnknown_2023BC4 _081561EC: .4byte gUnknown_2024018 @@ -302,7 +302,7 @@ _081562EC: .4byte gUnknown_2024284 thumb_func_start sub_81562F0 sub_81562F0: @ 81562F0 push {r4-r6,lr} - ldr r2, _08156388 @ =gUnknown_202063C + ldr r2, _08156388 @ =gSprites ldr r0, _0815638C @ =gUnknown_3004FF0 ldr r6, _08156390 @ =gUnknown_2023BC4 ldrb r3, [r6] @@ -314,7 +314,7 @@ sub_81562F0: @ 81562F0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08156394 @ =nullsub_8 + ldr r0, _08156394 @ =SpriteCallbackDummy cmp r1, r0 bne _08156380 ldr r5, _08156398 @ =gUnknown_2024018 @@ -376,10 +376,10 @@ _08156380: pop {r0} bx r0 .align 2, 0 -_08156388: .4byte gUnknown_202063C +_08156388: .4byte gSprites _0815638C: .4byte gUnknown_3004FF0 _08156390: .4byte gUnknown_2023BC4 -_08156394: .4byte nullsub_8 +_08156394: .4byte SpriteCallbackDummy _08156398: .4byte gUnknown_2024018 _0815639C: .4byte 0x000027f9 _081563A0: .4byte gUnknown_3004FE0 @@ -413,7 +413,7 @@ sub_81563A8: @ 81563A8 adds r0, r2, 0 bl sub_80F1720 _081563DA: - ldr r4, _0815646C @ =gUnknown_202063C + ldr r4, _0815646C @ =gSprites ldr r0, _08156470 @ =gUnknown_3004FFC ldrb r2, [r5] adds r0, r2, r0 @@ -425,7 +425,7 @@ _081563DA: adds r0, 0x1C adds r0, r3, r0 ldr r1, [r0] - ldr r0, _08156474 @ =nullsub_8 + ldr r0, _08156474 @ =SpriteCallbackDummy cmp r1, r0 bne _08156454 ldr r0, [r6] @@ -478,9 +478,9 @@ _0815645C: .4byte gUnknown_2024018 _08156460: .4byte gUnknown_2023BC4 _08156464: .4byte gUnknown_2023BCE _08156468: .4byte gUnknown_2024284 -_0815646C: .4byte gUnknown_202063C +_0815646C: .4byte gSprites _08156470: .4byte gUnknown_3004FFC -_08156474: .4byte nullsub_8 +_08156474: .4byte SpriteCallbackDummy _08156478: .4byte gUnknown_3004FF0 _0815647C: .4byte gUnknown_3004FE0 _08156480: .4byte sub_81562F0 @@ -790,7 +790,7 @@ _0815668A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081567A0 @ =gUnknown_202063C + ldr r1, _081567A0 @ =gSprites adds r0, r1 bl DestroySprite ldr r4, _081567A4 @ =gUnknown_3004FF0 @@ -826,7 +826,7 @@ _0815671E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081567A0 @ =gUnknown_202063C + ldr r1, _081567A0 @ =gSprites adds r0, r1 bl DestroySprite ldr r5, _081567A4 @ =gUnknown_3004FF0 @@ -874,7 +874,7 @@ _08156790: .4byte gUnknown_2023BCE _08156794: .4byte gUnknown_2024284 _08156798: .4byte gUnknown_2022B4C _0815679C: .4byte gUnknown_3004FFC -_081567A0: .4byte gUnknown_202063C +_081567A0: .4byte gSprites _081567A4: .4byte gUnknown_3004FF0 _081567A8: .4byte gUnknown_3004FE0 _081567AC: .4byte sub_81567B0 @@ -886,7 +886,7 @@ sub_81567B0: @ 81567B0 mov r7, r8 push {r7} movs r4, 0 - ldr r2, _081568B0 @ =gUnknown_202063C + ldr r2, _081568B0 @ =gSprites ldr r0, _081568B4 @ =gUnknown_3004FF0 ldr r1, _081568B8 @ =gUnknown_2023BC4 mov r8, r1 @@ -899,7 +899,7 @@ sub_81567B0: @ 81567B0 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _081568BC @ =nullsub_8 + ldr r0, _081568BC @ =SpriteCallbackDummy cmp r1, r0 bne _081567DA movs r4, 0x1 @@ -1009,10 +1009,10 @@ _081568A6: pop {r0} bx r0 .align 2, 0 -_081568B0: .4byte gUnknown_202063C +_081568B0: .4byte gSprites _081568B4: .4byte gUnknown_3004FF0 _081568B8: .4byte gUnknown_2023BC4 -_081568BC: .4byte nullsub_8 +_081568BC: .4byte SpriteCallbackDummy _081568C0: .4byte gUnknown_2024018 _081568C4: .4byte 0x000027f9 _081568C8: .4byte c3_0802FDF4 @@ -1634,7 +1634,7 @@ sub_8156DCC: @ 8156DCC lsls r0, 24 cmp r0, 0 bne _08156E3C - ldr r6, _08156E30 @ =gUnknown_202063C + ldr r6, _08156E30 @ =gSprites ldr r5, _08156E34 @ =gUnknown_2023D44 ldrb r0, [r4] adds r0, r5 @@ -1671,11 +1671,11 @@ sub_8156DCC: @ 8156DCC b _08156E66 .align 2, 0 _08156E2C: .4byte gUnknown_2023BC4 -_08156E30: .4byte gUnknown_202063C +_08156E30: .4byte gSprites _08156E34: .4byte gUnknown_2023D44 _08156E38: .4byte gUnknown_3004FF0 _08156E3C: - ldr r2, _08156E6C @ =gUnknown_202063C + ldr r2, _08156E6C @ =gSprites ldr r0, _08156E70 @ =gUnknown_2023D44 ldrb r3, [r4] adds r0, r3, r0 @@ -1699,7 +1699,7 @@ _08156E66: pop {r0} bx r0 .align 2, 0 -_08156E6C: .4byte gUnknown_202063C +_08156E6C: .4byte gSprites _08156E70: .4byte gUnknown_2023D44 _08156E74: .4byte gUnknown_3004FF0 thumb_func_end sub_8156DCC @@ -1780,7 +1780,7 @@ sub_8156F00: @ 8156F00 ldrb r0, [r0] adds r0, r1 ldrb r1, [r0] - ldr r2, _08156F44 @ =gUnknown_202063C + ldr r2, _08156F44 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -1805,7 +1805,7 @@ sub_8156F00: @ 8156F00 .align 2, 0 _08156F3C: .4byte gUnknown_2023D44 _08156F40: .4byte gUnknown_2023BC4 -_08156F44: .4byte gUnknown_202063C +_08156F44: .4byte gSprites _08156F48: .4byte gUnknown_2024005 _08156F4C: ldrh r0, [r4, 0x30] @@ -1859,7 +1859,7 @@ sub_8156F7C: @ 8156F7C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08156FE4 @ =gUnknown_202063C + ldr r4, _08156FE4 @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -1884,14 +1884,14 @@ _08156FD0: _08156FD8: .4byte gUnknown_2024018 _08156FDC: .4byte gUnknown_2023BC4 _08156FE0: .4byte gUnknown_2023D44 -_08156FE4: .4byte gUnknown_202063C +_08156FE4: .4byte gSprites _08156FE8: .4byte gUnknown_3004FF0 thumb_func_end sub_8156F7C thumb_func_start sub_8156FEC sub_8156FEC: @ 8156FEC push {lr} - ldr r2, _08157014 @ =gUnknown_202063C + ldr r2, _08157014 @ =gSprites ldr r1, _08157018 @ =gUnknown_2023D44 ldr r0, _0815701C @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -1903,7 +1903,7 @@ sub_8156FEC: @ 8156FEC adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08157020 @ =nullsub_8 + ldr r0, _08157020 @ =SpriteCallbackDummy cmp r1, r0 bne _08157010 bl PlayerPartnerBufferExecCompleted @@ -1911,10 +1911,10 @@ _08157010: pop {r0} bx r0 .align 2, 0 -_08157014: .4byte gUnknown_202063C +_08157014: .4byte gSprites _08157018: .4byte gUnknown_2023D44 _0815701C: .4byte gUnknown_2023BC4 -_08157020: .4byte nullsub_8 +_08157020: .4byte SpriteCallbackDummy thumb_func_end sub_8156FEC thumb_func_start sub_8157024 @@ -3954,7 +3954,7 @@ sub_81580E0: @ 81580E0 ldrb r1, [r6] adds r1, r4 strb r0, [r1] - ldr r5, _08158228 @ =gUnknown_202063C + ldr r5, _08158228 @ =gSprites ldrb r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -4039,7 +4039,7 @@ _08158218: .4byte gUnknown_2023BCE _0815821C: .4byte gUnknown_202402C _08158220: .4byte gUnknown_20244DC _08158224: .4byte gUnknown_2023D44 -_08158228: .4byte gUnknown_202063C +_08158228: .4byte gSprites _0815822C: .4byte 0x0000ff10 _08158230: .4byte gUnknown_2024024 _08158234: .4byte gUnknown_3004FE0 @@ -4141,7 +4141,7 @@ _081582FC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0815833C @ =gUnknown_202063C + ldr r4, _0815833C @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix ldrb r0, [r6] @@ -4164,7 +4164,7 @@ _08158332: bx r0 .align 2, 0 _08158338: .4byte gUnknown_2023D44 -_0815833C: .4byte gUnknown_202063C +_0815833C: .4byte gSprites _08158340: .4byte gUnknown_3004FF0 thumb_func_end sub_81582C0 @@ -4206,7 +4206,7 @@ sub_8158344: @ 8158344 ldrb r1, [r7] adds r1, r5 strb r0, [r1] - ldr r4, _081583E8 @ =gUnknown_202063C + ldr r4, _081583E8 @ =gSprites ldrb r0, [r7] adds r0, r5 ldrb r1, [r0] @@ -4244,7 +4244,7 @@ _081583D8: .4byte gUnknown_2023BC4 _081583DC: .4byte gUnknown_20244DC _081583E0: .4byte gUnknown_8239F8C _081583E4: .4byte gUnknown_2023D44 -_081583E8: .4byte gUnknown_202063C +_081583E8: .4byte gSprites _081583EC: .4byte 0x0000fffe _081583F0: ldrb r1, [r7] @@ -4285,7 +4285,7 @@ _081583F0: ldrb r1, [r7] adds r1, r5 strb r0, [r1] - ldr r4, _0815851C @ =gUnknown_202063C + ldr r4, _0815851C @ =gSprites ldrb r0, [r7] adds r0, r5 ldrb r1, [r0] @@ -4388,7 +4388,7 @@ _081584E2: _08158510: .4byte gUnknown_20244DC _08158514: .4byte gUnknown_823932C _08158518: .4byte gUnknown_2023D44 -_0815851C: .4byte gUnknown_202063C +_0815851C: .4byte gSprites _08158520: .4byte 0x0000ff10 _08158524: .4byte gUnknown_8239A1C _08158528: .4byte gUnknown_823957C @@ -4431,7 +4431,7 @@ sub_8158544: @ 8158544 ldrb r1, [r4] adds r1, r6 strb r0, [r1] - ldr r5, _081585FC @ =gUnknown_202063C + ldr r5, _081585FC @ =gSprites ldrb r3, [r4] adds r0, r3, r6 ldrb r0, [r0] @@ -4487,7 +4487,7 @@ _081585EC: .4byte gUnknown_2023BC4 _081585F0: .4byte gUnknown_20244DC _081585F4: .4byte gUnknown_8239F8C _081585F8: .4byte gUnknown_2023D44 -_081585FC: .4byte gUnknown_202063C +_081585FC: .4byte gSprites _08158600: .4byte 0x0000ffa0 _08158604: .4byte sub_8033EEC _08158608: .4byte gUnknown_3004FE0 @@ -4573,7 +4573,7 @@ _08158670: negs r1, r1 movs r0, 0x10 bl PlaySE12WithPanning - ldr r2, _081586F0 @ =gUnknown_202063C + ldr r2, _081586F0 @ =gSprites ldr r3, _081586F4 @ =gUnknown_2023D44 ldrb r0, [r5] adds r0, r3 @@ -4605,14 +4605,14 @@ _08158670: .align 2, 0 _081586E8: .4byte gUnknown_2023BCE _081586EC: .4byte gUnknown_2024284 -_081586F0: .4byte gUnknown_202063C +_081586F0: .4byte gSprites _081586F4: .4byte gUnknown_2023D44 _081586F8: .4byte sub_8012110 _081586FC: movs r0, 0x10 movs r1, 0x3F bl PlaySE12WithPanning - ldr r2, _08158730 @ =gUnknown_202063C + ldr r2, _08158730 @ =gSprites ldr r1, _08158734 @ =gUnknown_2023D44 ldrb r0, [r5] adds r0, r1 @@ -4637,7 +4637,7 @@ _0815872A: pop {r0} bx r0 .align 2, 0 -_08158730: .4byte gUnknown_202063C +_08158730: .4byte gSprites _08158734: .4byte gUnknown_2023D44 _08158738: .4byte sub_8011EA0 _0815873C: .4byte gUnknown_3004FE0 @@ -5935,7 +5935,7 @@ sub_8159184: @ 8159184 thumb_func_start sub_8159190 sub_8159190: @ 8159190 push {r4,lr} - ldr r3, _081591B8 @ =gUnknown_202063C + ldr r3, _081591B8 @ =gSprites ldr r2, _081591BC @ =gUnknown_2023D44 ldr r4, _081591C0 @ =gUnknown_2023BC4 ldrb r0, [r4] @@ -5953,7 +5953,7 @@ sub_8159190: @ 8159190 bl PlayerPartnerBufferExecCompleted b _081591EE .align 2, 0 -_081591B8: .4byte gUnknown_202063C +_081591B8: .4byte gSprites _081591BC: .4byte gUnknown_2023D44 _081591C0: .4byte gUnknown_2023BC4 _081591C4: @@ -6127,7 +6127,7 @@ sub_8159304: @ 8159304 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08159444 @ =gUnknown_202063C + ldr r5, _08159444 @ =gSprites adds r0, r5 bl oamt_add_pos2_onto_pos1 ldrb r0, [r7] @@ -6271,7 +6271,7 @@ _0815941C: .align 2, 0 _0815943C: .4byte gUnknown_2023D44 _08159440: .4byte gUnknown_2023BC4 -_08159444: .4byte gUnknown_202063C +_08159444: .4byte gSprites _08159448: .4byte 0x0000ffd8 _0815944C: .4byte sub_8075590 _08159450: .4byte sub_80335F8 @@ -6362,7 +6362,7 @@ sub_8159478: @ 8159478 ldr r4, _081595DC @ =gUnknown_2023D44 adds r4, r6, r4 strb r0, [r4] - ldr r5, _081595E0 @ =gUnknown_202063C + ldr r5, _081595E0 @ =gSprites mov r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -6421,7 +6421,7 @@ sub_8159478: @ 8159478 adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _081595E8 @ =nullsub_8 + ldr r1, _081595E8 @ =SpriteCallbackDummy str r1, [r0] movs r0, 0 movs r1, 0xFF @@ -6451,9 +6451,9 @@ _081595D0: .4byte sub_8033E3C _081595D4: .4byte gUnknown_3004FFC _081595D8: .4byte gUnknown_20244DC _081595DC: .4byte gUnknown_2023D44 -_081595E0: .4byte gUnknown_202063C +_081595E0: .4byte gSprites _081595E4: .4byte gUnknown_2024024 -_081595E8: .4byte nullsub_8 +_081595E8: .4byte SpriteCallbackDummy thumb_func_end sub_8159478 thumb_func_start sub_81595EC diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 65551bec5..217dd6f4a 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -258,7 +258,7 @@ _080DD724: .4byte gUnknown_2023BC4 thumb_func_start sub_80DD728 sub_80DD728: @ 80DD728 push {lr} - ldr r2, _080DD750 @ =gUnknown_202063C + ldr r2, _080DD750 @ =gSprites ldr r1, _080DD754 @ =gUnknown_2023D44 ldr r0, _080DD758 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -270,7 +270,7 @@ sub_80DD728: @ 80DD728 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080DD75C @ =nullsub_8 + ldr r0, _080DD75C @ =SpriteCallbackDummy cmp r1, r0 bne _080DD74C bl SafariBufferExecCompleted @@ -278,10 +278,10 @@ _080DD74C: pop {r0} bx r0 .align 2, 0 -_080DD750: .4byte gUnknown_202063C +_080DD750: .4byte gSprites _080DD754: .4byte gUnknown_2023D44 _080DD758: .4byte gUnknown_2023BC4 -_080DD75C: .4byte nullsub_8 +_080DD75C: .4byte SpriteCallbackDummy thumb_func_end sub_80DD728 thumb_func_start CompleteOnInactiveTextPrinter_3 @@ -301,7 +301,7 @@ _080DD772: thumb_func_start sub_80DD778 sub_80DD778: @ 80DD778 push {lr} - ldr r2, _080DD7A0 @ =gUnknown_202063C + ldr r2, _080DD7A0 @ =gSprites ldr r1, _080DD7A4 @ =gUnknown_3004FF0 ldr r0, _080DD7A8 @ =gUnknown_2023BC4 ldrb r0, [r0] @@ -313,7 +313,7 @@ sub_80DD778: @ 80DD778 adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080DD7AC @ =nullsub_8 + ldr r0, _080DD7AC @ =SpriteCallbackDummy cmp r1, r0 bne _080DD79C bl SafariBufferExecCompleted @@ -321,10 +321,10 @@ _080DD79C: pop {r0} bx r0 .align 2, 0 -_080DD7A0: .4byte gUnknown_202063C +_080DD7A0: .4byte gSprites _080DD7A4: .4byte gUnknown_3004FF0 _080DD7A8: .4byte gUnknown_2023BC4 -_080DD7AC: .4byte nullsub_8 +_080DD7AC: .4byte SpriteCallbackDummy thumb_func_end sub_80DD778 thumb_func_start sub_80DD7B0 @@ -650,7 +650,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4 ldrb r1, [r5] adds r1, r6 strb r0, [r1] - ldr r4, _080DDA90 @ =gUnknown_202063C + ldr r4, _080DDA90 @ =gSprites ldrb r3, [r5] adds r0, r3, r6 ldrb r0, [r0] @@ -707,7 +707,7 @@ _080DDA80: .4byte gUnknown_2023BC4 _080DDA84: .4byte gUnknown_20244DC _080DDA88: .4byte gUnknown_8239F8C _080DDA8C: .4byte gUnknown_2023D44 -_080DDA90: .4byte gUnknown_202063C +_080DDA90: .4byte gSprites _080DDA94: .4byte 0x0000fffe _080DDA98: .4byte sub_8033EEC _080DDA9C: .4byte gUnknown_3004FE0 diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s index cb79b3878..877f1ee42 100644 --- a/asm/battle_dome_cards.s +++ b/asm/battle_dome_cards.s @@ -428,7 +428,7 @@ _0810BE86: bl uns_builder_assign_animtable1 mov r1, r8 str r1, [r5, 0xC] - ldr r0, _0810BF34 @ =gUnknown_8231CFC + ldr r0, _0810BF34 @ =gDummySpriteAffineAnimTable str r0, [r5, 0x10] ldr r0, _0810BF38 @ =nullsub_91 str r0, [r5, 0x14] @@ -454,7 +454,7 @@ _0810BE86: ldr r0, _0810BF30 @ =0x0000ffff cmp r10, r0 bne _0810BEF6 - ldr r0, _0810BF3C @ =gUnknown_202063C + ldr r0, _0810BF3C @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -496,9 +496,9 @@ _0810BF16: _0810BF28: .4byte gUnknown_203AD40 _0810BF2C: .4byte gUnknown_8453184 _0810BF30: .4byte 0x0000ffff -_0810BF34: .4byte gUnknown_8231CFC +_0810BF34: .4byte gDummySpriteAffineAnimTable _0810BF38: .4byte nullsub_91 -_0810BF3C: .4byte gUnknown_202063C +_0810BF3C: .4byte gSprites _0810BF40: .4byte gUnknown_203AD58 thumb_func_end oamt_spawn_poke_or_trainer_picture @@ -603,7 +603,7 @@ _0810BFE4: lsls r6, r4, 4 cmp r1, r0 beq _0810C018 - ldr r1, _0810C048 @ =gUnknown_202063C + ldr r1, _0810C048 @ =gSprites adds r0, r6, r4 lsls r0, 2 adds r0, r1 @@ -616,7 +616,7 @@ _0810BFE4: _0810C018: adds r0, r6, r4 lsls r0, 2 - ldr r1, _0810C048 @ =gUnknown_202063C + ldr r1, _0810C048 @ =gSprites adds r0, r1 bl DestroySprite mov r0, r8 @@ -636,7 +636,7 @@ _0810C03A: bx r1 .align 2, 0 _0810C044: .4byte 0x0000ffff -_0810C048: .4byte gUnknown_202063C +_0810C048: .4byte gSprites _0810C04C: .4byte gUnknown_8453178 thumb_func_end sub_810BFA4 diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index 36320e346..c73292976 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -76,7 +76,7 @@ sub_8033E3C: @ 8033E3C ldrh r0, [r6, 0x30] lsls r0, 24 lsrs r0, 24 - ldr r7, _08033E80 @ =gUnknown_202063C + ldr r7, _08033E80 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r5, r1, 2 @@ -105,7 +105,7 @@ sub_8033E3C: @ 8033E3C strb r0, [r1] b _08033EA0 .align 2, 0 -_08033E80: .4byte gUnknown_202063C +_08033E80: .4byte gSprites _08033E84: lsls r0, r4, 27 cmp r0, 0 @@ -118,7 +118,7 @@ _08033E84: adds r0, r3, 0 movs r1, 0 bl StartSpriteAffineAnim - ldr r0, _08033EAC @ =nullsub_8 + ldr r0, _08033EAC @ =SpriteCallbackDummy str r0, [r6, 0x1C] _08033EA0: pop {r4-r7} @@ -126,7 +126,7 @@ _08033EA0: bx r0 .align 2, 0 _08033EA8: .4byte sub_8012100 -_08033EAC: .4byte nullsub_8 +_08033EAC: .4byte SpriteCallbackDummy thumb_func_end sub_8033E3C thumb_func_start sub_8033EB0 @@ -140,7 +140,7 @@ sub_8033EB0: @ 8033EB0 movs r2, 0x40 orrs r0, r2 strb r0, [r3] - ldr r0, _08033ED4 @ =nullsub_8 + ldr r0, _08033ED4 @ =SpriteCallbackDummy str r0, [r4, 0x1C] cmp r1, 0 bne _08033ED8 @@ -149,7 +149,7 @@ sub_8033EB0: @ 8033EB0 bl StartSpriteAffineAnim b _08033EE0 .align 2, 0 -_08033ED4: .4byte nullsub_8 +_08033ED4: .4byte SpriteCallbackDummy _08033ED8: adds r0, r4, 0 movs r1, 0x1 @@ -179,14 +179,14 @@ sub_8033EEC: @ 8033EEC lsls r0, 16 cmp r0, 0 bne _08033F0E - ldr r0, _08033F18 @ =nullsub_8 + ldr r0, _08033F18 @ =SpriteCallbackDummy str r0, [r2, 0x1C] _08033F0E: pop {r0} bx r0 .align 2, 0 _08033F14: .4byte gUnknown_2023F4C -_08033F18: .4byte nullsub_8 +_08033F18: .4byte SpriteCallbackDummy thumb_func_end sub_8033EEC thumb_func_start InitAndLaunchChosenStatusAnimation @@ -393,7 +393,7 @@ _08034094: beq _080340E0 cmp r5, 0x2 bne _080340E0 - ldr r1, _080340D8 @ =gUnknown_202063C + ldr r1, _080340D8 @ =gSprites ldr r0, _080340DC @ =gUnknown_2023D44 adds r0, r6, r0 ldrb r2, [r0] @@ -414,7 +414,7 @@ _08034094: movs r0, 0x1 b _08034132 .align 2, 0 -_080340D8: .4byte gUnknown_202063C +_080340D8: .4byte gSprites _080340DC: .4byte gUnknown_2023D44 _080340E0: ldr r0, _08034144 @ =gUnknown_2037F1A @@ -1710,7 +1710,7 @@ CopyAllBattleSpritesInvisibilities: @ 8034B40 ldrb r0, [r5] cmp r4, r0 bge _08034B96 - ldr r0, _08034BA8 @ =gUnknown_202063C + ldr r0, _08034BA8 @ =gSprites mov r9, r0 movs r0, 0x1 mov r12, r0 @@ -1754,7 +1754,7 @@ _08034B96: bx r0 .align 2, 0 _08034BA4: .4byte gUnknown_2023BCC -_08034BA8: .4byte gUnknown_202063C +_08034BA8: .4byte gSprites _08034BAC: .4byte gUnknown_2024018 _08034BB0: .4byte gUnknown_2023D44 thumb_func_end CopyAllBattleSpritesInvisibilities @@ -1768,7 +1768,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4 ldr r1, [r1] lsls r3, r0, 2 adds r3, r1 - ldr r2, _08034BEC @ =gUnknown_202063C + ldr r2, _08034BEC @ =gSprites ldr r1, _08034BF0 @ =gUnknown_2023D44 adds r0, r1 ldrb r1, [r0] @@ -1789,7 +1789,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4 bx lr .align 2, 0 _08034BE8: .4byte gUnknown_2024018 -_08034BEC: .4byte gUnknown_202063C +_08034BEC: .4byte gSprites _08034BF0: .4byte gUnknown_2023D44 thumb_func_end CopyBattleSpriteInvisibility @@ -1868,7 +1868,7 @@ _08034C16: adds r0, 0x4 adds r0, r5 ldr r2, [r0] - ldr r5, _08034D68 @ =gUnknown_202063C + ldr r5, _08034D68 @ =gSprites ldr r4, _08034D6C @ =gUnknown_2023D44 add r4, r9 ldrb r1, [r4] @@ -1963,7 +1963,7 @@ _08034D58: .4byte gUnknown_2023BCE _08034D5C: .4byte gUnknown_202402C _08034D60: .4byte gUnknown_82350AC _08034D64: .4byte gUnknown_202401C -_08034D68: .4byte gUnknown_202063C +_08034D68: .4byte gSprites _08034D6C: .4byte gUnknown_2023D44 _08034D70: .4byte 0x06010000 _08034D74: .4byte 0x040000d4 @@ -1981,7 +1981,7 @@ _08034D88: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _08034E2C @ =gUnknown_202063C + ldr r6, _08034E2C @ =gSprites adds r0, r6 ldr r4, _08034E30 @ =gUnknown_2024018 ldr r1, [r4] @@ -2049,7 +2049,7 @@ _08034E0E: b _08035062 .align 2, 0 _08034E28: .4byte gUnknown_2023D44 -_08034E2C: .4byte gUnknown_202063C +_08034E2C: .4byte gSprites _08034E30: .4byte gUnknown_2024018 _08034E34: .4byte gUnknown_2023FE8 _08034E38: .4byte gUnknown_2024024 @@ -2196,7 +2196,7 @@ _08034F5E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0803508C @ =gUnknown_202063C + ldr r1, _0803508C @ =gSprites adds r0, r1 ldrh r0, [r0, 0x4] lsls r0, 22 @@ -2290,7 +2290,7 @@ _08034FFC: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _0803508C @ =gUnknown_202063C + ldr r2, _0803508C @ =gSprites adds r1, r2 lsls r0, 24 lsrs r0, 24 @@ -2319,7 +2319,7 @@ _0803507C: .4byte gUnknown_82350AC _08035080: .4byte gUnknown_202401C _08035084: .4byte gUnknown_2024008 _08035088: .4byte gUnknown_2023D44 -_0803508C: .4byte gUnknown_202063C +_0803508C: .4byte gSprites _08035090: .4byte 0x06010000 _08035094: .4byte 0x040000d4 _08035098: .4byte 0x84000200 @@ -2463,7 +2463,7 @@ LoadBattleMonGfxAndAnimate: @ 80351A8 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _080351E4 @ =gUnknown_202063C + ldr r1, _080351E4 @ =gSprites adds r4, r0, r1 ldr r0, _080351E8 @ =gUnknown_2024024 adds r0, r6, r0 @@ -2476,7 +2476,7 @@ LoadBattleMonGfxAndAnimate: @ 80351A8 bl GetSubstituteSpriteDefault_Y b _080351F2 .align 2, 0 -_080351E4: .4byte gUnknown_202063C +_080351E4: .4byte gSprites _080351E8: .4byte gUnknown_2024024 _080351EC: adds r0, r6, 0 @@ -2819,7 +2819,7 @@ _0803547C: lsls r0, 24 cmp r0, 0 beq _08035514 - ldr r4, _080354E4 @ =gUnknown_202063C + ldr r4, _080354E4 @ =gSprites ldr r0, _080354E8 @ =gUnknown_2023D44 adds r3, r5, r0 ldrb r1, [r3] @@ -2863,7 +2863,7 @@ _0803547C: b _08035514 .align 2, 0 _080354E0: .4byte gUnknown_2023BCC -_080354E4: .4byte gUnknown_202063C +_080354E4: .4byte gSprites _080354E8: .4byte gUnknown_2023D44 _080354EC: .4byte gUnknown_2024018 _080354F0: @@ -2947,7 +2947,7 @@ LoadAndCreateEnemyShadowSprites: @ 8035538 lsls r1, 2 adds r2, r1, r2 strb r0, [r2, 0x7] - ldr r7, _08035620 @ =gUnknown_202063C + ldr r7, _08035620 @ =gSprites ldr r0, [r6] ldr r0, [r0, 0x4] adds r1, r0 @@ -3012,7 +3012,7 @@ _0803560A: _08035614: .4byte gUnknown_8250A0C _08035618: .4byte gUnknown_8250A1C _0803561C: .4byte gUnknown_2024018 -_08035620: .4byte gUnknown_202063C +_08035620: .4byte gSprites thumb_func_end LoadAndCreateEnemyShadowSprites thumb_func_start SpriteCB_EnemyShadow @@ -3032,7 +3032,7 @@ SpriteCB_EnemyShadow: @ 8035624 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0803566C @ =gUnknown_202063C + ldr r1, _0803566C @ =gSprites adds r7, r0, r1 adds r6, r7, 0 adds r6, 0x3E @@ -3052,7 +3052,7 @@ _08035660: b _080356EA .align 2, 0 _08035668: .4byte gUnknown_2023D44 -_0803566C: .4byte gUnknown_202063C +_0803566C: .4byte gSprites _08035670: .4byte SpriteCB_SetInvisible _08035674: ldr r0, _08035690 @ =gUnknown_2037EE1 @@ -3166,7 +3166,7 @@ _08035732: ldrb r0, [r0] cmp r0, 0 beq _08035768 - ldr r2, _08035760 @ =gUnknown_202063C + ldr r2, _08035760 @ =gSprites ldr r1, [r3, 0x4] lsls r0, r4, 1 adds r0, r4 @@ -3183,10 +3183,10 @@ _08035732: .align 2, 0 _08035758: .4byte gUnknown_2024018 _0803575C: .4byte gUnknown_823A004 -_08035760: .4byte gUnknown_202063C +_08035760: .4byte gSprites _08035764: .4byte SpriteCB_EnemyShadow _08035768: - ldr r2, _0803578C @ =gUnknown_202063C + ldr r2, _0803578C @ =gSprites ldr r1, [r3, 0x4] lsls r0, r6, 1 adds r0, r6 @@ -3206,7 +3206,7 @@ _08035784: pop {r0} bx r0 .align 2, 0 -_0803578C: .4byte gUnknown_202063C +_0803578C: .4byte gSprites _08035790: .4byte SpriteCB_SetInvisible thumb_func_end SetBankEnemyShadowSpriteCallback @@ -3214,7 +3214,7 @@ _08035790: .4byte SpriteCB_SetInvisible EnemyShadowCallbackToSetInvisible: @ 8035794 lsls r0, 24 lsrs r0, 24 - ldr r2, _080357BC @ =gUnknown_202063C + ldr r2, _080357BC @ =gSprites ldr r1, _080357C0 @ =gUnknown_2024018 ldr r1, [r1] ldr r3, [r1, 0x4] @@ -3232,7 +3232,7 @@ EnemyShadowCallbackToSetInvisible: @ 8035794 str r1, [r0] bx lr .align 2, 0 -_080357BC: .4byte gUnknown_202063C +_080357BC: .4byte gSprites _080357C0: .4byte gUnknown_2024018 _080357C4: .4byte SpriteCB_SetInvisible thumb_func_end EnemyShadowCallbackToSetInvisible diff --git a/asm/battle_interface.s b/asm/battle_interface.s index b67482edd..a38173941 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -292,7 +292,7 @@ CreateBankHealthboxSprites: @ 8047CE0 bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _08047D6C @ =gUnknown_202063C + ldr r4, _08047D6C @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -323,7 +323,7 @@ CreateBankHealthboxSprites: @ 8047CE0 b _08047DBE .align 2, 0 _08047D68: .4byte gUnknown_8260278 -_08047D6C: .4byte gUnknown_202063C +_08047D6C: .4byte gSprites _08047D70: .4byte 0x000003ff _08047D74: .4byte 0xfffffc00 _08047D78: @@ -342,7 +342,7 @@ _08047D78: bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 - ldr r0, _08047DE4 @ =gUnknown_202063C + ldr r0, _08047DE4 @ =gSprites lsls r2, r7, 4 adds r2, r7 lsls r2, 2 @@ -361,7 +361,7 @@ _08047D78: movs r0, 0x2 str r0, [sp] _08047DBE: - ldr r2, _08047DE4 @ =gUnknown_202063C + ldr r2, _08047DE4 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -379,7 +379,7 @@ _08047DBE: b _08047F1C .align 2, 0 _08047DE0: .4byte gUnknown_82602A8 -_08047DE4: .4byte gUnknown_202063C +_08047DE4: .4byte gSprites _08047DE8: .4byte 0x000003ff _08047DEC: .4byte 0xfffffc00 _08047DF0: .4byte sub_8048128 @@ -420,7 +420,7 @@ _08047DF4: bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _08047E88 @ =gUnknown_202063C + ldr r4, _08047E88 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -453,7 +453,7 @@ _08047DF4: b _08047F1A .align 2, 0 _08047E84: .4byte gUnknown_8260278 -_08047E88: .4byte gUnknown_202063C +_08047E88: .4byte gSprites _08047E8C: .4byte 0x000003ff _08047E90: .4byte 0xfffffc00 _08047E94: .4byte sub_8048128 @@ -489,7 +489,7 @@ _08047E98: bl CreateSpriteAtEnd lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _08047FE4 @ =gUnknown_202063C + ldr r4, _08047FE4 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -540,7 +540,7 @@ _08047F1C: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r1, _08047FE4 @ =gUnknown_202063C + ldr r1, _08047FE4 @ =gSprites mov r8, r1 add r4, r8 mov r0, r10 @@ -617,7 +617,7 @@ _08047F1C: bx r1 .align 2, 0 _08047FE0: .4byte gUnknown_82602A8 -_08047FE4: .4byte gUnknown_202063C +_08047FE4: .4byte gSprites _08047FE8: .4byte 0x000003ff _08047FEC: .4byte 0xfffffc00 _08047FF0: .4byte sub_8048128 @@ -650,7 +650,7 @@ CreateSafariPlayerHealthboxSprites: @ 8048008 bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 - ldr r1, _08048098 @ =gUnknown_202063C + ldr r1, _08048098 @ =gSprites mov r9, r1 lsls r4, r6, 4 adds r4, r6 @@ -699,7 +699,7 @@ CreateSafariPlayerHealthboxSprites: @ 8048008 bx r1 .align 2, 0 _08048094: .4byte gUnknown_82602D8 -_08048098: .4byte gUnknown_202063C +_08048098: .4byte gSprites _0804809C: .4byte 0x000003ff _080480A0: .4byte 0xfffffc00 _080480A4: .4byte sub_8048128 @@ -731,7 +731,7 @@ sub_80480B8: @ 80480B8 bgt _080480FC cmp r0, 0 bne _080480FC - ldr r2, _080480E4 @ =gUnknown_202063C + ldr r2, _080480E4 @ =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -740,9 +740,9 @@ sub_80480B8: @ 80480B8 adds r0, 0x10 b _0804810A .align 2, 0 -_080480E4: .4byte gUnknown_202063C +_080480E4: .4byte gSprites _080480E8: - ldr r2, _080480F8 @ =gUnknown_202063C + ldr r2, _080480F8 @ =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -751,9 +751,9 @@ _080480E8: adds r0, 0x10 b _0804810A .align 2, 0 -_080480F8: .4byte gUnknown_202063C +_080480F8: .4byte gSprites _080480FC: - ldr r2, _08048124 @ =gUnknown_202063C + ldr r2, _08048124 @ =gSprites lsls r3, r5, 4 adds r1, r3, r5 lsls r1, 2 @@ -775,7 +775,7 @@ _0804810A: pop {r0} bx r0 .align 2, 0 -_08048124: .4byte gUnknown_202063C +_08048124: .4byte gSprites thumb_func_end sub_80480B8 thumb_func_start sub_8048128 @@ -783,7 +783,7 @@ sub_8048128: @ 8048128 ldrh r1, [r0, 0x38] lsls r1, 24 lsrs r1, 24 - ldr r3, _0804814C @ =gUnknown_202063C + ldr r3, _0804814C @ =gSprites lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -799,7 +799,7 @@ sub_8048128: @ 8048128 strh r1, [r0, 0x26] bx lr .align 2, 0 -_0804814C: .4byte gUnknown_202063C +_0804814C: .4byte gSprites thumb_func_end sub_8048128 thumb_func_start SetBattleBarStruct @@ -837,7 +837,7 @@ SetHealthboxSpriteInvisible: @ 8048188 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _080481D0 @ =gUnknown_202063C + ldr r4, _080481D0 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -871,7 +871,7 @@ SetHealthboxSpriteInvisible: @ 8048188 pop {r0} bx r0 .align 2, 0 -_080481D0: .4byte gUnknown_202063C +_080481D0: .4byte gSprites thumb_func_end SetHealthboxSpriteInvisible thumb_func_start SetHealthboxSpriteVisible @@ -879,7 +879,7 @@ SetHealthboxSpriteVisible: @ 80481D4 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08048224 @ =gUnknown_202063C + ldr r5, _08048224 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -916,7 +916,7 @@ SetHealthboxSpriteVisible: @ 80481D4 pop {r0} bx r0 .align 2, 0 -_08048224: .4byte gUnknown_202063C +_08048224: .4byte gSprites thumb_func_end SetHealthboxSpriteVisible thumb_func_start UpdateSpritePos @@ -924,7 +924,7 @@ UpdateSpritePos: @ 8048228 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r4, _08048244 @ =gUnknown_202063C + ldr r4, _08048244 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -935,7 +935,7 @@ UpdateSpritePos: @ 8048228 pop {r0} bx r0 .align 2, 0 -_08048244: .4byte gUnknown_202063C +_08048244: .4byte gSprites thumb_func_end UpdateSpritePos thumb_func_start DestoryHealthboxSprite @@ -943,7 +943,7 @@ DestoryHealthboxSprite: @ 8048248 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _08048284 @ =gUnknown_202063C + ldr r5, _08048284 @ =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -967,7 +967,7 @@ DestoryHealthboxSprite: @ 8048248 pop {r0} bx r0 .align 2, 0 -_08048284: .4byte gUnknown_202063C +_08048284: .4byte gSprites thumb_func_end DestoryHealthboxSprite thumb_func_start nullsub_21 @@ -989,7 +989,7 @@ UpdateOamPriorityInAllHealthboxes: @ 804828C ldrb r2, [r1] cmp r6, r2 bge _08048304 - ldr r1, _08048314 @ =gUnknown_202063C + ldr r1, _08048314 @ =gSprites mov r12, r1 movs r1, 0x3 ands r0, r1 @@ -1047,7 +1047,7 @@ _08048304: bx r0 .align 2, 0 _08048310: .4byte gUnknown_2023BCC -_08048314: .4byte gUnknown_202063C +_08048314: .4byte gSprites _08048318: .4byte gUnknown_3004FF0 thumb_func_end UpdateOamPriorityInAllHealthboxes @@ -1154,7 +1154,7 @@ UpdateLvlInHealthbox: @ 8048398 movs r2, 0x3 bl AddTextPrinterAndCreateWindowOnHealthbox adds r6, r0, 0 - ldr r0, _08048414 @ =gUnknown_202063C + ldr r0, _08048414 @ =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -1180,7 +1180,7 @@ UpdateLvlInHealthbox: @ 8048398 b _08048424 .align 2, 0 _08048410: .4byte gUnknown_826051C -_08048414: .4byte gUnknown_202063C +_08048414: .4byte gSprites _08048418: .4byte 0x06010420 _0804841C: .4byte 0x06010820 _08048420: @@ -1218,7 +1218,7 @@ sub_8048440: @ 8048440 lsls r2, 24 lsrs r2, 24 mov r8, r2 - ldr r1, _080484B4 @ =gUnknown_202063C + ldr r1, _080484B4 @ =gSprites lsls r0, 4 add r0, r9 lsls r0, 2 @@ -1258,7 +1258,7 @@ sub_8048440: @ 8048440 adds r1, r5, 0 b _080484FE .align 2, 0 -_080484B4: .4byte gUnknown_202063C +_080484B4: .4byte gSprites _080484B8: .4byte 0x06010a40 _080484BC: mov r2, r10 @@ -1306,7 +1306,7 @@ _08048514: adds r0, r5, 0 movs r2, 0x14 bl memcpy - ldr r1, _08048560 @ =gUnknown_202063C + ldr r1, _08048560 @ =gSprites mov r0, r9 lsls r4, r0, 4 adds r0, r4, r0 @@ -1336,7 +1336,7 @@ _0804854C: b _080485F8 .align 2, 0 _0804855C: .4byte gUnknown_826052C -_08048560: .4byte gUnknown_202063C +_08048560: .4byte gSprites _08048564: ldrh r0, [r7, 0x3A] lsls r0, 24 @@ -1381,7 +1381,7 @@ _0804858A: movs r3, 0 bl RenderTextFont9 movs r5, 0 - ldr r1, _0804860C @ =gUnknown_202063C + ldr r1, _0804860C @ =gSprites mov r2, r9 adds r0, r4, r2 lsls r0, 2 @@ -1422,7 +1422,7 @@ _080485F8: bx r0 .align 2, 0 _08048608: .4byte gUnknown_202401C -_0804860C: .4byte gUnknown_202063C +_0804860C: .4byte gSprites _08048610: .4byte 0x06010000 _08048614: .4byte 0x04000008 thumb_func_end sub_8048440 @@ -1447,7 +1447,7 @@ sub_8048618: @ 8048618 add r0, sp, 0x10 movs r2, 0x14 bl memcpy - ldr r5, _080486FC @ =gUnknown_202063C + ldr r5, _080486FC @ =gSprites mov r1, r9 lsls r0, r1, 4 add r0, r9 @@ -1540,7 +1540,7 @@ _080486C6: b _0804873E .align 2, 0 _080486F8: .4byte gUnknown_8260542 -_080486FC: .4byte gUnknown_202063C +_080486FC: .4byte gSprites _08048700: .4byte gUnknown_2024018 _08048704: .4byte gUnknown_8260540 _08048708: .4byte gUnknown_202401C @@ -1584,7 +1584,7 @@ _08048748: adds r0, r1 ldr r0, [r0] adds r0, 0xE0 - ldr r1, _0804879C @ =gUnknown_202063C + ldr r1, _0804879C @ =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -1611,7 +1611,7 @@ _08048748: _08048790: .4byte gUnknown_202401C _08048794: .4byte 0x06010020 _08048798: .4byte 0x04000008 -_0804879C: .4byte gUnknown_202063C +_0804879C: .4byte gSprites _080487A0: .4byte 0x06010000 _080487A4: .4byte 0x05000008 _080487A8: @@ -1622,7 +1622,7 @@ _080487A8: bne _080487DC movs r0, 0x74 bl GetHealthboxElementGfxPtr - ldr r2, _080487EC @ =gUnknown_202063C + ldr r2, _080487EC @ =gSprites mov r3, r9 lsls r1, r3, 4 add r1, r9 @@ -1648,7 +1648,7 @@ _080487DC: pop {r0} bx r0 .align 2, 0 -_080487EC: .4byte gUnknown_202063C +_080487EC: .4byte gSprites _080487F0: .4byte 0x06010000 _080487F4: .4byte 0x04000008 thumb_func_end sub_8048618 @@ -1669,7 +1669,7 @@ sub_80487F8: @ 80487F8 add r0, sp, 0x10 movs r2, 0x14 bl memcpy - ldr r1, _080488B0 @ =gUnknown_202063C + ldr r1, _080488B0 @ =gSprites ldr r2, [sp, 0x24] lsls r0, r2, 4 adds r0, r2 @@ -1744,7 +1744,7 @@ _080488A8: b _080488DA .align 2, 0 _080488AC: .4byte gUnknown_826052C -_080488B0: .4byte gUnknown_202063C +_080488B0: .4byte gSprites _080488B4: .4byte gUnknown_202401C _080488B8: .4byte gUnknown_8463E60 _080488BC: @@ -1786,7 +1786,7 @@ _080488DA: mov r9, r0 cmp r7, r9 bge _08048966 - ldr r1, _080489FC @ =gUnknown_202063C + ldr r1, _080489FC @ =gSprites ldr r2, _080489F8 @ =0x04000008 mov r10, r2 ldr r2, [sp, 0x24] @@ -1835,7 +1835,7 @@ _08048926: cmp r7, r9 blt _08048916 _08048966: - ldr r6, _080489FC @ =gUnknown_202063C + ldr r6, _080489FC @ =gSprites ldr r3, [sp, 0x2C] ldr r1, [sp, 0x24] adds r0, r3, r1 @@ -1907,7 +1907,7 @@ _080489D0: b _08048A2C .align 2, 0 _080489F8: .4byte 0x04000008 -_080489FC: .4byte gUnknown_202063C +_080489FC: .4byte gSprites _08048A00: .4byte 0x06010000 _08048A04: .4byte gUnknown_2023FE8 _08048A08: .4byte gUnknown_202401C @@ -1961,7 +1961,7 @@ sub_8048A4C: @ 8048A4C blt _08048A66 b _08048CF2 _08048A66: - ldr r1, _08048B7C @ =gUnknown_202063C + ldr r1, _08048B7C @ =gSprites mov r10, r1 ldr r2, _08048B80 @ =gUnknown_2023BCE mov r8, r2 @@ -1977,7 +1977,7 @@ _08048A6E: adds r1, 0x1C adds r0, r1 ldr r1, [r0] - ldr r0, _08048B88 @ =nullsub_8 + ldr r0, _08048B88 @ =SpriteCallbackDummy cmp r1, r0 beq _08048A8C b _08048CE0 @@ -2097,10 +2097,10 @@ _08048B16: b _08048C6E .align 2, 0 _08048B78: .4byte gUnknown_2023BCC -_08048B7C: .4byte gUnknown_202063C +_08048B7C: .4byte gSprites _08048B80: .4byte gUnknown_2023BCE _08048B84: .4byte gUnknown_3004FF0 -_08048B88: .4byte nullsub_8 +_08048B88: .4byte SpriteCallbackDummy _08048B8C: .4byte gUnknown_2024018 _08048B90: .4byte gUnknown_2022B4C _08048B94: .4byte 0x06010000 @@ -2409,7 +2409,7 @@ _08048DC4: ldr r6, [sp, 0x18] adds r0, r6 lsls r0, 2 - ldr r1, _08048E5C @ =gUnknown_202063C + ldr r1, _08048E5C @ =gSprites adds r4, r0, r1 ldr r1, _08048E60 @ =gUnknown_82603FC adds r0, r4, 0 @@ -2438,7 +2438,7 @@ _08048E4C: .4byte gUnknown_826049C _08048E50: .4byte gUnknown_826047C _08048E54: .4byte gUnknown_826048C _08048E58: .4byte gUnknown_82604BC -_08048E5C: .4byte gUnknown_202063C +_08048E5C: .4byte gSprites _08048E60: .4byte gUnknown_82603FC _08048E64: ldrh r0, [r4, 0x20] @@ -2446,7 +2446,7 @@ _08048E64: strh r0, [r4, 0x20] _08048E6A: movs r6, 0 - ldr r1, _08048F14 @ =gUnknown_202063C + ldr r1, _08048F14 @ =gSprites mov r10, r1 mov r4, sp mov r2, r9 @@ -2476,12 +2476,12 @@ _08048E80: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r2, _08048F20 @ =gUnknown_2020658 + ldr r2, _08048F20 @ =gSprites + 0x1C adds r1, r2 ldr r0, _08048F24 @ =SpriteCB_StatusSummaryBallsOnSwitchout str r0, [r1] _08048EB0: - ldr r5, _08048F14 @ =gUnknown_202063C + ldr r5, _08048F14 @ =gSprites cmp r7, 0 bne _08048ECE ldrb r1, [r4] @@ -2532,10 +2532,10 @@ _08048ECE: movs r1, 0x78 b _08048F66 .align 2, 0 -_08048F14: .4byte gUnknown_202063C +_08048F14: .4byte gSprites _08048F18: .4byte gUnknown_82604EC _08048F1C: .4byte 0xfffc0000 -_08048F20: .4byte gUnknown_2020658 +_08048F20: .4byte gSprites + 0x1C _08048F24: .4byte SpriteCB_StatusSummaryBallsOnSwitchout _08048F28: ldrb r0, [r4] @@ -2597,7 +2597,7 @@ _08048F86: mov r10, r5 ldr r0, _08048FDC @ =0x0000ffff mov r9, r0 - ldr r7, _08048FE0 @ =gUnknown_202063C + ldr r7, _08048FE0 @ =gSprites ldr r1, _08048FE4 @ =0x000003ff mov r12, r1 ldr r2, _08048FE8 @ =0xfffffc00 @@ -2630,7 +2630,7 @@ _08048FAA: _08048FD4: .4byte 0x0000ff88 _08048FD8: .4byte gUnknown_2022B4C _08048FDC: .4byte 0x0000ffff -_08048FE0: .4byte gUnknown_202063C +_08048FE0: .4byte gSprites _08048FE4: .4byte 0x000003ff _08048FE8: .4byte 0xfffffc00 _08048FEC: @@ -2710,7 +2710,7 @@ _0804906E: mov r10, r1 ldr r2, _080490B8 @ =0x0000ffff mov r9, r2 - ldr r7, _080490BC @ =gUnknown_202063C + ldr r7, _080490BC @ =gSprites ldr r3, _080490C0 @ =0x000003ff mov r12, r3 ldr r5, _080490C4 @ =0xfffffc00 @@ -2743,7 +2743,7 @@ _08049088: .align 2, 0 _080490B4: .4byte gUnknown_2022B4C _080490B8: .4byte 0x0000ffff -_080490BC: .4byte gUnknown_202063C +_080490BC: .4byte gSprites _080490C0: .4byte 0x000003ff _080490C4: .4byte 0xfffffc00 _080490C8: @@ -2920,7 +2920,7 @@ _080491DE: mov r1, r10 lsls r1, 4 str r1, [sp, 0x10] - ldr r3, _080492C4 @ =gUnknown_202063C + ldr r3, _080492C4 @ =gSprites movs r6, 0xD negs r6, r6 mov r12, r3 @@ -3003,12 +3003,12 @@ _08049268: adds r0, r3 ldr r1, _080492C8 @ =sub_8049630 str r1, [r0] - ldr r2, _080492C4 @ =gUnknown_202063C + ldr r2, _080492C4 @ =gSprites mov r12, r2 b _08049302 .align 2, 0 _080492C0: .4byte gUnknown_3005090 -_080492C4: .4byte gUnknown_202063C +_080492C4: .4byte gSprites _080492C8: .4byte sub_8049630 _080492CC: ldrb r1, [r4] @@ -3036,7 +3036,7 @@ _080492CC: adds r0, r3 ldr r1, _08049348 @ =sub_8049630 str r1, [r0] - ldr r0, _0804934C @ =gUnknown_202063C + ldr r0, _0804934C @ =gSprites mov r12, r0 _08049302: adds r4, 0x1 @@ -3074,7 +3074,7 @@ _08049302: b _0804936E .align 2, 0 _08049348: .4byte sub_8049630 -_0804934C: .4byte gUnknown_202063C +_0804934C: .4byte gSprites _08049350: .4byte sub_8049568 _08049354: .4byte gUnknown_8260404 _08049358: .4byte gUnknown_3005090 @@ -3187,7 +3187,7 @@ _08049412: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r4, _08049460 @ =gUnknown_202063C + ldr r4, _08049460 @ =gSprites adds r0, r4 bl DestroySpriteAndFreeResources mov r0, sp @@ -3213,7 +3213,7 @@ _08049442: b _08049482 .align 2, 0 _0804945C: .4byte gUnknown_3005090 -_08049460: .4byte gUnknown_202063C +_08049460: .4byte gSprites _08049464: movs r0, 0x3 negs r0, r0 @@ -3286,7 +3286,7 @@ _080494DA: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r4, _08049524 @ =gUnknown_202063C + ldr r4, _08049524 @ =gSprites adds r0, r4 bl DestroySpriteAndFreeResources mov r0, sp @@ -3311,7 +3311,7 @@ _0804950A: ble _0804950A b _08049546 .align 2, 0 -_08049524: .4byte gUnknown_202063C +_08049524: .4byte gSprites _08049528: movs r0, 0x3 negs r0, r0 @@ -3453,14 +3453,14 @@ _08049618: movs r0, 0x6C bl PlaySE1WithPanning _08049622: - ldr r0, _0804962C @ =nullsub_8 + ldr r0, _0804962C @ =SpriteCallbackDummy str r0, [r4, 0x1C] _08049626: pop {r4} pop {r0} bx r0 .align 2, 0 -_0804962C: .4byte nullsub_8 +_0804962C: .4byte SpriteCallbackDummy thumb_func_end SpriteCB_StatusSummaryBallsOnBattleStart thumb_func_start sub_8049630 @@ -3516,14 +3516,14 @@ _0804966E: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _0804969C @ =nullsub_8 + ldr r0, _0804969C @ =SpriteCallbackDummy str r0, [r3, 0x1C] _08049694: pop {r4} pop {r0} bx r0 .align 2, 0 -_0804969C: .4byte nullsub_8 +_0804969C: .4byte SpriteCallbackDummy thumb_func_end sub_8049630 thumb_func_start SpriteCB_StatusSummaryBallsOnSwitchout @@ -3531,7 +3531,7 @@ SpriteCB_StatusSummaryBallsOnSwitchout: @ 80496A0 ldrh r2, [r0, 0x2E] lsls r2, 24 lsrs r2, 24 - ldr r3, _080496BC @ =gUnknown_202063C + ldr r3, _080496BC @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -3542,7 +3542,7 @@ SpriteCB_StatusSummaryBallsOnSwitchout: @ 80496A0 strh r1, [r0, 0x26] bx lr .align 2, 0 -_080496BC: .4byte gUnknown_202063C +_080496BC: .4byte gSprites thumb_func_end SpriteCB_StatusSummaryBallsOnSwitchout thumb_func_start sub_80496C0 @@ -3600,7 +3600,7 @@ _08049720: bne _08049734 movs r6, 0x64 _08049734: - ldr r1, _0804976C @ =gUnknown_202063C + ldr r1, _0804976C @ =gSprites mov r0, r8 lsls r4, r0, 4 adds r0, r4, r0 @@ -3626,7 +3626,7 @@ _08049754: _08049760: .4byte gUnknown_202298C _08049764: .4byte gUnknown_8260556 _08049768: .4byte gUnknown_8245EE0 -_0804976C: .4byte gUnknown_202063C +_0804976C: .4byte gSprites _08049770: movs r0, 0xB strb r0, [r5] @@ -3648,7 +3648,7 @@ _08049782: movs r2, 0x3 bl AddTextPrinterAndCreateWindowOnHealthbox adds r6, r0, 0 - ldr r0, _080497E8 @ =gUnknown_202063C + ldr r0, _080497E8 @ =gSprites mov r2, r8 adds r1, r4, r2 lsls r1, 2 @@ -3685,7 +3685,7 @@ _080497D4: b _08049804 .align 2, 0 _080497E4: .4byte gUnknown_202298C -_080497E8: .4byte gUnknown_202063C +_080497E8: .4byte gSprites _080497EC: .4byte 0x06010040 _080497F0: .4byte 0x06010400 _080497F4: .4byte 0x06010800 @@ -3731,7 +3731,7 @@ sub_804981C: @ 804981C ands r1, r0 cmp r1, 0 bne _0804991C - ldr r0, _080498E4 @ =gUnknown_202063C + ldr r0, _080498E4 @ =gSprites mov r9, r0 lsls r0, r2, 4 adds r0, r2 @@ -3801,7 +3801,7 @@ sub_804981C: @ 804981C .align 2, 0 _080498DC: .4byte gUnknown_2022B4C _080498E0: .4byte 0x00010210 -_080498E4: .4byte gUnknown_202063C +_080498E4: .4byte gSprites _080498E8: .4byte gUnknown_2023BCE _080498EC: .4byte gUnknown_202402C _080498F0: .4byte 0x06010000 @@ -3848,7 +3848,7 @@ UpdateStatusIconInHealthbox: @ 8049934 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _08049998 @ =gUnknown_202063C + ldr r0, _08049998 @ =gSprites mov r2, r9 lsls r1, r2, 4 add r1, r9 @@ -3887,7 +3887,7 @@ UpdateStatusIconInHealthbox: @ 8049934 mov r8, r0 b _080499C0 .align 2, 0 -_08049998: .4byte gUnknown_202063C +_08049998: .4byte gSprites _0804999C: .4byte gUnknown_2023BCE _080499A0: .4byte gUnknown_2024284 _080499A4: @@ -3988,7 +3988,7 @@ _08049A60: lsls r3, 16 mov r8, r3 lsls r7, 2 - ldr r1, _08049AE0 @ =gUnknown_202063C + ldr r1, _08049AE0 @ =gSprites add r0, r9 lsls r0, 2 adds r5, r0, r1 @@ -4020,7 +4020,7 @@ _08049A7E: bne _08049AD4 movs r0, 0x1 bl GetHealthboxElementGfxPtr - ldr r2, _08049AE0 @ =gUnknown_202063C + ldr r2, _08049AE0 @ =gSprites mov r3, r10 lsls r1, r3, 4 add r1, r10 @@ -4039,7 +4039,7 @@ _08049AD4: bl sub_804981C b _08049BB6 .align 2, 0 -_08049AE0: .4byte gUnknown_202063C +_08049AE0: .4byte gSprites _08049AE4: .4byte 0x06010000 _08049AE8: .4byte 0x04000008 _08049AEC: .4byte gUnknown_2024018 @@ -4049,7 +4049,7 @@ _08049AF4: lsls r5, r1, 4 add r5, r9 lsls r5, 2 - ldr r2, _08049BC4 @ =gUnknown_202063C + ldr r2, _08049BC4 @ =gSprites adds r5, r2 ldrb r4, [r5, 0x5] lsrs r4, 4 @@ -4112,7 +4112,7 @@ _08049B62: lsls r4, r3, 4 add r4, r10 lsls r4, 2 - ldr r1, _08049BC4 @ =gUnknown_202063C + ldr r1, _08049BC4 @ =gSprites adds r4, r1 ldrh r1, [r4, 0x4] lsls r1, 22 @@ -4143,7 +4143,7 @@ _08049BB6: pop {r0} bx r0 .align 2, 0 -_08049BC4: .4byte gUnknown_202063C +_08049BC4: .4byte gSprites _08049BC8: .4byte gUnknown_826055A _08049BCC: .4byte gUnknown_20373F8 _08049BD0: .4byte 0x05000200 @@ -4264,7 +4264,7 @@ UpdateSafariBallsTextOnHealthbox: @ 8049CAC mov r3, sp bl AddTextPrinterAndCreateWindowOnHealthbox adds r5, r0, 0 - ldr r1, _08049D04 @ =gUnknown_202063C + ldr r1, _08049D04 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4292,7 +4292,7 @@ UpdateSafariBallsTextOnHealthbox: @ 8049CAC bx r0 .align 2, 0 _08049D00: .4byte gUnknown_83FE80C -_08049D04: .4byte gUnknown_202063C +_08049D04: .4byte gSprites _08049D08: .4byte 0x06010040 _08049D0C: .4byte 0x06010800 thumb_func_end UpdateSafariBallsTextOnHealthbox @@ -4323,7 +4323,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 movs r2, 0x3 bl AddTextPrinterAndCreateWindowOnHealthbox adds r5, r0, 0 - ldr r1, _08049D8C @ =gUnknown_202063C + ldr r1, _08049D8C @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -4352,7 +4352,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 .align 2, 0 _08049D84: .4byte gUnknown_83FE81C _08049D88: .4byte gUnknown_2039994 -_08049D8C: .4byte gUnknown_202063C +_08049D8C: .4byte gSprites _08049D90: .4byte 0x060102c0 _08049D94: .4byte 0x06010a00 thumb_func_end UpdateLeftNoOfBallsTextOnHealthbox @@ -4370,7 +4370,7 @@ UpdateHealthboxAttribute: @ 8049D98 lsrs r6, r0, 24 lsls r2, 24 lsrs r7, r2, 24 - ldr r1, _08049F44 @ =gUnknown_202063C + ldr r1, _08049F44 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -4388,7 +4388,7 @@ UpdateHealthboxAttribute: @ 8049D98 mov r0, r9 bl GetBankSide _08049DD4: - ldr r1, _08049F44 @ =gUnknown_202063C + ldr r1, _08049F44 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -4564,7 +4564,7 @@ _08049F2E: bl UpdateLeftNoOfBallsTextOnHealthbox b _08049FC6 .align 2, 0 -_08049F44: .4byte gUnknown_202063C +_08049F44: .4byte gSprites _08049F48: .4byte gUnknown_8253AE4 _08049F4C: .4byte gUnknown_8254784 _08049F50: @@ -4815,7 +4815,7 @@ _0804A0F0: mov r9, r4 _0804A12C: movs r5, 0 - ldr r0, _0804A188 @ =gUnknown_202063C + ldr r0, _0804A188 @ =gSprites mov r8, r0 _0804A132: ldr r0, _0804A184 @ =gUnknown_2024018 @@ -4859,7 +4859,7 @@ _0804A132: b _0804A1C2 .align 2, 0 _0804A184: .4byte gUnknown_2024018 -_0804A188: .4byte gUnknown_202063C +_0804A188: .4byte gSprites _0804A18C: .4byte 0x06010000 _0804A190: .4byte 0x04000008 _0804A194: @@ -4940,7 +4940,7 @@ _0804A21E: bls _0804A21E _0804A230: movs r5, 0 - ldr r0, _0804A288 @ =gUnknown_202063C + ldr r0, _0804A288 @ =gSprites mov r8, r0 adds r0, r7, r6 lsls r4, r0, 2 @@ -4980,7 +4980,7 @@ _0804A23A: _0804A27C: .4byte gUnknown_2024018 _0804A280: .4byte gUnknown_2023BCE _0804A284: .4byte gUnknown_2024284 -_0804A288: .4byte gUnknown_202063C +_0804A288: .4byte gSprites _0804A28C: .4byte 0x06010000 _0804A290: .4byte 0x04000008 _0804A294: diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s index 06fe2be47..f8ec68c90 100644 --- a/asm/battle_script_commands.s +++ b/asm/battle_script_commands.s @@ -17923,7 +17923,7 @@ PutMonIconOnLvlUpBox: @ 8026688 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r2, _0802674C @ =gUnknown_202063C + ldr r2, _0802674C @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -17947,7 +17947,7 @@ _0802673C: .4byte 0x0000ffff _08026740: .4byte 0xd75a0000 _08026744: .4byte 0x0000d75a _08026748: .4byte gUnknown_82507C8 -_0802674C: .4byte gUnknown_202063C +_0802674C: .4byte gSprites _08026750: .4byte gUnknown_202297C thumb_func_end PutMonIconOnLvlUpBox diff --git a/asm/battle_transition.s b/asm/battle_transition.s index 46e7b9dc2..373ceac50 100644 --- a/asm/battle_transition.s +++ b/asm/battle_transition.s @@ -1605,7 +1605,7 @@ FldEff_Pokeball: @ 80D1504 bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 - ldr r1, _080D1568 @ =gUnknown_202063C + ldr r1, _080D1568 @ =gSprites lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -1640,7 +1640,7 @@ FldEff_Pokeball: @ 80D1504 .align 2, 0 _080D1560: .4byte gUnknown_83FA5CC _080D1564: .4byte gUnknown_20386E0 -_080D1568: .4byte gUnknown_202063C +_080D1568: .4byte gSprites _080D156C: .4byte 0x0000ffff thumb_func_end FldEff_Pokeball @@ -4919,7 +4919,7 @@ sub_80D2EA4: @ 80D2EA4 push {r5,r6} sub sp, 0x4 adds r4, r0, 0 - ldr r6, _080D2FF8 @ =gUnknown_3003E58 + ldr r6, _080D2FF8 @ =gReservedSpritePaletteCount movs r0, 0xA strb r0, [r6] ldr r0, _080D2FFC @ =gUnknown_83FA494 @@ -4972,7 +4972,7 @@ sub_80D2EA4: @ 80D2EA4 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r1, _080D300C @ =gUnknown_202063C + ldr r1, _080D300C @ =gSprites adds r5, r1 movs r2, 0x24 ldrsh r0, [r4, r2] @@ -5074,12 +5074,12 @@ sub_80D2EA4: @ 80D2EA4 pop {r0} bx r0 .align 2, 0 -_080D2FF8: .4byte gUnknown_3003E58 +_080D2FF8: .4byte gReservedSpritePaletteCount _080D2FFC: .4byte gUnknown_83FA494 _080D3000: .4byte gUnknown_83FA4AE _080D3004: .4byte gUnknown_201C000 _080D3008: .4byte gSaveBlock2Ptr -_080D300C: .4byte gUnknown_202063C +_080D300C: .4byte gSprites _080D3010: .4byte sub_80D301C _080D3014: .4byte gUnknown_83FA49A _080D3018: .4byte 0xfffffe00 @@ -5240,7 +5240,7 @@ _080D3118: thumb_func_start sub_80D3120 sub_80D3120: @ 80D3120 - ldr r3, _080D3134 @ =gUnknown_202063C + ldr r3, _080D3134 @ =gSprites lsls r0, 16 asrs r0, 16 lsls r2, r0, 4 @@ -5250,12 +5250,12 @@ sub_80D3120: @ 80D3120 strh r1, [r2, 0x3C] bx lr .align 2, 0 -_080D3134: .4byte gUnknown_202063C +_080D3134: .4byte gSprites thumb_func_end sub_80D3120 thumb_func_start sub_80D3138 sub_80D3138: @ 80D3138 - ldr r2, _080D3150 @ =gUnknown_202063C + ldr r2, _080D3150 @ =gSprites lsls r0, 16 asrs r0, 16 lsls r1, r0, 4 @@ -5267,12 +5267,12 @@ sub_80D3138: @ 80D3138 strh r0, [r1, 0x2E] bx lr .align 2, 0 -_080D3150: .4byte gUnknown_202063C +_080D3150: .4byte gSprites thumb_func_end sub_80D3138 thumb_func_start sub_80D3154 sub_80D3154: @ 80D3154 - ldr r2, _080D3168 @ =gUnknown_202063C + ldr r2, _080D3168 @ =gSprites lsls r0, 16 asrs r0, 16 lsls r1, r0, 4 @@ -5283,7 +5283,7 @@ sub_80D3154: @ 80D3154 ldrsh r0, [r1, r2] bx lr .align 2, 0 -_080D3168: .4byte gUnknown_202063C +_080D3168: .4byte gSprites thumb_func_end sub_80D3154 thumb_func_start sub_80D316C @@ -5707,7 +5707,7 @@ _080D34B0: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080D350C @ =gUnknown_202063C + ldr r0, _080D350C @ =gSprites adds r2, r1, r0 movs r0, 0xF0 strh r0, [r2, 0x20] @@ -5743,7 +5743,7 @@ _080D34B0: .align 2, 0 _080D3504: .4byte gUnknown_83FA508 _080D3508: .4byte sub_80D3720 -_080D350C: .4byte gUnknown_202063C +_080D350C: .4byte gSprites thumb_func_end sub_80D349C thumb_func_start sub_80D3510 diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index df2127048..9d68bb3e9 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -3769,7 +3769,7 @@ sub_813EC28: @ 813EC28 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0813EC5C @ =gUnknown_202063C + ldr r1, _0813EC5C @ =gSprites adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x3F @@ -3789,7 +3789,7 @@ _0813EC52: bx r0 .align 2, 0 _0813EC58: .4byte gUnknown_203F39C -_0813EC5C: .4byte gUnknown_202063C +_0813EC5C: .4byte gSprites _0813EC60: .4byte sub_813EC64 thumb_func_end sub_813EC28 @@ -3806,14 +3806,14 @@ sub_813EC64: @ 813EC64 adds r0, r4, 0 movs r1, 0 bl StartSpriteAffineAnim - ldr r0, _0813EC88 @ =nullsub_8 + ldr r0, _0813EC88 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _0813EC80: pop {r4} pop {r0} bx r0 .align 2, 0 -_0813EC88: .4byte nullsub_8 +_0813EC88: .4byte SpriteCallbackDummy thumb_func_end sub_813EC64 .align 2, 0 @ Don't pad with nop. diff --git a/asm/credits.s b/asm/credits.s index a2c55239a..15c3e9ead 100644 --- a/asm/credits.s +++ b/asm/credits.s @@ -1742,7 +1742,7 @@ sub_80F47F8: @ 80F47F8 .align 2, 0 _080F481C: .4byte gUnknown_3005098 _080F4820: - ldr r4, _080F4848 @ =gUnknown_202063C + ldr r4, _080F4848 @ =gSprites ldrb r0, [r3, 0x1] lsls r1, r0, 4 adds r1, r0 @@ -1762,7 +1762,7 @@ _080F4820: adds r0, r4 b _080F48BC .align 2, 0 -_080F4848: .4byte gUnknown_202063C +_080F4848: .4byte gSprites _080F484C: ldr r0, _080F4888 @ =gUnknown_203AB40 ldr r0, [r0] @@ -1771,7 +1771,7 @@ _080F484C: ands r0, r1 cmp r0, 0 beq _080F48C2 - ldr r4, _080F488C @ =gUnknown_202063C + ldr r4, _080F488C @ =gSprites ldrb r0, [r3, 0x1] lsls r1, r0, 4 adds r1, r0 @@ -1795,7 +1795,7 @@ _080F484C: b _080F48C2 .align 2, 0 _080F4888: .4byte gUnknown_203AB40 -_080F488C: .4byte gUnknown_202063C +_080F488C: .4byte gSprites _080F4890: movs r0, 0 strb r0, [r3] @@ -1806,7 +1806,7 @@ _080F4896: ldrb r0, [r0] cmp r0, 0xF bne _080F48C2 - ldr r2, _080F48CC @ =gUnknown_202063C + ldr r2, _080F48CC @ =gSprites ldrb r1, [r3, 0x1] lsls r0, r1, 4 adds r0, r1 @@ -1830,7 +1830,7 @@ _080F48C2: bx r0 .align 2, 0 _080F48C8: .4byte gUnknown_203AB40 -_080F48CC: .4byte gUnknown_202063C +_080F48CC: .4byte gSprites thumb_func_end sub_80F47F8 thumb_func_start sub_80F48D0 @@ -1852,7 +1852,7 @@ sub_80F48D0: @ 80F48D0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _080F492C @ =gUnknown_202063C + ldr r5, _080F492C @ =gSprites adds r0, r5 bl DestroySprite ldrh r0, [r4, 0x8] @@ -1876,7 +1876,7 @@ _080F491E: .align 2, 0 _080F4924: .4byte gUnknown_203AB40 _080F4928: .4byte gUnknown_3005098 -_080F492C: .4byte gUnknown_202063C +_080F492C: .4byte gSprites thumb_func_end sub_80F48D0 thumb_func_start sub_80F4930 @@ -2049,7 +2049,7 @@ _080F4A6C: movs r3, 0 bl CreateSprite strb r0, [r6, 0x1] - ldr r3, _080F4AE4 @ =gUnknown_202063C + ldr r3, _080F4AE4 @ =gSprites ldrb r1, [r6, 0x1] lsls r0, r1, 4 adds r0, r1 @@ -2088,7 +2088,7 @@ _080F4A6C: _080F4AD8: .4byte gUnknown_84129C0 _080F4ADC: .4byte gUnknown_84129A0 _080F4AE0: .4byte gUnknown_8414364 -_080F4AE4: .4byte gUnknown_202063C +_080F4AE4: .4byte gSprites _080F4AE8: .4byte 0x00002001 _080F4AEC: .4byte 0x0000ffff _080F4AF0: .4byte gUnknown_841431C @@ -2184,7 +2184,7 @@ _080F4BA0: movs r3, 0 bl CreateSprite strb r0, [r6, 0x6] - ldr r3, _080F4BF8 @ =gUnknown_202063C + ldr r3, _080F4BF8 @ =gSprites ldrb r1, [r6, 0x6] lsls r0, r1, 4 adds r0, r1 @@ -2216,7 +2216,7 @@ _080F4BDE: _080F4BEC: .4byte gUnknown_8413DB8 _080F4BF0: .4byte gUnknown_8413D98 _080F4BF4: .4byte gUnknown_84143B8 -_080F4BF8: .4byte gUnknown_202063C +_080F4BF8: .4byte gSprites thumb_func_end sub_80F4930 .align 2, 0 @ Don't pad with nop. diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 40e89ac65..02a47548e 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -433,7 +433,7 @@ _08046F6C: bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 - ldr r4, _08046FB8 @ =gUnknown_202063C + ldr r4, _08046FB8 @ =gSprites lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -445,7 +445,7 @@ _08046F6C: strb r0, [r2] adds r4, 0x1C adds r1, r4 - ldr r0, _08046FBC @ =nullsub_8 + ldr r0, _08046FBC @ =SpriteCallbackDummy str r0, [r1] _08046FA6: adds r0, r7, 0 @@ -457,8 +457,8 @@ _08046FA6: bx r1 .align 2, 0 _08046FB4: .4byte gUnknown_20244DC -_08046FB8: .4byte gUnknown_202063C -_08046FBC: .4byte nullsub_8 +_08046FB8: .4byte gSprites +_08046FBC: .4byte SpriteCallbackDummy thumb_func_end sub_8046ED0 thumb_func_start sub_8046FC0 @@ -947,7 +947,7 @@ _0804741E: ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - ldr r2, _0804743C @ =gUnknown_202063C + ldr r2, _0804743C @ =gSprites ldr r0, [r5] ldrb r1, [r0] lsls r0, r1, 4 @@ -959,10 +959,10 @@ _0804741E: str r1, [r0] b _08047684 .align 2, 0 -_0804743C: .4byte gUnknown_202063C +_0804743C: .4byte gSprites _08047440: .4byte SpriteCB_Egg_0 _08047444: - ldr r2, _0804746C @ =gUnknown_202063C + ldr r2, _0804746C @ =gSprites ldr r3, [r5] ldrb r1, [r3] lsls r0, r1, 4 @@ -971,7 +971,7 @@ _08047444: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08047470 @ =nullsub_8 + ldr r0, _08047470 @ =SpriteCallbackDummy cmp r1, r0 beq _0804745E b _08047684 @@ -982,8 +982,8 @@ _0804745E: ldr r1, [r5] b _08047648 .align 2, 0 -_0804746C: .4byte gUnknown_202063C -_08047470: .4byte nullsub_8 +_0804746C: .4byte gSprites +_08047470: .4byte SpriteCallbackDummy _08047474: bl IsCryFinished lsls r0, 24 @@ -1371,7 +1371,7 @@ SpriteCB_Egg_2: @ 804776C movs r1, 0xB bl GetMonData lsls r0, 16 - ldr r4, _080477DC @ =gUnknown_202063C + ldr r4, _080477DC @ =gSprites ldr r3, [r5] ldrb r2, [r3, 0x1] lsls r1, r2, 4 @@ -1394,7 +1394,7 @@ SpriteCB_Egg_2: @ 804776C _080477D0: .4byte SpriteCB_Egg_3 _080477D4: .4byte gUnknown_3000E74 _080477D8: .4byte gUnknown_2024284 -_080477DC: .4byte gUnknown_202063C +_080477DC: .4byte gSprites _080477E0: .4byte gUnknown_82349CC _080477E4: ldrh r0, [r4, 0x30] @@ -1528,7 +1528,7 @@ SpriteCB_Egg_5: @ 80478D0 ldrsh r0, [r5, r1] cmp r0, 0 bne _0804790C - ldr r4, _08047960 @ =gUnknown_202063C + ldr r4, _08047960 @ =gSprites ldr r3, _08047964 @ =gUnknown_3000E74 ldr r0, [r3] ldrb r1, [r0, 0x1] @@ -1568,7 +1568,7 @@ _08047926: ldrsh r0, [r5, r1] cmp r0, 0x9 bgt _08047944 - ldr r2, _08047960 @ =gUnknown_202063C + ldr r2, _08047960 @ =gSprites ldr r0, _08047964 @ =gUnknown_3000E74 ldr r0, [r0] ldrb r1, [r0, 0x1] @@ -1585,7 +1585,7 @@ _08047944: ldrsh r0, [r5, r2] cmp r0, 0x28 ble _08047952 - ldr r0, _0804796C @ =nullsub_8 + ldr r0, _0804796C @ =SpriteCallbackDummy str r0, [r5, 0x1C] _08047952: adds r0, r1, 0x1 @@ -1595,10 +1595,10 @@ _08047952: pop {r0} bx r0 .align 2, 0 -_08047960: .4byte gUnknown_202063C +_08047960: .4byte gSprites _08047964: .4byte gUnknown_3000E74 _08047968: .4byte 0x0000ffff -_0804796C: .4byte nullsub_8 +_0804796C: .4byte SpriteCallbackDummy thumb_func_end SpriteCB_Egg_5 thumb_func_start SpriteCB_EggShard @@ -1735,7 +1735,7 @@ CreateEggShardSprite: @ 8047A1C adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _08047A98 @ =gUnknown_202063C + ldr r2, _08047A98 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -1756,7 +1756,7 @@ CreateEggShardSprite: @ 8047A1C bx r0 .align 2, 0 _08047A94: .4byte gUnknown_8260184 -_08047A98: .4byte gUnknown_202063C +_08047A98: .4byte gSprites thumb_func_end CreateEggShardSprite thumb_func_start EggHatchPrintMessage diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s index 9f02a0320..6bbc1b728 100644 --- a/asm/evolution_graphics.s +++ b/asm/evolution_graphics.s @@ -151,7 +151,7 @@ CreatePreEvoSparkleSet1: @ 80F5A44 lsrs r0, 24 cmp r0, 0x40 beq _080F5A8E - ldr r4, _080F5A98 @ =gUnknown_202063C + ldr r4, _080F5A98 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -181,7 +181,7 @@ _080F5A8E: bx r0 .align 2, 0 _080F5A94: .4byte gUnknown_841EEF8 -_080F5A98: .4byte gUnknown_202063C +_080F5A98: .4byte gSprites _080F5A9C: .4byte SpriteCB_PreEvoSparkleSet1 thumb_func_end CreatePreEvoSparkleSet1 @@ -258,7 +258,7 @@ CreatePreEvoSparkleSet2: @ 80F5B14 lsrs r0, 24 cmp r0, 0x40 beq _080F5B6A - ldr r4, _080F5B74 @ =gUnknown_202063C + ldr r4, _080F5B74 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -294,7 +294,7 @@ _080F5B6A: bx r0 .align 2, 0 _080F5B70: .4byte gUnknown_841EEF8 -_080F5B74: .4byte gUnknown_202063C +_080F5B74: .4byte gSprites _080F5B78: .4byte SpriteCB_PreEvoSparkleSet2 thumb_func_end CreatePreEvoSparkleSet2 @@ -353,7 +353,7 @@ CreatePostEvoSparkleSet1: @ 80F5BC4 lsrs r0, 24 cmp r0, 0x40 beq _080F5C1A - ldr r4, _080F5C24 @ =gUnknown_202063C + ldr r4, _080F5C24 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -387,7 +387,7 @@ _080F5C1A: bx r0 .align 2, 0 _080F5C20: .4byte gUnknown_841EEF8 -_080F5C24: .4byte gUnknown_202063C +_080F5C24: .4byte gSprites _080F5C28: .4byte SpriteCB_PostEvoSparkleSet1 thumb_func_end CreatePostEvoSparkleSet1 @@ -518,7 +518,7 @@ CreatePostEvoSparkleSet2: @ 80F5CFC cmp r4, 0x40 beq _080F5D6C bl Random - ldr r6, _080F5D7C @ =gUnknown_202063C + ldr r6, _080F5D7C @ =gSprites lsls r5, r4, 4 adds r5, r4 lsls r5, 2 @@ -565,7 +565,7 @@ _080F5D6C: bx r0 .align 2, 0 _080F5D78: .4byte gUnknown_841EEF8 -_080F5D7C: .4byte gUnknown_202063C +_080F5D7C: .4byte gSprites _080F5D80: .4byte SpriteCB_PostEvoSparkleSet2 thumb_func_end CreatePostEvoSparkleSet2 @@ -1330,7 +1330,7 @@ _080F62CE: movs r2, 0 movs r3, 0 bl SetOamMatrix - ldr r1, _080F63F4 @ =gUnknown_202063C + ldr r1, _080F63F4 @ =gSprites mov r9, r1 lsls r2, r5, 4 adds r2, r5 @@ -1420,7 +1420,7 @@ _080F62CE: _080F63E8: .4byte sub_80F6400 _080F63EC: .4byte 0x00007fff _080F63F0: .4byte gUnknown_3005090 -_080F63F4: .4byte gUnknown_202063C +_080F63F4: .4byte gSprites _080F63F8: .4byte nullsub_86 _080F63FC: .4byte gUnknown_20377F8 thumb_func_end sub_80F62B4 @@ -1649,7 +1649,7 @@ PreEvoInvisible_PostEvoVisible_KillTask: @ 80F6590 push {r6} lsls r0, 24 lsrs r0, 24 - ldr r1, _080F6638 @ =gUnknown_202063C + ldr r1, _080F6638 @ =gSprites mov r8, r1 ldr r1, _080F663C @ =gUnknown_3005090 lsls r4, r0, 2 @@ -1728,7 +1728,7 @@ PreEvoInvisible_PostEvoVisible_KillTask: @ 80F6590 pop {r0} bx r0 .align 2, 0 -_080F6638: .4byte gUnknown_202063C +_080F6638: .4byte gSprites _080F663C: .4byte gUnknown_3005090 thumb_func_end PreEvoInvisible_PostEvoVisible_KillTask @@ -1739,7 +1739,7 @@ PreEvoVisible_PostEvoInvisible_KillTask: @ 80F6640 push {r6} lsls r0, 24 lsrs r0, 24 - ldr r1, _080F66E8 @ =gUnknown_202063C + ldr r1, _080F66E8 @ =gSprites mov r8, r1 ldr r1, _080F66EC @ =gUnknown_3005090 lsls r4, r0, 2 @@ -1818,7 +1818,7 @@ PreEvoVisible_PostEvoInvisible_KillTask: @ 80F6640 pop {r0} bx r0 .align 2, 0 -_080F66E8: .4byte gUnknown_202063C +_080F66E8: .4byte gSprites _080F66EC: .4byte gUnknown_3005090 thumb_func_end PreEvoVisible_PostEvoInvisible_KillTask diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 9b5153c89..4c55acef7 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -201,7 +201,7 @@ EvolutionScene: @ 80CDDF4 bl remove_some_task bl ResetTasks bl FreeAllSpritePalettes - ldr r0, _080CE0A4 @ =gUnknown_3003E58 + ldr r0, _080CE0A4 @ =gReservedSpritePaletteCount movs r2, 0x4 strb r2, [r0] movs r0, 0x64 @@ -260,7 +260,7 @@ EvolutionScene: @ 80CDDF4 bl sub_803F7D4 ldr r0, _080CE0C0 @ =gUnknown_20244DC mov r8, r0 - ldr r1, _080CE0C4 @ =gUnknown_8231CFC + ldr r1, _080CE0C4 @ =gDummySpriteAffineAnimTable str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 @@ -271,7 +271,7 @@ EvolutionScene: @ 80CDDF4 lsls r1, r0, 24 lsrs r3, r1, 24 strb r0, [r2] - ldr r7, _080CE0C8 @ =gUnknown_202063C + ldr r7, _080CE0C8 @ =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -314,7 +314,7 @@ EvolutionScene: @ 80CDDF4 mov r0, r10 movs r1, 0x3 bl sub_803F7D4 - ldr r0, _080CE0C4 @ =gUnknown_8231CFC + ldr r0, _080CE0C4 @ =gDummySpriteAffineAnimTable mov r1, r8 str r0, [r1, 0x10] mov r0, r8 @@ -410,7 +410,7 @@ _080CE094: .4byte gUnknown_202297E _080CE098: .4byte gUnknown_2022980 _080CE09C: .4byte gUnknown_2022982 _080CE0A0: .4byte gUnknown_2022B50 -_080CE0A4: .4byte gUnknown_3003E58 +_080CE0A4: .4byte gReservedSpritePaletteCount _080CE0A8: .4byte gUnknown_2039A20 _080CE0AC: .4byte gStringVar1 _080CE0B0: .4byte gStringVar2 @@ -418,8 +418,8 @@ _080CE0B4: .4byte gUnknown_8245EE0 _080CE0B8: .4byte gUnknown_82350AC _080CE0BC: .4byte gUnknown_202401C _080CE0C0: .4byte gUnknown_20244DC -_080CE0C4: .4byte gUnknown_8231CFC -_080CE0C8: .4byte gUnknown_202063C +_080CE0C4: .4byte gDummySpriteAffineAnimTable +_080CE0C8: .4byte gSprites _080CE0CC: .4byte nullsub_10 _080CE0D0: .4byte sub_80CE8DC _080CE0D4: .4byte gUnknown_3005090 @@ -520,7 +520,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 bl LoadBattleTextboxAndBackground bl ResetSpriteData bl FreeAllSpritePalettes - ldr r1, _080CE2B4 @ =gUnknown_3003E58 + ldr r1, _080CE2B4 @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] lsls r0, r5, 3 @@ -544,7 +544,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 movs r1, 0x3 bl sub_803F7D4 ldr r0, _080CE2C0 @ =gUnknown_20244DC - ldr r1, _080CE2C4 @ =gUnknown_8231CFC + ldr r1, _080CE2C4 @ =gDummySpriteAffineAnimTable str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 @@ -555,7 +555,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8 lsls r2, r0, 24 lsrs r2, 24 strb r0, [r1, 0x1] - ldr r3, _080CE2C8 @ =gUnknown_202063C + ldr r3, _080CE2C8 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -617,12 +617,12 @@ _080CE2A4: .4byte gUnknown_202297E _080CE2A8: .4byte gUnknown_2022980 _080CE2AC: .4byte gUnknown_2022982 _080CE2B0: .4byte gUnknown_2022B50 -_080CE2B4: .4byte gUnknown_3003E58 +_080CE2B4: .4byte gReservedSpritePaletteCount _080CE2B8: .4byte gUnknown_82350AC _080CE2BC: .4byte gUnknown_202401C _080CE2C0: .4byte gUnknown_20244DC -_080CE2C4: .4byte gUnknown_8231CFC -_080CE2C8: .4byte gUnknown_202063C +_080CE2C4: .4byte gDummySpriteAffineAnimTable +_080CE2C8: .4byte gSprites _080CE2CC: .4byte nullsub_10 _080CE2D0: .4byte nullsub_76 _080CE2D4: .4byte sub_80D0050 @@ -688,7 +688,7 @@ _080CE34C: bl SetVBlankCallback bl ResetSpriteData bl FreeAllSpritePalettes - ldr r1, _080CE398 @ =gUnknown_3003E58 + ldr r1, _080CE398 @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] ldr r0, _080CE39C @ =gUnknown_2022974 @@ -713,7 +713,7 @@ _080CE34C: strh r1, [r0] b _080CE4EC .align 2, 0 -_080CE398: .4byte gUnknown_3003E58 +_080CE398: .4byte gReservedSpritePaletteCount _080CE39C: .4byte gUnknown_2022974 _080CE3A0: .4byte gUnknown_2022976 _080CE3A4: .4byte gUnknown_2022978 @@ -795,7 +795,7 @@ _080CE45C: movs r1, 0x1 bl sub_803F7D4 ldr r0, _080CE4B4 @ =gUnknown_20244DC - ldr r1, _080CE4B8 @ =gUnknown_8231CFC + ldr r1, _080CE4B8 @ =gDummySpriteAffineAnimTable str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 @@ -806,7 +806,7 @@ _080CE45C: lsls r2, r0, 24 lsrs r2, 24 strb r0, [r1, 0x1] - ldr r3, _080CE4C0 @ =gUnknown_202063C + ldr r3, _080CE4C0 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -833,9 +833,9 @@ _080CE45C: b _080CE534 .align 2, 0 _080CE4B4: .4byte gUnknown_20244DC -_080CE4B8: .4byte gUnknown_8231CFC +_080CE4B8: .4byte gDummySpriteAffineAnimTable _080CE4BC: .4byte gUnknown_2039A20 -_080CE4C0: .4byte gUnknown_202063C +_080CE4C0: .4byte gSprites _080CE4C4: .4byte nullsub_10 _080CE4C8: .4byte gMain _080CE4CC: @@ -924,7 +924,7 @@ TradeEvolutionScene: @ 80CE540 ldr r2, _080CE6B8 @ =gUnknown_8245EE0 adds r1, r2 bl StringCopy - ldr r1, _080CE6BC @ =gUnknown_2021CCC + ldr r1, _080CE6BC @ =gAffineAnimsDisabled movs r0, 0x1 strb r0, [r1] adds r0, r4, 0 @@ -971,7 +971,7 @@ TradeEvolutionScene: @ 80CE540 movs r1, 0x1 bl sub_803F7D4 ldr r0, _080CE6CC @ =gUnknown_20244DC - ldr r1, _080CE6D0 @ =gUnknown_8231CFC + ldr r1, _080CE6D0 @ =gDummySpriteAffineAnimTable str r1, [r0, 0x10] movs r1, 0x78 movs r2, 0x40 @@ -982,7 +982,7 @@ TradeEvolutionScene: @ 80CE540 lsls r1, r0, 24 lsrs r6, r1, 24 strb r0, [r2, 0x1] - ldr r3, _080CE6D4 @ =gUnknown_202063C + ldr r3, _080CE6D4 @ =gSprites lsls r1, r6, 4 adds r1, r6 lsls r1, 2 @@ -1067,13 +1067,13 @@ TradeEvolutionScene: @ 80CE540 _080CE6B0: .4byte gStringVar1 _080CE6B4: .4byte gStringVar2 _080CE6B8: .4byte gUnknown_8245EE0 -_080CE6BC: .4byte gUnknown_2021CCC +_080CE6BC: .4byte gAffineAnimsDisabled _080CE6C0: .4byte gUnknown_2039A20 _080CE6C4: .4byte gUnknown_82350AC _080CE6C8: .4byte gUnknown_202401C _080CE6CC: .4byte gUnknown_20244DC -_080CE6D0: .4byte gUnknown_8231CFC -_080CE6D4: .4byte gUnknown_202063C +_080CE6D0: .4byte gDummySpriteAffineAnimTable +_080CE6D4: .4byte gSprites _080CE6D8: .4byte nullsub_10 _080CE6DC: .4byte sub_80CF53C _080CE6E0: .4byte gUnknown_3005090 @@ -1447,7 +1447,7 @@ _080CEA2C: movs r2, 0x10 movs r3, 0 bl BeginNormalPaletteFade - ldr r2, _080CEA84 @ =gUnknown_202063C + ldr r2, _080CEA84 @ =gSprites ldr r0, _080CEA88 @ =gUnknown_2039A20 ldr r0, [r0] ldrb r1, [r0] @@ -1479,7 +1479,7 @@ _080CEA2C: bl ShowBg bl _080CF528 .align 2, 0 -_080CEA84: .4byte gUnknown_202063C +_080CEA84: .4byte gSprites _080CEA88: .4byte gUnknown_2039A20 _080CEA8C: .4byte gUnknown_3005090 _080CEA90: @@ -2897,7 +2897,7 @@ _080CF6D0: _080CF6E0: movs r0, 0x1 bl InitMovingBackgroundTask - ldr r2, _080CF728 @ =gUnknown_202063C + ldr r2, _080CF728 @ =gSprites ldr r0, _080CF72C @ =gUnknown_2039A20 ldr r0, [r0] ldrb r1, [r0] @@ -2926,7 +2926,7 @@ _080CF6E0: bl _080D003A .align 2, 0 _080CF724: .4byte gUnknown_2037AB8 -_080CF728: .4byte gUnknown_202063C +_080CF728: .4byte gSprites _080CF72C: .4byte gUnknown_2039A20 _080CF730: .4byte gUnknown_2023E82 _080CF734: .4byte gUnknown_3005090 @@ -3273,7 +3273,7 @@ _080CFA14: b _080D003A _080CFA28: bl m4aMPlayAllStop - ldr r2, _080CFA64 @ =gUnknown_202063C + ldr r2, _080CFA64 @ =gSprites ldr r0, _080CFA68 @ =gUnknown_2039A20 ldr r0, [r0] ldrb r1, [r0] @@ -3300,7 +3300,7 @@ _080CFA28: b _080CFB1A .align 2, 0 _080CFA60: .4byte gUnknown_2023E82 -_080CFA64: .4byte gUnknown_202063C +_080CFA64: .4byte gSprites _080CFA68: .4byte gUnknown_2039A20 _080CFA6C: .4byte 0x0004001c _080CFA70: .4byte 0x00007fff diff --git a/asm/fame_checker.s b/asm/fame_checker.s index c8a629b2a..8c61b2644 100644 --- a/asm/fame_checker.s +++ b/asm/fame_checker.s @@ -451,7 +451,7 @@ _0812C738: lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0xC] - ldr r4, _0812C7D4 @ =gUnknown_202063C + ldr r4, _0812C7D4 @ =gSprites movs r0, 0xC ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -491,7 +491,7 @@ _0812C738: b _0812C8EA .align 2, 0 _0812C7D0: .4byte gUnknown_203B0FC -_0812C7D4: .4byte gUnknown_202063C +_0812C7D4: .4byte gSprites _0812C7D8: .4byte sub_812C9BC _0812C7DC: movs r6, 0x1 @@ -567,7 +567,7 @@ _0812C85E: bl sub_812E4A4 movs r0, 0x2 bl sub_812D0F4 - ldr r2, _0812C8BC @ =gUnknown_202063C + ldr r2, _0812C8BC @ =gSprites ldr r0, _0812C8B4 @ =gUnknown_203B0FC ldr r0, [r0] movs r3, 0xA @@ -596,7 +596,7 @@ _0812C8A8: .align 2, 0 _0812C8B4: .4byte gUnknown_203B0FC _0812C8B8: .4byte gUnknown_3005EC8 -_0812C8BC: .4byte gUnknown_202063C +_0812C8BC: .4byte gSprites _0812C8C0: .4byte sub_812CAD8 _0812C8C4: movs r0, 0x2 @@ -651,7 +651,7 @@ sub_812C8F8: @ 812C8F8 _0812C91C: .4byte gUnknown_3005090 _0812C920: .4byte gUnknown_203B0FC _0812C924: - ldr r2, _0812C988 @ =gUnknown_202063C + ldr r2, _0812C988 @ =gSprites movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -701,7 +701,7 @@ _0812C982: pop {r1} bx r1 .align 2, 0 -_0812C988: .4byte gUnknown_202063C +_0812C988: .4byte gSprites _0812C98C: .4byte sub_812CA1C thumb_func_end sub_812C8F8 @@ -739,7 +739,7 @@ sub_812C9BC: @ 812C9BC lsls r1, 3 ldr r0, _0812C9F8 @ =gUnknown_3005090 adds r4, r1, r0 - ldr r2, _0812C9FC @ =gUnknown_202063C + ldr r2, _0812C9FC @ =gSprites movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -762,7 +762,7 @@ sub_812C9BC: @ 812C9BC b _0812CA14 .align 2, 0 _0812C9F8: .4byte gUnknown_3005090 -_0812C9FC: .4byte gUnknown_202063C +_0812C9FC: .4byte gSprites _0812CA00: .4byte gUnknown_203B0FC _0812CA04: .4byte sub_812C694 _0812CA08: @@ -805,7 +805,7 @@ _0812CA48: movs r2, 0 bl ChangeBgX _0812CA52: - ldr r7, _0812CAC8 @ =gUnknown_202063C + ldr r7, _0812CAC8 @ =gSprites movs r1, 0xC ldrsh r0, [r5, r1] lsls r1, r0, 4 @@ -861,7 +861,7 @@ _0812CAC0: pop {r0} bx r0 .align 2, 0 -_0812CAC8: .4byte gUnknown_202063C +_0812CAC8: .4byte gSprites _0812CACC: .4byte gUnknown_203B0FC _0812CAD0: .4byte sub_812C694 _0812CAD4: .4byte sub_812D800 @@ -898,7 +898,7 @@ sub_812CAD8: @ 812CAD8 adds r0, 0x1D adds r0, r1 ldrb r1, [r0] - ldr r2, _0812CBA8 @ =gUnknown_202063C + ldr r2, _0812CBA8 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -933,7 +933,7 @@ _0812CB44: cmp r4, 0x5 bls _0812CB44 bl sub_812CE9C - ldr r2, _0812CBA8 @ =gUnknown_202063C + ldr r2, _0812CBA8 @ =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -962,7 +962,7 @@ _0812CB80: _0812CB9C: .4byte gUnknown_3005090 _0812CBA0: .4byte gMain _0812CBA4: .4byte gUnknown_203B0FC -_0812CBA8: .4byte gUnknown_202063C +_0812CBA8: .4byte gSprites _0812CBAC: .4byte sub_812D764 _0812CBB0: .4byte gUnknown_3005EC8 _0812CBB4: .4byte sub_812C694 @@ -1080,7 +1080,7 @@ sub_812CC68: @ 812CC68 adds r6, r0, r1 movs r0, 0xBB bl PlaySE - ldr r2, _0812CD1C @ =gUnknown_202063C + ldr r2, _0812CD1C @ =gSprites movs r0, 0 ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -1147,7 +1147,7 @@ _0812CCBE: b _0812CD30 .align 2, 0 _0812CD18: .4byte gUnknown_3005098 -_0812CD1C: .4byte gUnknown_202063C +_0812CD1C: .4byte gSprites _0812CD20: .4byte gUnknown_203B0FC _0812CD24: ldr r0, _0812CD38 @ =gUnknown_3005EC8 @@ -1387,7 +1387,7 @@ sub_812CEFC: @ 812CEFC lsrs r0, 24 lsls r1, 24 lsrs r4, r1, 24 - ldr r2, _0812CF1C @ =gUnknown_202063C + ldr r2, _0812CF1C @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1399,7 +1399,7 @@ sub_812CEFC: @ 812CEFC movs r0, 0 b _0812CF36 .align 2, 0 -_0812CF1C: .4byte gUnknown_202063C +_0812CF1C: .4byte gSprites _0812CF20: movs r0, 0x3 adds r1, r4, 0 @@ -1484,7 +1484,7 @@ sub_812CF7C: @ 812CF7C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0812D080 @ =gUnknown_202063C + ldr r5, _0812D080 @ =gSprites adds r0, r5 bl FreeSpriteOamMatrix movs r0, 0xE @@ -1505,7 +1505,7 @@ _0812CFDA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812D080 @ =gUnknown_202063C + ldr r1, _0812D080 @ =gSprites adds r0, r1 bl DestroySprite adds r0, r4, 0x1 @@ -1559,7 +1559,7 @@ _0812D06C: _0812D074: .4byte gUnknown_2037AB8 _0812D078: .4byte gUnknown_203B0FC _0812D07C: .4byte gUnknown_3005090 -_0812D080: .4byte gUnknown_202063C +_0812D080: .4byte gSprites _0812D084: .4byte gUnknown_203B0F0 _0812D088: .4byte gUnknown_203B0F4 _0812D08C: .4byte gUnknown_203B0F8 @@ -1692,7 +1692,7 @@ _0812D178: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812D1A4 @ =gUnknown_202063C + ldr r1, _0812D1A4 @ =gSprites adds r0, r1 bl DestroySprite adds r0, r4, 0x1 @@ -1705,7 +1705,7 @@ _0812D178: bx r0 .align 2, 0 _0812D1A0: .4byte gUnknown_203B0FC -_0812D1A4: .4byte gUnknown_202063C +_0812D1A4: .4byte gSprites thumb_func_end sub_812D174 thumb_func_start sub_812D1A8 @@ -1815,7 +1815,7 @@ _0812D248: adds r1, 0x1D adds r1, r6 strb r0, [r1] - ldr r2, _0812D2D0 @ =gUnknown_202063C + ldr r2, _0812D2D0 @ =gSprites ldr r0, [r7] adds r0, 0x1D adds r0, r6 @@ -1850,7 +1850,7 @@ _0812D2A0: bl sub_812D0F4 b _0812D2F4 .align 2, 0 -_0812D2D0: .4byte gUnknown_202063C +_0812D2D0: .4byte gSprites _0812D2D4: .4byte gUnknown_203B0FC _0812D2D8: movs r0, 0 @@ -2173,13 +2173,13 @@ sub_812D558: @ 812D558 bl ResetPaletteFade movs r0, 0 bl npc_paltag_set_load - ldr r1, _0812D580 @ =gUnknown_3003E58 + ldr r1, _0812D580 @ =gReservedSpritePaletteCount movs r0, 0x7 strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0812D580: .4byte gUnknown_3003E58 +_0812D580: .4byte gReservedSpritePaletteCount thumb_func_end sub_812D558 thumb_func_start sub_812D584 @@ -2462,7 +2462,7 @@ sub_812D780: @ 812D780 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r1, _0812D7C4 @ =gUnknown_202063C + ldr r1, _0812D7C4 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -2482,7 +2482,7 @@ sub_812D780: @ 812D780 bx r1 .align 2, 0 _0812D7C0: .4byte gUnknown_845FC78 -_0812D7C4: .4byte gUnknown_202063C +_0812D7C4: .4byte gSprites thumb_func_end sub_812D780 thumb_func_start sub_812D7C8 @@ -2658,7 +2658,7 @@ _0812D906: lsls r1, 1 movs r2, 0x20 bl LoadPalette - ldr r1, _0812D930 @ =gUnknown_202063C + ldr r1, _0812D930 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -2673,7 +2673,7 @@ _0812D906: .align 2, 0 _0812D928: .4byte gUnknown_845FD2C _0812D92C: .4byte gUnknown_845E540 -_0812D930: .4byte gUnknown_202063C +_0812D930: .4byte gSprites _0812D934: ldr r0, _0812D98C @ =gUnknown_845F61C adds r0, r5, r0 @@ -2689,7 +2689,7 @@ _0812D934: lsls r0, 24 lsrs r4, r0, 24 _0812D950: - ldr r1, _0812D994 @ =gUnknown_202063C + ldr r1, _0812D994 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -2722,7 +2722,7 @@ _0812D982: .align 2, 0 _0812D98C: .4byte gUnknown_845F61C _0812D990: .4byte 0x0000ffff -_0812D994: .4byte gUnknown_202063C +_0812D994: .4byte gSprites _0812D998: .4byte sub_812D840 _0812D99C: .4byte gSaveBlock1Ptr _0812D9A0: .4byte 0x00003a54 @@ -2770,14 +2770,14 @@ _0812D9E8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812DA04 @ =gUnknown_202063C + ldr r1, _0812DA04 @ =gSprites adds r0, r1 bl DestroySprite b _0812DA0E .align 2, 0 _0812D9FC: .4byte gUnknown_3005098 _0812DA00: .4byte gUnknown_203B0FC -_0812DA04: .4byte gUnknown_202063C +_0812DA04: .4byte gSprites _0812DA08: ldrh r0, [r4, 0x4] bl sub_810C2E8 @@ -3081,7 +3081,7 @@ _0812DC70: .4byte sub_812C694 _0812DC74: .4byte gUnknown_3005090 _0812DC78: .4byte sub_812DD50 _0812DC7C: - ldr r4, _0812DCB8 @ =gUnknown_202063C + ldr r4, _0812DCB8 @ =gSprites movs r2, 0xC ldrsh r0, [r5, r2] lsls r1, r0, 4 @@ -3111,7 +3111,7 @@ _0812DC7C: bl sub_812CD3C b _0812DD3A .align 2, 0 -_0812DCB8: .4byte gUnknown_202063C +_0812DCB8: .4byte gSprites _0812DCBC: movs r0, 0xD0 str r0, [sp] @@ -3133,7 +3133,7 @@ _0812DCD8: ands r0, r1 cmp r0, 0 beq _0812DD10 - ldr r2, _0812DD0C @ =gUnknown_202063C + ldr r2, _0812DD0C @ =gSprites movs r0, 0xC ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -3152,10 +3152,10 @@ _0812DCD8: strb r0, [r1] b _0812DD3A .align 2, 0 -_0812DD0C: .4byte gUnknown_202063C +_0812DD0C: .4byte gSprites _0812DD10: movs r2, 0 - ldr r5, _0812DD4C @ =gUnknown_202063C + ldr r5, _0812DD4C @ =gSprites adds r4, r6, 0 movs r3, 0x4 _0812DD18: @@ -3186,7 +3186,7 @@ _0812DD3A: pop {r0} bx r0 .align 2, 0 -_0812DD4C: .4byte gUnknown_202063C +_0812DD4C: .4byte gSprites thumb_func_end sub_812DBC0 thumb_func_start sub_812DD50 @@ -3211,7 +3211,7 @@ sub_812DD50: @ 812DD50 lsrs r0, 24 movs r3, 0 strh r0, [r4, 0xC] - ldr r2, _0812DDA4 @ =gUnknown_202063C + ldr r2, _0812DDA4 @ =gSprites movs r0, 0xC ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -3229,7 +3229,7 @@ sub_812DD50: @ 812DD50 _0812DD98: .4byte gUnknown_3005090 _0812DD9C: .4byte gUnknown_203B0FC _0812DDA0: .4byte gUnknown_203B104 -_0812DDA4: .4byte gUnknown_202063C +_0812DDA4: .4byte gSprites _0812DDA8: .4byte sub_812C694 thumb_func_end sub_812DD50 diff --git a/asm/field_camera.s b/asm/field_camera.s index 5be87081b..a4776d42a 100644 --- a/asm/field_camera.s +++ b/asm/field_camera.s @@ -777,7 +777,7 @@ CameraUpdateCallback: @ 805AB30 ldr r2, [r3, 0x4] cmp r2, 0 beq _0805AB50 - ldr r1, _0805AB54 @ =gUnknown_202063C + ldr r1, _0805AB54 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -792,7 +792,7 @@ _0805AB50: pop {r0} bx r0 .align 2, 0 -_0805AB54: .4byte gUnknown_202063C +_0805AB54: .4byte gSprites thumb_func_end CameraUpdateCallback thumb_func_start ResetCameraUpdateInfo @@ -822,7 +822,7 @@ InitCameraUpdateCallback: @ 805AB70 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805ABA8 @ =gUnknown_202063C + ldr r1, _0805ABA8 @ =gSprites adds r0, r1 bl DestroySprite _0805AB8C: @@ -839,7 +839,7 @@ _0805AB8C: bx r1 .align 2, 0 _0805ABA4: .4byte gUnknown_3005050 -_0805ABA8: .4byte gUnknown_202063C +_0805ABA8: .4byte gSprites _0805ABAC: .4byte CameraUpdateCallback thumb_func_end InitCameraUpdateCallback @@ -1183,14 +1183,14 @@ UpdateCameraPanning: @ 805AE28 beq _0805AE36 bl _call_via_r0 _0805AE36: - ldr r2, _0805AE5C @ =gUnknown_2021BC8 + ldr r2, _0805AE5C @ =gSpriteCoordOffsetX ldr r0, _0805AE60 @ =gUnknown_300506C ldr r1, _0805AE64 @ =gUnknown_3000E98 ldrh r0, [r0] ldrh r1, [r1] subs r0, r1 strh r0, [r2] - ldr r2, _0805AE68 @ =gUnknown_2021BCA + ldr r2, _0805AE68 @ =gSpriteCoordOffsetY ldr r0, _0805AE6C @ =gUnknown_3005068 ldr r1, _0805AE70 @ =gUnknown_3000E9A ldrh r0, [r0] @@ -1202,10 +1202,10 @@ _0805AE36: bx r0 .align 2, 0 _0805AE58: .4byte gUnknown_3000EA0 -_0805AE5C: .4byte gUnknown_2021BC8 +_0805AE5C: .4byte gSpriteCoordOffsetX _0805AE60: .4byte gUnknown_300506C _0805AE64: .4byte gUnknown_3000E98 -_0805AE68: .4byte gUnknown_2021BCA +_0805AE68: .4byte gSpriteCoordOffsetY _0805AE6C: .4byte gUnknown_3005068 _0805AE70: .4byte gUnknown_3000E9A thumb_func_end UpdateCameraPanning diff --git a/asm/field_effect.s b/asm/field_effect.s index cef2ed259..4bf2ebf48 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -385,7 +385,7 @@ FieldEffectFreeTilesIfUnused: @ 80836F0 cmp r3, r0 beq _08083744 movs r2, 0 - ldr r5, _08083750 @ =gUnknown_202063C + ldr r5, _08083750 @ =gSprites _0808370A: lsls r0, r2, 4 adds r0, r2 @@ -422,7 +422,7 @@ _08083744: bx r0 .align 2, 0 _0808374C: .4byte 0x0000ffff -_08083750: .4byte gUnknown_202063C +_08083750: .4byte gSprites thumb_func_end FieldEffectFreeTilesIfUnused thumb_func_start FieldEffectFreePaletteIfUnused @@ -438,7 +438,7 @@ FieldEffectFreePaletteIfUnused: @ 8083754 cmp r5, r0 beq _0808379C movs r2, 0 - ldr r6, _080837A8 @ =gUnknown_202063C + ldr r6, _080837A8 @ =gSprites adds r3, r4, 0 _08083770: lsls r0, r2, 4 @@ -469,7 +469,7 @@ _0808379C: bx r0 .align 2, 0 _080837A4: .4byte 0x0000ffff -_080837A8: .4byte gUnknown_202063C +_080837A8: .4byte gSprites thumb_func_end FieldEffectFreePaletteIfUnused thumb_func_start FieldEffectActiveListClear @@ -623,12 +623,12 @@ CreateTrainerSprite: @ 8083858 strh r0, [r1, 0x2] ldr r0, _080838E8 @ =gUnknown_83CBE50 str r0, [sp, 0x4] - ldr r0, _080838EC @ =gUnknown_8231CF0 + ldr r0, _080838EC @ =gDummySpriteAnimTable str r0, [sp, 0x8] str r2, [sp, 0xC] - ldr r0, _080838F0 @ =gUnknown_8231CFC + ldr r0, _080838F0 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x10] - ldr r0, _080838F4 @ =nullsub_8 + ldr r0, _080838F4 @ =SpriteCallbackDummy str r0, [sp, 0x14] lsls r5, 16 asrs r5, 16 @@ -652,9 +652,9 @@ CreateTrainerSprite: @ 8083858 _080838E0: .4byte gUnknown_8239A1C _080838E4: .4byte gUnknown_823957C _080838E8: .4byte gUnknown_83CBE50 -_080838EC: .4byte gUnknown_8231CF0 -_080838F0: .4byte gUnknown_8231CFC -_080838F4: .4byte nullsub_8 +_080838EC: .4byte gDummySpriteAnimTable +_080838F0: .4byte gDummySpriteAffineAnimTable +_080838F4: .4byte SpriteCallbackDummy thumb_func_end CreateTrainerSprite thumb_func_start LoadTrainerGfx_TrainerCard @@ -1089,7 +1089,7 @@ PokecenterHealEffect_0: @ 8083C00 PokecenterHealEffect_1: @ 8083C3C push {r4,lr} adds r2, r0, 0 - ldr r3, _08083C74 @ =gUnknown_202063C + ldr r3, _08083C74 @ =gSprites movs r1, 0x14 ldrsh r0, [r2, r1] lsls r1, r0, 4 @@ -1117,14 +1117,14 @@ _08083C6E: pop {r0} bx r0 .align 2, 0 -_08083C74: .4byte gUnknown_202063C +_08083C74: .4byte gSprites thumb_func_end PokecenterHealEffect_1 thumb_func_start sub_8083C78 sub_8083C78: @ 8083C78 push {lr} adds r3, r0, 0 - ldr r2, _08083C9C @ =gUnknown_202063C + ldr r2, _08083C9C @ =gSprites movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -1142,13 +1142,13 @@ _08083C98: pop {r0} bx r0 .align 2, 0 -_08083C9C: .4byte gUnknown_202063C +_08083C9C: .4byte gSprites thumb_func_end sub_8083C78 thumb_func_start PokecenterHealEffect_3 PokecenterHealEffect_3: @ 8083CA0 push {lr} - ldr r2, _08083CD8 @ =gUnknown_202063C + ldr r2, _08083CD8 @ =gSprites movs r3, 0x14 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -1172,7 +1172,7 @@ _08083CD2: pop {r0} bx r0 .align 2, 0 -_08083CD8: .4byte gUnknown_202063C +_08083CD8: .4byte gSprites _08083CDC: .4byte sub_8083BD0 thumb_func_end PokecenterHealEffect_3 @@ -1259,7 +1259,7 @@ HallOfFameRecordEffect_0: @ 8083D4C sub_8083D74: @ 8083D74 push {r4,lr} adds r4, r0, 0 - ldr r2, _08083DA8 @ =gUnknown_202063C + ldr r2, _08083DA8 @ =gSprites movs r0, 0x14 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -1284,14 +1284,14 @@ _08083DA2: pop {r0} bx r0 .align 2, 0 -_08083DA8: .4byte gUnknown_202063C +_08083DA8: .4byte gSprites thumb_func_end sub_8083D74 thumb_func_start sub_8083DAC sub_8083DAC: @ 8083DAC push {lr} adds r3, r0, 0 - ldr r2, _08083DD0 @ =gUnknown_202063C + ldr r2, _08083DD0 @ =gSprites movs r0, 0x14 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -1309,13 +1309,13 @@ _08083DCC: pop {r0} bx r0 .align 2, 0 -_08083DD0: .4byte gUnknown_202063C +_08083DD0: .4byte gSprites thumb_func_end sub_8083DAC thumb_func_start sub_8083DD4 sub_8083DD4: @ 8083DD4 push {lr} - ldr r2, _08083E0C @ =gUnknown_202063C + ldr r2, _08083E0C @ =gSprites movs r3, 0x14 ldrsh r1, [r0, r3] lsls r0, r1, 4 @@ -1339,7 +1339,7 @@ _08083E06: pop {r0} bx r0 .align 2, 0 -_08083E0C: .4byte gUnknown_202063C +_08083E0C: .4byte gSprites _08083E10: .4byte sub_8083D1C thumb_func_end sub_8083DD4 @@ -1368,7 +1368,7 @@ sub_8083E14: @ 8083E14 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r2, _08083E6C @ =gUnknown_202063C + ldr r2, _08083E6C @ =gSprites adds r1, r2 strh r4, [r1, 0x24] strh r5, [r1, 0x26] @@ -1387,7 +1387,7 @@ sub_8083E14: @ 8083E14 bx r1 .align 2, 0 _08083E68: .4byte sub_8083E70 -_08083E6C: .4byte gUnknown_202063C +_08083E6C: .4byte gSprites thumb_func_end sub_8083E14 thumb_func_start sub_8083E70 @@ -1443,7 +1443,7 @@ _08083EA4: bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 - ldr r2, _08083F20 @ =gUnknown_202063C + ldr r2, _08083F20 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1482,7 +1482,7 @@ _08083F12: .align 2, 0 _08083F18: .4byte gUnknown_83CBF88 _08083F1C: .4byte gUnknown_83CC010 -_08083F20: .4byte gUnknown_202063C +_08083F20: .4byte gSprites thumb_func_end PokeballGlowEffect_0 thumb_func_start PokeballGlowEffect_1 @@ -1835,7 +1835,7 @@ nullsub_50: @ 80841D4 SpriteCB_PokeballGlow: @ 80841D8 push {lr} adds r3, r0, 0 - ldr r2, _080841FC @ =gUnknown_202063C + ldr r2, _080841FC @ =gSprites movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -1852,7 +1852,7 @@ _080841F8: pop {r0} bx r0 .align 2, 0 -_080841FC: .4byte gUnknown_202063C +_080841FC: .4byte gSprites thumb_func_end SpriteCB_PokeballGlow thumb_func_start PokecenterHealEffectHelper @@ -1873,7 +1873,7 @@ PokecenterHealEffectHelper: @ 8084200 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, _08084248 @ =gUnknown_202063C + ldr r1, _08084248 @ =gSprites adds r2, r1 ldrb r3, [r2, 0x5] movs r1, 0xD @@ -1891,7 +1891,7 @@ PokecenterHealEffectHelper: @ 8084200 bx r1 .align 2, 0 _08084244: .4byte gUnknown_83CBFA0 -_08084248: .4byte gUnknown_202063C +_08084248: .4byte gSprites thumb_func_end PokecenterHealEffectHelper thumb_func_start sub_808424C @@ -2221,7 +2221,7 @@ sub_80844BC: @ 80844BC lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08084560 @ =gUnknown_202063C + ldr r0, _08084560 @ =gSprites adds r4, r0 bl CameraObjectReset2 ldrb r1, [r6, 0x5] @@ -2280,7 +2280,7 @@ sub_80844BC: @ 80844BC .align 2, 0 _08084558: .4byte gUnknown_2037078 _0808455C: .4byte gUnknown_2036E38 -_08084560: .4byte gUnknown_202063C +_08084560: .4byte gSprites thumb_func_end sub_80844BC thumb_func_start sub_8084564 @@ -2310,7 +2310,7 @@ sub_8084580: @ 8084580 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080845E8 @ =gUnknown_202063C + ldr r0, _080845E8 @ =gSprites adds r2, r0 adds r0, r2, 0 adds r0, 0x29 @@ -2319,7 +2319,7 @@ sub_8084580: @ 8084580 lsls r0, r4, 17 negs r0, r0 ldrh r1, [r2, 0x22] - ldr r3, _080845EC @ =gUnknown_2021BCA + ldr r3, _080845EC @ =gSpriteCoordOffsetY adds r1, r4 ldrh r3, [r3] adds r1, r3 @@ -2353,8 +2353,8 @@ sub_8084580: @ 8084580 bx r1 .align 2, 0 _080845E4: .4byte gUnknown_2037078 -_080845E8: .4byte gUnknown_202063C -_080845EC: .4byte gUnknown_2021BCA +_080845E8: .4byte gSprites +_080845EC: .4byte gSpriteCoordOffsetY _080845F0: .4byte gUnknown_2036E38 thumb_func_end sub_8084580 @@ -2373,7 +2373,7 @@ sub_80845F4: @ 80845F4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080846A8 @ =gUnknown_202063C + ldr r1, _080846A8 @ =gSprites adds r5, r0, r1 ldrh r0, [r4, 0xA] ldrh r1, [r5, 0x26] @@ -2451,7 +2451,7 @@ _08084698: .align 2, 0 _080846A0: .4byte gUnknown_2037078 _080846A4: .4byte gUnknown_2036E38 -_080846A8: .4byte gUnknown_202063C +_080846A8: .4byte gSprites thumb_func_end sub_80845F4 thumb_func_start sub_80846AC @@ -2765,7 +2765,7 @@ sub_80848F8: @ 80848F8 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08084940 @ =gUnknown_202063C + ldr r0, _08084940 @ =gSprites adds r4, r0 movs r0, 0xC ldrsh r1, [r5, r0] @@ -2793,7 +2793,7 @@ _08084936: bx r0 .align 2, 0 _0808493C: .4byte gUnknown_2037078 -_08084940: .4byte gUnknown_202063C +_08084940: .4byte gSprites thumb_func_end sub_80848F8 thumb_func_start sub_8084944 @@ -2805,7 +2805,7 @@ sub_8084944: @ 8084944 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808498C @ =gUnknown_202063C + ldr r0, _0808498C @ =gSprites adds r4, r0 movs r0, 0xC ldrsh r1, [r5, r0] @@ -2833,7 +2833,7 @@ _08084982: bx r0 .align 2, 0 _08084988: .4byte gUnknown_2037078 -_0808498C: .4byte gUnknown_202063C +_0808498C: .4byte gSprites thumb_func_end sub_8084944 thumb_func_start sub_8084990 @@ -3001,7 +3001,7 @@ sub_8084AD8: @ 8084AD8 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08084B14 @ =gUnknown_202063C + ldr r0, _08084B14 @ =gSprites adds r4, r0 movs r0, 0xA ldrsh r1, [r5, r0] @@ -3022,7 +3022,7 @@ sub_8084AD8: @ 8084AD8 bx r1 .align 2, 0 _08084B10: .4byte gUnknown_2037078 -_08084B14: .4byte gUnknown_202063C +_08084B14: .4byte gSprites thumb_func_end sub_8084AD8 thumb_func_start sub_8084B18 @@ -3034,7 +3034,7 @@ sub_8084B18: @ 8084B18 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08084B74 @ =gUnknown_202063C + ldr r1, _08084B74 @ =gSprites adds r5, r0, r1 movs r0, 0xA ldrsh r1, [r4, r0] @@ -3072,7 +3072,7 @@ _08084B66: bx r1 .align 2, 0 _08084B70: .4byte gUnknown_2037078 -_08084B74: .4byte gUnknown_202063C +_08084B74: .4byte gSprites thumb_func_end sub_8084B18 thumb_func_start sub_8084B78 @@ -3084,7 +3084,7 @@ sub_8084B78: @ 8084B78 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08084BB4 @ =gUnknown_202063C + ldr r0, _08084BB4 @ =gSprites adds r4, r0 movs r0, 0xA ldrsh r1, [r5, r0] @@ -3105,7 +3105,7 @@ sub_8084B78: @ 8084B78 bx r1 .align 2, 0 _08084BB0: .4byte gUnknown_2037078 -_08084BB4: .4byte gUnknown_202063C +_08084BB4: .4byte gSprites thumb_func_end sub_8084B78 thumb_func_start sub_8084BB8 @@ -3117,7 +3117,7 @@ sub_8084BB8: @ 8084BB8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08084C14 @ =gUnknown_202063C + ldr r1, _08084C14 @ =gSprites adds r5, r0, r1 movs r0, 0xA ldrsh r1, [r4, r0] @@ -3156,7 +3156,7 @@ _08084C08: bx r1 .align 2, 0 _08084C10: .4byte gUnknown_2037078 -_08084C14: .4byte gUnknown_202063C +_08084C14: .4byte gSprites thumb_func_end sub_8084BB8 thumb_func_start sub_8084C18 @@ -3606,7 +3606,7 @@ _08084F58: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08084F9C @ =gUnknown_202063C + ldr r0, _08084F9C @ =gSprites adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -3622,7 +3622,7 @@ _08084F8C: .4byte gUnknown_83CC0A4 _08084F90: .4byte gUnknown_3005090 _08084F94: .4byte gUnknown_2037078 _08084F98: .4byte gUnknown_2036E38 -_08084F9C: .4byte gUnknown_202063C +_08084F9C: .4byte gSprites thumb_func_end sub_8084F44 thumb_func_start sub_8084FA0 @@ -3779,7 +3779,7 @@ _080850A4: movs r7, 0x22 ldrsh r0, [r5, r7] adds r0, r1 - ldr r1, _080850E8 @ =gUnknown_2021BCA + ldr r1, _080850E8 @ =gSpriteCoordOffsetY movs r7, 0 ldrsh r1, [r1, r7] adds r0, r1 @@ -3799,7 +3799,7 @@ _080850A4: strh r0, [r4, 0xE] b _080850F0 .align 2, 0 -_080850E8: .4byte gUnknown_2021BCA +_080850E8: .4byte gSpriteCoordOffsetY _080850EC: movs r0, 0x1 strh r0, [r4, 0x10] @@ -3952,7 +3952,7 @@ _080851FC: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08085240 @ =gUnknown_202063C + ldr r0, _08085240 @ =gSprites adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -3968,7 +3968,7 @@ _08085230: .4byte gUnknown_83CC0BC _08085234: .4byte gUnknown_3005090 _08085238: .4byte gUnknown_2037078 _0808523C: .4byte gUnknown_2036E38 -_08085240: .4byte gUnknown_202063C +_08085240: .4byte gSprites thumb_func_end sub_80851E8 thumb_func_start sub_8085244 @@ -4047,7 +4047,7 @@ sub_80852C0: @ 80852C0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08085310 @ =gUnknown_202063C + ldr r1, _08085310 @ =gSprites adds r0, r1 adds r0, 0x2B ldrb r0, [r0] @@ -4077,7 +4077,7 @@ _08085308: pop {r1} bx r1 .align 2, 0 -_08085310: .4byte gUnknown_202063C +_08085310: .4byte gSprites thumb_func_end sub_80852C0 thumb_func_start sub_8085314 @@ -4127,7 +4127,7 @@ FldEff_LavaridgeGymWarp: @ 808534C bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 - ldr r1, _080853AC @ =gUnknown_202063C + ldr r1, _080853AC @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -4153,7 +4153,7 @@ FldEff_LavaridgeGymWarp: @ 808534C .align 2, 0 _080853A4: .4byte gUnknown_20386E0 _080853A8: .4byte gUnknown_83A0010 -_080853AC: .4byte gUnknown_202063C +_080853AC: .4byte gSprites thumb_func_end FldEff_LavaridgeGymWarp thumb_func_start sub_80853B0 @@ -4215,7 +4215,7 @@ _080853F8: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _0808543C @ =gUnknown_202063C + ldr r0, _0808543C @ =gSprites adds r2, r0 ldr r3, [r3] adds r0, r4, 0 @@ -4231,7 +4231,7 @@ _0808542C: .4byte gUnknown_83CC0CC _08085430: .4byte gUnknown_3005090 _08085434: .4byte gUnknown_2037078 _08085438: .4byte gUnknown_2036E38 -_0808543C: .4byte gUnknown_202063C +_0808543C: .4byte gSprites thumb_func_end sub_80853E4 thumb_func_start sub_8085440 @@ -4326,7 +4326,7 @@ sub_80854EC: @ 80854EC push {r4,lr} adds r3, r0, 0 adds r4, r1, 0 - ldr r2, _08085520 @ =gUnknown_202063C + ldr r2, _08085520 @ =gSprites movs r0, 0xA ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -4350,7 +4350,7 @@ _08085516: pop {r1} bx r1 .align 2, 0 -_08085520: .4byte gUnknown_202063C +_08085520: .4byte gSprites thumb_func_end sub_80854EC thumb_func_start sub_8085524 @@ -4431,7 +4431,7 @@ FldEff_PopOutOfAsh: @ 80855A0 bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 - ldr r1, _08085600 @ =gUnknown_202063C + ldr r1, _08085600 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -4457,7 +4457,7 @@ FldEff_PopOutOfAsh: @ 80855A0 .align 2, 0 _080855F8: .4byte gUnknown_20386E0 _080855FC: .4byte gUnknown_83A0010 -_08085600: .4byte gUnknown_202063C +_08085600: .4byte gSprites thumb_func_end FldEff_PopOutOfAsh thumb_func_start sub_8085604 @@ -4715,7 +4715,7 @@ sub_80857F0: @ 80857F0 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08085818 @ =gUnknown_202063C + ldr r0, _08085818 @ =gSprites adds r4, r1, r0 movs r1, 0 ldrsh r0, [r5, r1] @@ -4727,7 +4727,7 @@ sub_80857F0: @ 80857F0 beq _08085826 b _0808589A .align 2, 0 -_08085818: .4byte gUnknown_202063C +_08085818: .4byte gSprites _0808581C: cmp r0, 0x2 beq _08085878 @@ -4820,7 +4820,7 @@ sub_80858A4: @ 80858A4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080858D8 @ =gUnknown_202063C + ldr r0, _080858D8 @ =gSprites adds r4, r1, r0 movs r1, 0 ldrsh r0, [r5, r1] @@ -4832,7 +4832,7 @@ sub_80858A4: @ 80858A4 beq _080858E6 b _080859C2 .align 2, 0 -_080858D8: .4byte gUnknown_202063C +_080858D8: .4byte gSprites _080858DC: cmp r0, 0x2 beq _0808599C @@ -5305,7 +5305,7 @@ sub_8085C60: @ 8085C60 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08085D30 @ =gUnknown_202063C + ldr r1, _08085D30 @ =gSprites adds r5, r0, r1 ldrh r0, [r4, 0xA] subs r0, 0x1 @@ -5388,7 +5388,7 @@ _08085D1A: _08085D24: .4byte gUnknown_83CC108 _08085D28: .4byte gUnknown_2037078 _08085D2C: .4byte gUnknown_2036E38 -_08085D30: .4byte gUnknown_202063C +_08085D30: .4byte gSprites thumb_func_end sub_8085C60 thumb_func_start sub_8085D34 @@ -5501,7 +5501,7 @@ sub_8085E0C: @ 8085E0C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08085E8C @ =gUnknown_202063C + ldr r0, _08085E8C @ =gSprites adds r2, r0 adds r0, r2, 0 adds r0, 0x29 @@ -5510,7 +5510,7 @@ sub_8085E0C: @ 8085E0C lsls r0, r4, 17 negs r0, r0 ldrh r1, [r2, 0x22] - ldr r3, _08085E90 @ =gUnknown_2021BCA + ldr r3, _08085E90 @ =gSpriteCoordOffsetY adds r1, r4 ldrh r3, [r3] adds r1, r3 @@ -5552,8 +5552,8 @@ _08085E82: bx r0 .align 2, 0 _08085E88: .4byte gUnknown_2037078 -_08085E8C: .4byte gUnknown_202063C -_08085E90: .4byte gUnknown_2021BCA +_08085E8C: .4byte gSprites +_08085E90: .4byte gSpriteCoordOffsetY _08085E94: .4byte gUnknown_2036E38 thumb_func_end sub_8085E0C @@ -5577,7 +5577,7 @@ sub_8085E98: @ 8085E98 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08085F0C @ =gUnknown_202063C + ldr r1, _08085F0C @ =gSprites adds r5, r0, r1 ldrh r0, [r4, 0xA] ldrh r1, [r5, 0x26] @@ -5614,7 +5614,7 @@ sub_8085E98: @ 8085E98 _08085F00: .4byte gUnknown_83CC108 _08085F04: .4byte gUnknown_2037078 _08085F08: .4byte gUnknown_2036E38 -_08085F0C: .4byte gUnknown_202063C +_08085F0C: .4byte gSprites _08085F10: ldrb r1, [r5, 0x5] movs r0, 0xD @@ -6029,7 +6029,7 @@ _08086238: bne _08086278 cmp r1, 0x78 bne _08086278 - ldr r2, _08086280 @ =gUnknown_202063C + ldr r2, _08086280 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -6047,7 +6047,7 @@ _08086278: pop {r0} bx r0 .align 2, 0 -_08086280: .4byte gUnknown_202063C +_08086280: .4byte gSprites _08086284: .4byte sub_80868C0 thumb_func_end sub_80861FC @@ -6058,7 +6058,7 @@ sub_8086288: @ 8086288 ldrh r0, [r3, 0x12] subs r0, 0x10 strh r0, [r3, 0x12] - ldr r2, _080862B4 @ =gUnknown_202063C + ldr r2, _080862B4 @ =gSprites movs r0, 0x26 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -6076,7 +6076,7 @@ _080862AE: pop {r0} bx r0 .align 2, 0 -_080862B4: .4byte gUnknown_202063C +_080862B4: .4byte gSprites thumb_func_end sub_8086288 thumb_func_start sub_80862B8 @@ -6191,7 +6191,7 @@ sub_8086358: @ 8086358 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080863B8 @ =gUnknown_202063C + ldr r1, _080863B8 @ =gSprites adds r0, r1 ldrh r1, [r4, 0x26] lsls r1, 24 @@ -6209,7 +6209,7 @@ sub_8086358: @ 8086358 pop {r0} bx r0 .align 2, 0 -_080863B8: .4byte gUnknown_202063C +_080863B8: .4byte gSprites _080863BC: .4byte sub_80860E0 thumb_func_end sub_8086358 @@ -6432,7 +6432,7 @@ sub_8086554: @ 8086554 ldr r1, _080865B4 @ =0x00002878 movs r0, 0x46 bl SetGpuReg - ldr r2, _080865B8 @ =gUnknown_202063C + ldr r2, _080865B8 @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6453,7 +6453,7 @@ _080865A6: bx r0 .align 2, 0 _080865B4: .4byte 0x00002878 -_080865B8: .4byte gUnknown_202063C +_080865B8: .4byte gSprites _080865BC: .4byte sub_80868C0 thumb_func_end sub_8086554 @@ -6462,7 +6462,7 @@ sub_80865C0: @ 80865C0 push {r4,lr} adds r4, r0, 0 bl sub_8086728 - ldr r2, _080865EC @ =gUnknown_202063C + ldr r2, _080865EC @ =gSprites movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -6481,7 +6481,7 @@ _080865E4: pop {r0} bx r0 .align 2, 0 -_080865EC: .4byte gUnknown_202063C +_080865EC: .4byte gSprites thumb_func_end sub_80865C0 thumb_func_start sub_80865F0 @@ -6574,7 +6574,7 @@ sub_8086650: @ 8086650 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080866D8 @ =gUnknown_202063C + ldr r1, _080866D8 @ =gSprites adds r0, r1 ldrh r1, [r4, 0x26] lsls r1, 24 @@ -6593,7 +6593,7 @@ sub_8086650: @ 8086650 bx r0 .align 2, 0 _080866D4: .4byte 0x05000200 -_080866D8: .4byte gUnknown_202063C +_080866D8: .4byte gSprites _080866DC: .4byte sub_8086468 thumb_func_end sub_8086650 @@ -6831,9 +6831,9 @@ sub_8086860: @ 8086860 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, _080868B8 @ =gUnknown_202063C + ldr r1, _080868B8 @ =gSprites adds r2, r1 - ldr r1, _080868BC @ =nullsub_8 + ldr r1, _080868BC @ =SpriteCallbackDummy str r1, [r2, 0x1C] ldrb r3, [r2, 0x5] movs r1, 0xD @@ -6848,8 +6848,8 @@ sub_8086860: @ 8086860 bx r1 .align 2, 0 _080868B4: .4byte 0x7fffffff -_080868B8: .4byte gUnknown_202063C -_080868BC: .4byte nullsub_8 +_080868B8: .4byte gSprites +_080868BC: .4byte SpriteCallbackDummy thumb_func_end sub_8086860 thumb_func_start sub_80868C0 @@ -7443,7 +7443,7 @@ sub_8086D38: @ 8086D38 lsls r2, r4, 4 adds r2, r4 lsls r2, 2 - ldr r0, _08086D88 @ =gUnknown_202063C + ldr r0, _08086D88 @ =gSprites adds r2, r0 ldrb r1, [r2, 0x5] movs r0, 0xF @@ -7467,7 +7467,7 @@ sub_8086D38: @ 8086D38 bx r1 .align 2, 0 _08086D84: .4byte gUnknown_83A0010 -_08086D88: .4byte gUnknown_202063C +_08086D88: .4byte gSprites _08086D8C: .4byte sub_8086D94 _08086D90: .4byte gUnknown_20386E0 thumb_func_end sub_8086D38 @@ -7501,7 +7501,7 @@ sub_8086D94: @ 8086D94 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08086E0C @ =gUnknown_202063C + ldr r0, _08086E0C @ =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -7534,7 +7534,7 @@ _08086E06: pop {r0} bx r0 .align 2, 0 -_08086E0C: .4byte gUnknown_202063C +_08086E0C: .4byte gSprites thumb_func_end sub_8086D94 thumb_func_start FldEff_UseFly @@ -7814,7 +7814,7 @@ sub_8086FFC: @ 8086FFC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08087068 @ =gUnknown_202063C + ldr r1, _08087068 @ =gSprites adds r0, r1 movs r1, 0x16 bl StartSpriteAnim @@ -7837,7 +7837,7 @@ _0808705A: .align 2, 0 _08087060: .4byte gUnknown_2037078 _08087064: .4byte gUnknown_2036E38 -_08087068: .4byte gUnknown_202063C +_08087068: .4byte gSprites thumb_func_end sub_8086FFC thumb_func_start sub_808706C @@ -7878,7 +7878,7 @@ sub_808706C: @ 808706C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0808710C @ =gUnknown_202063C + ldr r4, _0808710C @ =gSprites adds r0, r4 ldr r1, _08087110 @ =gSaveBlock2Ptr ldr r1, [r1] @@ -7916,7 +7916,7 @@ _080870FC: .align 2, 0 _08087104: .4byte gUnknown_2037078 _08087108: .4byte gUnknown_2036E38 -_0808710C: .4byte gUnknown_202063C +_0808710C: .4byte gSprites _08087110: .4byte gSaveBlock2Ptr _08087114: .4byte sub_8087828 thumb_func_end sub_808706C @@ -7978,7 +7978,7 @@ sub_8087168: @ 8087168 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, _080871A4 @ =gUnknown_202063C + ldr r1, _080871A4 @ =gSprites adds r2, r1 ldrb r3, [r2, 0x5] movs r1, 0xF @@ -7995,7 +7995,7 @@ sub_8087168: @ 8087168 bx r1 .align 2, 0 _080871A0: .4byte gUnknown_83A0010 -_080871A4: .4byte gUnknown_202063C +_080871A4: .4byte gSprites _080871A8: .4byte sub_8087220 thumb_func_end sub_8087168 @@ -8003,7 +8003,7 @@ _080871A8: .4byte sub_8087220 sub_80871AC: @ 80871AC lsls r0, 24 lsrs r0, 24 - ldr r2, _080871C4 @ =gUnknown_202063C + ldr r2, _080871C4 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -8013,7 +8013,7 @@ sub_80871AC: @ 80871AC lsrs r0, 24 bx lr .align 2, 0 -_080871C4: .4byte gUnknown_202063C +_080871C4: .4byte gSprites thumb_func_end sub_80871AC thumb_func_start sub_80871C8 @@ -8024,7 +8024,7 @@ sub_80871C8: @ 80871C8 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _080871FC @ =gUnknown_202063C + ldr r0, _080871FC @ =gSprites adds r4, r0 ldr r0, _08087200 @ =sub_80872F0 str r0, [r4, 0x1C] @@ -8044,7 +8044,7 @@ sub_80871C8: @ 80871C8 pop {r0} bx r0 .align 2, 0 -_080871FC: .4byte gUnknown_202063C +_080871FC: .4byte gSprites _08087200: .4byte sub_80872F0 thumb_func_end sub_80871C8 @@ -8054,7 +8054,7 @@ sub_8087204: @ 8087204 lsrs r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _0808721C @ =gUnknown_202063C + ldr r3, _0808721C @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -8062,7 +8062,7 @@ sub_8087204: @ 8087204 strh r1, [r2, 0x3A] bx lr .align 2, 0 -_0808721C: .4byte gUnknown_202063C +_0808721C: .4byte gSprites thumb_func_end sub_8087204 thumb_func_start sub_8087220 @@ -8197,7 +8197,7 @@ sub_80872F0: @ 80872F0 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08087360 @ =gUnknown_202063C + ldr r0, _08087360 @ =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -8229,7 +8229,7 @@ _0808735A: pop {r0} bx r0 .align 2, 0 -_08087360: .4byte gUnknown_202063C +_08087360: .4byte gSprites thumb_func_end sub_80872F0 thumb_func_start sub_8087364 @@ -8367,7 +8367,7 @@ sub_8087458: @ 8087458 lsrs r4, 24 adds r0, r4, 0 bl sub_80871C8 - ldr r1, _0808747C @ =gUnknown_202063C + ldr r1, _0808747C @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -8379,7 +8379,7 @@ sub_8087458: @ 8087458 pop {r0} bx r0 .align 2, 0 -_0808747C: .4byte gUnknown_202063C +_0808747C: .4byte gSprites _08087480: .4byte sub_8087364 thumb_func_end sub_8087458 @@ -8477,7 +8477,7 @@ _0808751A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080875BC @ =gUnknown_202063C + ldr r4, _080875BC @ =gSprites adds r0, r4 movs r1, 0x16 bl StartSpriteAnim @@ -8533,7 +8533,7 @@ _080875AE: .align 2, 0 _080875B4: .4byte gUnknown_2037078 _080875B8: .4byte gUnknown_2036E38 -_080875BC: .4byte gUnknown_202063C +_080875BC: .4byte gSprites _080875C0: .4byte gSaveBlock2Ptr _080875C4: .4byte sub_8087828 thumb_func_end sub_80874C8 @@ -8547,7 +8547,7 @@ sub_80875C8: @ 80875C8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _08087638 @ =gUnknown_202063C + ldr r6, _08087638 @ =gSprites adds r0, r6 bl sub_80878C0 ldrh r1, [r5, 0xC] @@ -8596,7 +8596,7 @@ _08087630: pop {r0} bx r0 .align 2, 0 -_08087638: .4byte gUnknown_202063C +_08087638: .4byte gSprites _0808763C: .4byte gUnknown_2037078 _08087640: .4byte gUnknown_2036E38 thumb_func_end sub_80875C8 @@ -8615,7 +8615,7 @@ sub_8087644: @ 8087644 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08087694 @ =gUnknown_202063C + ldr r0, _08087694 @ =gSprites adds r1, r0 movs r2, 0xC ldrsh r0, [r4, r2] @@ -8641,7 +8641,7 @@ _08087682: .align 2, 0 _0808768C: .4byte gUnknown_83CC1F0 _08087690: .4byte gUnknown_2037078 -_08087694: .4byte gUnknown_202063C +_08087694: .4byte gSprites thumb_func_end sub_8087644 thumb_func_start sub_8087698 @@ -8664,7 +8664,7 @@ sub_8087698: @ 8087698 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0808770C @ =gUnknown_202063C + ldr r0, _0808770C @ =gSprites adds r4, r0 ldrb r1, [r5, 0x1] movs r0, 0x11 @@ -8699,7 +8699,7 @@ _080876FC: .align 2, 0 _08087704: .4byte gUnknown_2037078 _08087708: .4byte gUnknown_2036E38 -_0808770C: .4byte gUnknown_202063C +_0808770C: .4byte gSprites thumb_func_end sub_8087698 thumb_func_start sub_8087710 @@ -8745,7 +8745,7 @@ sub_8087748: @ 8087748 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808777C @ =gUnknown_202063C + ldr r1, _0808777C @ =gSprites adds r0, r1 bl DestroySprite ldrh r0, [r4, 0x8] @@ -8758,7 +8758,7 @@ _08087774: pop {r0} bx r0 .align 2, 0 -_0808777C: .4byte gUnknown_202063C +_0808777C: .4byte gSprites thumb_func_end sub_8087748 thumb_func_start fishE @@ -8871,7 +8871,7 @@ sub_8087828: @ 8087828 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080878BC @ =gUnknown_202063C + ldr r0, _080878BC @ =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -8918,7 +8918,7 @@ _080878B4: pop {r0} bx r0 .align 2, 0 -_080878BC: .4byte gUnknown_202063C +_080878BC: .4byte gSprites thumb_func_end sub_8087828 thumb_func_start sub_80878C0 @@ -8929,7 +8929,7 @@ sub_80878C0: @ 80878C0 lsls r0, r5, 30 cmp r0, 0 beq _08087916 - ldr r1, _0808791C @ =gUnknown_2021BCC + ldr r1, _0808791C @ =gOamMatrices ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r3, r0, 27 @@ -8969,7 +8969,7 @@ _08087916: pop {r0} bx r0 .align 2, 0 -_0808791C: .4byte gUnknown_2021BCC +_0808791C: .4byte gOamMatrices _08087920: .4byte sub_80872F0 thumb_func_end sub_80878C0 @@ -9025,7 +9025,7 @@ sub_8087924: @ 8087924 adds r2, r1 ldrb r0, [r4, 0x4] strh r0, [r2, 0xA] - ldr r3, _080879D4 @ =gUnknown_202063C + ldr r3, _080879D4 @ =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -9058,7 +9058,7 @@ _080879C4: .4byte gUnknown_20386E0 _080879C8: .4byte gUnknown_2036E38 _080879CC: .4byte sub_80879D8 _080879D0: .4byte gUnknown_3005090 -_080879D4: .4byte gUnknown_202063C +_080879D4: .4byte gSprites thumb_func_end sub_8087924 thumb_func_start sub_80879D8 @@ -9076,7 +9076,7 @@ sub_80879D8: @ 80879D8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08087A08 @ =gUnknown_202063C + ldr r1, _08087A08 @ =gSprites adds r6, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -9087,7 +9087,7 @@ sub_80879D8: @ 80879D8 b _08087AA8 .align 2, 0 _08087A04: .4byte gUnknown_3005098 -_08087A08: .4byte gUnknown_202063C +_08087A08: .4byte gSprites _08087A0C: ldrh r0, [r6, 0x20] lsls r0, 4 @@ -9392,7 +9392,7 @@ sub_8087C2C: @ 8087C2C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08087CA8 @ =gUnknown_202063C + ldr r0, _08087CA8 @ =gSprites adds r4, r0 ldrb r0, [r1, 0x1] movs r2, 0x20 @@ -9428,7 +9428,7 @@ _08087C9A: bx r0 .align 2, 0 _08087CA4: .4byte gUnknown_2036E38 -_08087CA8: .4byte gUnknown_202063C +_08087CA8: .4byte gSprites _08087CAC: .4byte 0x0000ffff _08087CB0: .4byte 0x00007fff thumb_func_end sub_8087C2C @@ -9511,7 +9511,7 @@ _08087D32: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08087D8C @ =gUnknown_202063C + ldr r0, _08087D8C @ =gSprites adds r4, r0 lsls r1, r5, 24 lsrs r1, 24 @@ -9539,7 +9539,7 @@ _08087D6E: _08087D80: .4byte gUnknown_300506C _08087D84: .4byte gUnknown_3005068 _08087D88: .4byte gUnknown_83CC2A0 -_08087D8C: .4byte gUnknown_202063C +_08087D8C: .4byte gSprites thumb_func_end sub_8087CFC thumb_func_start sub_8087D90 diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 4640875c8..a26978dfd 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -26,7 +26,7 @@ SetUpReflection: @ 80DAD7C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080DAE2C @ =gUnknown_202063C + ldr r0, _080DAE2C @ =gSprites adds r7, r1, r0 ldr r0, _080DAE30 @ =sub_80DAF50 str r0, [r7, 0x1C] @@ -51,12 +51,12 @@ SetUpReflection: @ 80DAD7C orrs r0, r1 mov r1, r8 strb r0, [r1] - ldr r0, _080DAE38 @ =gUnknown_8231CF0 + ldr r0, _080DAE38 @ =gDummySpriteAnimTable str r0, [r7, 0x8] adds r0, r7, 0 movs r1, 0 bl StartSpriteAnim - ldr r0, _080DAE3C @ =gUnknown_8231CFC + ldr r0, _080DAE3C @ =gDummySpriteAffineAnimTable str r0, [r7, 0x10] mov r1, r8 ldrb r0, [r1] @@ -94,11 +94,11 @@ _080DAE22: pop {r0} bx r0 .align 2, 0 -_080DAE2C: .4byte gUnknown_202063C +_080DAE2C: .4byte gSprites _080DAE30: .4byte sub_80DAF50 _080DAE34: .4byte gUnknown_835B934 -_080DAE38: .4byte gUnknown_8231CF0 -_080DAE3C: .4byte gUnknown_8231CFC +_080DAE38: .4byte gDummySpriteAnimTable +_080DAE3C: .4byte gDummySpriteAffineAnimTable thumb_func_end SetUpReflection thumb_func_start sub_80DAE40 @@ -259,7 +259,7 @@ sub_80DAF50: @ 80DAF50 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DAF9C @ =gUnknown_202063C + ldr r1, _080DAF9C @ =gSprites adds r5, r0, r1 ldr r0, [r7] ldr r1, _080DAFA0 @ =0x00020001 @@ -282,7 +282,7 @@ _080DAF88: b _080DB0AE .align 2, 0 _080DAF98: .4byte gUnknown_2036E38 -_080DAF9C: .4byte gUnknown_202063C +_080DAF9C: .4byte gSprites _080DAFA0: .4byte 0x00020001 _080DAFA4: ldr r1, _080DB0BC @ =gUnknown_835B934 @@ -446,7 +446,7 @@ sub_80DB0C4: @ 80DB0C4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080DB110 @ =gUnknown_202063C + ldr r0, _080DB110 @ =gSprites adds r1, r0 ldrb r2, [r1, 0x5] movs r0, 0xD @@ -468,14 +468,14 @@ _080DB102: bx r1 .align 2, 0 _080DB10C: .4byte gUnknown_83A0010 -_080DB110: .4byte gUnknown_202063C +_080DB110: .4byte gSprites thumb_func_end sub_80DB0C4 thumb_func_start objid_set_invisible objid_set_invisible: @ 80DB114 lsls r0, 24 lsrs r0, 24 - ldr r2, _080DB130 @ =gUnknown_202063C + ldr r2, _080DB130 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -487,7 +487,7 @@ objid_set_invisible: @ 80DB114 strb r0, [r1] bx lr .align 2, 0 -_080DB130: .4byte gUnknown_202063C +_080DB130: .4byte gSprites thumb_func_end objid_set_invisible thumb_func_start sub_80DB134 @@ -508,7 +508,7 @@ sub_80DB134: @ 80DB134 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _080DB1D8 @ =gUnknown_202063C + ldr r1, _080DB1D8 @ =gSprites adds r2, r0, r1 adds r0, r2, 0 adds r0, 0x3E @@ -542,7 +542,7 @@ _080DB17E: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _080DB1D8 @ =gUnknown_202063C + ldr r1, _080DB1D8 @ =gSprites adds r2, r0, r1 mov r0, sp ldrh r0, [r0] @@ -574,7 +574,7 @@ _080DB1CA: pop {r0} bx r0 .align 2, 0 -_080DB1D8: .4byte gUnknown_202063C +_080DB1D8: .4byte gSprites thumb_func_end sub_80DB134 thumb_func_start oei_shadow @@ -613,7 +613,7 @@ oei_shadow: @ 80DB1DC lsrs r1, r0, 24 cmp r1, 0x40 beq _080DB260 - ldr r0, _080DB278 @ =gUnknown_202063C + ldr r0, _080DB278 @ =gSprites lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -652,7 +652,7 @@ _080DB268: .4byte gUnknown_20386E0 _080DB26C: .4byte gUnknown_2036E38 _080DB270: .4byte gUnknown_83A0010 _080DB274: .4byte gUnknown_83FECD2 -_080DB278: .4byte gUnknown_202063C +_080DB278: .4byte gSprites _080DB27C: .4byte gUnknown_83FECD6 thumb_func_end oei_shadow @@ -691,7 +691,7 @@ _080DB2AE: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080DB340 @ =gUnknown_202063C + ldr r0, _080DB340 @ =gSprites adds r1, r0 ldrb r0, [r1, 0x5] movs r2, 0xC @@ -749,7 +749,7 @@ _080DB334: bx r0 .align 2, 0 _080DB33C: .4byte gUnknown_2036E38 -_080DB340: .4byte gUnknown_202063C +_080DB340: .4byte gSprites _080DB344: .4byte 0x00400001 thumb_func_end oamc_shadow @@ -786,7 +786,7 @@ oei_grass_normal: @ 80DB348 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DB3E8 @ =gUnknown_202063C + ldr r1, _080DB3E8 @ =gSprites adds r3, r0, r1 adds r2, r3, 0 adds r2, 0x3E @@ -831,7 +831,7 @@ _080DB3D4: .align 2, 0 _080DB3E0: .4byte gUnknown_20386E0 _080DB3E4: .4byte gUnknown_83A0010 -_080DB3E8: .4byte gUnknown_202063C +_080DB3E8: .4byte gSprites thumb_func_end oei_grass_normal thumb_func_start unc_grass_normal @@ -993,7 +993,7 @@ FldEff_JumpTallGrass: @ 80DB4F4 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DB560 @ =gUnknown_202063C + ldr r0, _080DB560 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -1023,7 +1023,7 @@ _080DB550: .align 2, 0 _080DB558: .4byte gUnknown_20386E0 _080DB55C: .4byte gUnknown_83A0010 -_080DB560: .4byte gUnknown_202063C +_080DB560: .4byte gSprites thumb_func_end FldEff_JumpTallGrass thumb_func_start sub_80DB564 @@ -1040,7 +1040,7 @@ sub_80DB564: @ 80DB564 lsls r2, 24 lsrs r6, r2, 24 movs r5, 0 - ldr r0, _080DB5D4 @ =gUnknown_202063C + ldr r0, _080DB5D4 @ =gSprites mov r8, r0 lsls r3, 16 asrs r3, 16 @@ -1086,7 +1086,7 @@ _080DB588: adds r0, r5, 0 b _080DB5E8 .align 2, 0 -_080DB5D4: .4byte gUnknown_202063C +_080DB5D4: .4byte gSprites _080DB5D8: .4byte unc_grass_normal _080DB5DC: adds r0, r5, 0x1 @@ -1136,7 +1136,7 @@ FldEff_LongGrass: @ 80DB5F4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DB698 @ =gUnknown_202063C + ldr r1, _080DB698 @ =gSprites adds r4, r0, r1 adds r2, r4, 0 adds r2, 0x3E @@ -1182,7 +1182,7 @@ _080DB684: .align 2, 0 _080DB690: .4byte gUnknown_20386E0 _080DB694: .4byte gUnknown_83A0010 -_080DB698: .4byte gUnknown_202063C +_080DB698: .4byte gSprites thumb_func_end FldEff_LongGrass thumb_func_start unc_grass_tall @@ -1336,7 +1336,7 @@ FldEff_JumpLongGrass: @ 80DB798 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DB804 @ =gUnknown_202063C + ldr r0, _080DB804 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -1366,7 +1366,7 @@ _080DB7F4: .align 2, 0 _080DB7FC: .4byte gUnknown_20386E0 _080DB800: .4byte gUnknown_83A0010 -_080DB804: .4byte gUnknown_202063C +_080DB804: .4byte gSprites thumb_func_end FldEff_JumpLongGrass thumb_func_start sub_80DB808 @@ -1397,7 +1397,7 @@ sub_80DB808: @ 80DB808 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r4, _080DB8A8 @ =gUnknown_202063C + ldr r4, _080DB8A8 @ =gSprites adds r2, r4 adds r3, r2, 0 adds r3, 0x3E @@ -1448,7 +1448,7 @@ _080DB894: _080DB89C: .4byte gUnknown_20386E0 _080DB8A0: .4byte gUnknown_2036E38 _080DB8A4: .4byte gUnknown_83A0010 -_080DB8A8: .4byte gUnknown_202063C +_080DB8A8: .4byte gSprites thumb_func_end sub_80DB808 thumb_func_start sub_80DB8AC @@ -1504,7 +1504,7 @@ _080DB8F8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DB99C @ =gUnknown_202063C + ldr r1, _080DB99C @ =gSprites adds r6, r0, r1 ldrh r5, [r6, 0x22] ldrh r7, [r6, 0x20] @@ -1573,7 +1573,7 @@ _080DB98E: pop {r0} bx r0 .align 2, 0 -_080DB99C: .4byte gUnknown_202063C +_080DB99C: .4byte gSprites thumb_func_end sub_80DB8AC thumb_func_start FldEff_SandFootprints @@ -1600,7 +1600,7 @@ FldEff_SandFootprints: @ 80DB9A0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DBA10 @ =gUnknown_202063C + ldr r1, _080DBA10 @ =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -1630,7 +1630,7 @@ _080DB9FE: .align 2, 0 _080DBA08: .4byte gUnknown_20386E0 _080DBA0C: .4byte gUnknown_83A0010 -_080DBA10: .4byte gUnknown_202063C +_080DBA10: .4byte gSprites thumb_func_end FldEff_SandFootprints thumb_func_start FldEff_DeepSandFootprints @@ -1658,7 +1658,7 @@ FldEff_DeepSandFootprints: @ 80DBA14 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DBA84 @ =gUnknown_202063C + ldr r1, _080DBA84 @ =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -1688,7 +1688,7 @@ _080DBA74: .align 2, 0 _080DBA7C: .4byte gUnknown_20386E0 _080DBA80: .4byte gUnknown_83A0010 -_080DBA84: .4byte gUnknown_202063C +_080DBA84: .4byte gSprites thumb_func_end FldEff_DeepSandFootprints thumb_func_start FldEff_BikeTireTracks @@ -1716,7 +1716,7 @@ FldEff_BikeTireTracks: @ 80DBA88 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DBAF8 @ =gUnknown_202063C + ldr r1, _080DBAF8 @ =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -1746,7 +1746,7 @@ _080DBAE8: .align 2, 0 _080DBAF0: .4byte gUnknown_20386E0 _080DBAF4: .4byte gUnknown_83A0010 -_080DBAF8: .4byte gUnknown_202063C +_080DBAF8: .4byte gSprites thumb_func_end FldEff_BikeTireTracks thumb_func_start sub_80DBAFC @@ -1856,7 +1856,7 @@ FldEff_Splash: @ 80DBB88 lsls r3, r4, 4 adds r3, r4 lsls r3, 2 - ldr r4, _080DBC28 @ =gUnknown_202063C + ldr r4, _080DBC28 @ =gSprites adds r3, r4 movs r1, 0x3E adds r1, r3 @@ -1902,7 +1902,7 @@ _080DBC12: _080DBC1C: .4byte gUnknown_20386E0 _080DBC20: .4byte gUnknown_2036E38 _080DBC24: .4byte gUnknown_83A0010 -_080DBC28: .4byte gUnknown_202063C +_080DBC28: .4byte gSprites thumb_func_end FldEff_Splash thumb_func_start sub_80DBC2C @@ -1936,7 +1936,7 @@ _080DBC5C: bl FieldEffectStop b _080DBCA6 _080DBC66: - ldr r3, _080DBCB0 @ =gUnknown_202063C + ldr r3, _080DBCB0 @ =gSprites ldr r2, _080DBCB4 @ =gUnknown_2036E38 mov r0, sp ldrb r1, [r0] @@ -1973,7 +1973,7 @@ _080DBCA6: pop {r0} bx r0 .align 2, 0 -_080DBCB0: .4byte gUnknown_202063C +_080DBCB0: .4byte gSprites _080DBCB4: .4byte gUnknown_2036E38 thumb_func_end sub_80DBC2C @@ -2001,7 +2001,7 @@ FldEff_JumpSmallSplash: @ 80DBCB8 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DBD24 @ =gUnknown_202063C + ldr r0, _080DBD24 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2031,7 +2031,7 @@ _080DBD14: .align 2, 0 _080DBD1C: .4byte gUnknown_20386E0 _080DBD20: .4byte gUnknown_83A0010 -_080DBD24: .4byte gUnknown_202063C +_080DBD24: .4byte gSprites thumb_func_end FldEff_JumpSmallSplash thumb_func_start oei_water_drop_tall @@ -2058,7 +2058,7 @@ oei_water_drop_tall: @ 80DBD28 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DBD94 @ =gUnknown_202063C + ldr r0, _080DBD94 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2088,7 +2088,7 @@ _080DBD84: .align 2, 0 _080DBD8C: .4byte gUnknown_20386E0 _080DBD90: .4byte gUnknown_83A0010 -_080DBD94: .4byte gUnknown_202063C +_080DBD94: .4byte gSprites thumb_func_end oei_water_drop_tall thumb_func_start FldEff_FeetInFlowingWater @@ -2122,7 +2122,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r3, _080DBE44 @ =gUnknown_202063C + ldr r3, _080DBE44 @ =gSprites adds r0, r3 ldr r1, _080DBE48 @ =sub_80DBE50 str r1, [r0, 0x1C] @@ -2173,7 +2173,7 @@ _080DBE2E: _080DBE38: .4byte gUnknown_20386E0 _080DBE3C: .4byte gUnknown_2036E38 _080DBE40: .4byte gUnknown_83A0010 -_080DBE44: .4byte gUnknown_202063C +_080DBE44: .4byte gSprites _080DBE48: .4byte sub_80DBE50 _080DBE4C: .4byte 0x0000ffff thumb_func_end FldEff_FeetInFlowingWater @@ -2220,7 +2220,7 @@ _080DBE98: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DBEEC @ =gUnknown_202063C + ldr r1, _080DBEEC @ =gSprites adds r0, r1 ldrh r1, [r0, 0x20] strh r1, [r4, 0x20] @@ -2257,7 +2257,7 @@ _080DBEE2: pop {r0} bx r0 .align 2, 0 -_080DBEEC: .4byte gUnknown_202063C +_080DBEEC: .4byte gSprites thumb_func_end sub_80DBE50 thumb_func_start oei_ripples @@ -2279,7 +2279,7 @@ oei_ripples: @ 80DBEF0 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DBF4C @ =gUnknown_202063C + ldr r0, _080DBF4C @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2307,7 +2307,7 @@ _080DBF3C: .align 2, 0 _080DBF44: .4byte gUnknown_83A0010 _080DBF48: .4byte gUnknown_20386E0 -_080DBF4C: .4byte gUnknown_202063C +_080DBF4C: .4byte gSprites thumb_func_end oei_ripples thumb_func_start sub_80DBF50 @@ -2338,7 +2338,7 @@ sub_80DBF50: @ 80DBF50 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r4, _080DBFF0 @ =gUnknown_202063C + ldr r4, _080DBFF0 @ =gSprites adds r2, r4 adds r3, r2, 0 adds r3, 0x3E @@ -2389,7 +2389,7 @@ _080DBFDC: _080DBFE4: .4byte gUnknown_20386E0 _080DBFE8: .4byte gUnknown_2036E38 _080DBFEC: .4byte gUnknown_83A0010 -_080DBFF0: .4byte gUnknown_202063C +_080DBFF0: .4byte gSprites thumb_func_end sub_80DBF50 thumb_func_start sub_80DBFF4 @@ -2442,7 +2442,7 @@ _080DC03C: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _080DC088 @ =gUnknown_202063C + ldr r2, _080DC088 @ =gSprites adds r1, r2 ldrh r2, [r1, 0x20] strh r2, [r4, 0x20] @@ -2468,7 +2468,7 @@ _080DC080: pop {r0} bx r0 .align 2, 0 -_080DC088: .4byte gUnknown_202063C +_080DC088: .4byte gSprites thumb_func_end sub_80DBFF4 thumb_func_start FldEff_Unknown19 @@ -2495,7 +2495,7 @@ FldEff_Unknown19: @ 80DC08C lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DC0F4 @ =gUnknown_202063C + ldr r0, _080DC0F4 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2523,7 +2523,7 @@ _080DC0E4: .align 2, 0 _080DC0EC: .4byte gUnknown_20386E0 _080DC0F0: .4byte gUnknown_83A0010 -_080DC0F4: .4byte gUnknown_202063C +_080DC0F4: .4byte gSprites thumb_func_end FldEff_Unknown19 thumb_func_start FldEff_Unknown20 @@ -2550,7 +2550,7 @@ FldEff_Unknown20: @ 80DC0F8 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DC160 @ =gUnknown_202063C + ldr r0, _080DC160 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2578,7 +2578,7 @@ _080DC150: .align 2, 0 _080DC158: .4byte gUnknown_20386E0 _080DC15C: .4byte gUnknown_83A0010 -_080DC160: .4byte gUnknown_202063C +_080DC160: .4byte gSprites thumb_func_end FldEff_Unknown20 thumb_func_start FldEff_Unknown21 @@ -2605,7 +2605,7 @@ FldEff_Unknown21: @ 80DC164 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DC1CC @ =gUnknown_202063C + ldr r0, _080DC1CC @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2633,7 +2633,7 @@ _080DC1BC: .align 2, 0 _080DC1C4: .4byte gUnknown_20386E0 _080DC1C8: .4byte gUnknown_83A0010 -_080DC1CC: .4byte gUnknown_202063C +_080DC1CC: .4byte gSprites thumb_func_end FldEff_Unknown21 thumb_func_start FldEff_Unknown22 @@ -2660,7 +2660,7 @@ FldEff_Unknown22: @ 80DC1D0 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DC238 @ =gUnknown_202063C + ldr r0, _080DC238 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2688,7 +2688,7 @@ _080DC228: .align 2, 0 _080DC230: .4byte gUnknown_20386E0 _080DC234: .4byte gUnknown_83A0010 -_080DC238: .4byte gUnknown_202063C +_080DC238: .4byte gSprites thumb_func_end FldEff_Unknown22 thumb_func_start ash @@ -2753,7 +2753,7 @@ oei_ash: @ 80DC270 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DC2F8 @ =gUnknown_202063C + ldr r0, _080DC2F8 @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -2788,7 +2788,7 @@ _080DC2E6: .align 2, 0 _080DC2F0: .4byte gUnknown_20386E0 _080DC2F4: .4byte gUnknown_83A0010 -_080DC2F8: .4byte gUnknown_202063C +_080DC2F8: .4byte gSprites thumb_func_end oei_ash thumb_func_start sub_80DC2FC @@ -2931,7 +2931,7 @@ sub_80DC3D0: @ 80DC3D0 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080DC444 @ =gUnknown_202063C + ldr r0, _080DC444 @ =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -2962,7 +2962,7 @@ _080DC42C: .align 2, 0 _080DC43C: .4byte gUnknown_20386E0 _080DC440: .4byte gUnknown_83A0010 -_080DC444: .4byte gUnknown_202063C +_080DC444: .4byte gSprites _080DC448: .4byte 0x0000ffff thumb_func_end sub_80DC3D0 @@ -2971,7 +2971,7 @@ sub_80DC44C: @ 80DC44C lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _080DC474 @ =gUnknown_202063C + ldr r3, _080DC474 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -2988,7 +2988,7 @@ sub_80DC44C: @ 80DC44C strh r0, [r2, 0x2E] bx lr .align 2, 0 -_080DC474: .4byte gUnknown_202063C +_080DC474: .4byte gSprites thumb_func_end sub_80DC44C thumb_func_start sub_80DC478 @@ -2996,7 +2996,7 @@ sub_80DC478: @ 80DC478 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _080DC4A0 @ =gUnknown_202063C + ldr r3, _080DC4A0 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -3013,7 +3013,7 @@ sub_80DC478: @ 80DC478 strh r3, [r2, 0x2E] bx lr .align 2, 0 -_080DC4A0: .4byte gUnknown_202063C +_080DC4A0: .4byte gSprites thumb_func_end sub_80DC478 thumb_func_start sub_80DC4A4 @@ -3022,7 +3022,7 @@ sub_80DC4A4: @ 80DC4A4 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r4, _080DC4D0 @ =gUnknown_202063C + ldr r4, _080DC4D0 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -3041,7 +3041,7 @@ sub_80DC4A4: @ 80DC4A4 pop {r0} bx r0 .align 2, 0 -_080DC4D0: .4byte gUnknown_202063C +_080DC4D0: .4byte gSprites _080DC4D4: .4byte 0xfffff0ff thumb_func_end sub_80DC4A4 @@ -3087,7 +3087,7 @@ sub_80DC4F8: @ 80DC4F8 lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _080DC54C @ =gUnknown_202063C + ldr r0, _080DC54C @ =gSprites adds r5, r0 adds r0, r4, 0 adds r1, r6, 0 @@ -3113,7 +3113,7 @@ sub_80DC4F8: @ 80DC4F8 bx r0 .align 2, 0 _080DC548: .4byte gUnknown_2036E38 -_080DC54C: .4byte gUnknown_202063C +_080DC54C: .4byte gSprites thumb_func_end sub_80DC4F8 thumb_func_start sub_80DC550 @@ -3312,7 +3312,7 @@ sub_80DC6B0: @ 80DC6B0 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r0, _080DC6F4 @ =gUnknown_8231D00 + ldr r0, _080DC6F4 @ =gDummySpriteTemplate movs r1, 0 movs r2, 0 movs r3, 0xFF @@ -3322,7 +3322,7 @@ sub_80DC6B0: @ 80DC6B0 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r1, _080DC6F8 @ =gUnknown_202063C + ldr r1, _080DC6F8 @ =gSprites adds r2, r1 ldr r1, _080DC6FC @ =sub_80DC700 str r1, [r2, 0x1C] @@ -3341,8 +3341,8 @@ sub_80DC6B0: @ 80DC6B0 pop {r1} bx r1 .align 2, 0 -_080DC6F4: .4byte gUnknown_8231D00 -_080DC6F8: .4byte gUnknown_202063C +_080DC6F4: .4byte gDummySpriteTemplate +_080DC6F8: .4byte gSprites _080DC6FC: .4byte sub_80DC700 thumb_func_end sub_80DC6B0 @@ -3355,7 +3355,7 @@ sub_80DC700: @ 80DC700 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DC73C @ =gUnknown_202063C + ldr r1, _080DC73C @ =gSprites adds r3, r0, r1 ldrh r1, [r2, 0x32] adds r0, r1, 0x1 @@ -3381,7 +3381,7 @@ _080DC738: pop {r0} bx r0 .align 2, 0 -_080DC73C: .4byte gUnknown_202063C +_080DC73C: .4byte gSprites thumb_func_end sub_80DC700 thumb_func_start FldEff_Dust @@ -3408,7 +3408,7 @@ FldEff_Dust: @ 80DC740 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DC7AC @ =gUnknown_202063C + ldr r0, _080DC7AC @ =gSprites adds r2, r0 adds r3, r2, 0 adds r3, 0x3E @@ -3438,7 +3438,7 @@ _080DC79C: .align 2, 0 _080DC7A4: .4byte gUnknown_20386E0 _080DC7A8: .4byte gUnknown_83A0010 -_080DC7AC: .4byte gUnknown_202063C +_080DC7AC: .4byte gSprites thumb_func_end FldEff_Dust thumb_func_start FldEff_SandPile @@ -3472,7 +3472,7 @@ FldEff_SandPile: @ 80DC7B0 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r4, _080DC868 @ =gUnknown_202063C + ldr r4, _080DC868 @ =gSprites adds r0, r4 adds r3, r0, 0 adds r3, 0x3E @@ -3530,7 +3530,7 @@ _080DC854: _080DC85C: .4byte gUnknown_20386E0 _080DC860: .4byte gUnknown_2036E38 _080DC864: .4byte gUnknown_83A0010 -_080DC868: .4byte gUnknown_202063C +_080DC868: .4byte gSprites thumb_func_end FldEff_SandPile thumb_func_start sub_80DC86C @@ -3571,7 +3571,7 @@ _080DC8A6: .align 2, 0 _080DC8B0: .4byte gUnknown_2036E38 _080DC8B4: - ldr r2, _080DC930 @ =gUnknown_202063C + ldr r2, _080DC930 @ =gSprites ldrb r1, [r1, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3607,7 +3607,7 @@ _080DC8DC: _080DC8F6: strh r6, [r4, 0x20] strh r5, [r4, 0x22] - ldr r3, _080DC930 @ =gUnknown_202063C + ldr r3, _080DC930 @ =gSprites ldr r2, _080DC934 @ =gUnknown_2036E38 mov r0, sp ldrb r1, [r0] @@ -3634,7 +3634,7 @@ _080DC926: pop {r0} bx r0 .align 2, 0 -_080DC930: .4byte gUnknown_202063C +_080DC930: .4byte gSprites _080DC934: .4byte gUnknown_2036E38 thumb_func_end sub_80DC86C @@ -3663,7 +3663,7 @@ FldEff_Bubbles: @ 80DC938 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080DC998 @ =gUnknown_202063C + ldr r0, _080DC998 @ =gSprites adds r1, r0 adds r3, r1, 0 adds r3, 0x3E @@ -3686,7 +3686,7 @@ _080DC988: .align 2, 0 _080DC990: .4byte gUnknown_20386E0 _080DC994: .4byte gUnknown_83A0010 -_080DC998: .4byte gUnknown_202063C +_080DC998: .4byte gSprites thumb_func_end FldEff_Bubbles thumb_func_start sub_80DC99C @@ -3810,7 +3810,7 @@ _080DCA48: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _080DCAC4 @ =gUnknown_202063C + ldr r0, _080DCAC4 @ =gSprites adds r2, r0 movs r0, 0x3E adds r0, r2 @@ -3854,7 +3854,7 @@ _080DCAB4: bx r1 .align 2, 0 _080DCAC0: .4byte gUnknown_83A0010 -_080DCAC4: .4byte gUnknown_202063C +_080DCAC4: .4byte gSprites thumb_func_end ShowDisguiseFieldEffect thumb_func_start sub_80DCAC8 @@ -3901,7 +3901,7 @@ _080DCAF8: lsls r2, r1, 4 adds r2, r1 lsls r2, 2 - ldr r1, _080DCBB4 @ =gUnknown_202063C + ldr r1, _080DCBB4 @ =gSprites adds r2, r1 adds r1, r2, 0 adds r1, 0x3E @@ -3976,7 +3976,7 @@ _080DCBA8: bx r0 .align 2, 0 _080DCBB0: .4byte gUnknown_2036E38 -_080DCBB4: .4byte gUnknown_202063C +_080DCBB4: .4byte gSprites thumb_func_end sub_80DCAC8 thumb_func_start sub_80DCBB8 @@ -3987,7 +3987,7 @@ sub_80DCBB8: @ 80DCBB8 ldrb r0, [r0] cmp r0, 0x1 bne _080DCBD6 - ldr r2, _080DCBDC @ =gUnknown_202063C + ldr r2, _080DCBDC @ =gSprites ldrb r1, [r1, 0x1A] lsls r0, r1, 4 adds r0, r1 @@ -4000,7 +4000,7 @@ _080DCBD6: pop {r0} bx r0 .align 2, 0 -_080DCBDC: .4byte gUnknown_202063C +_080DCBDC: .4byte gSprites thumb_func_end sub_80DCBB8 thumb_func_start sub_80DCBE0 @@ -4017,7 +4017,7 @@ sub_80DCBE0: @ 80DCBE0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DCC08 @ =gUnknown_202063C + ldr r1, _080DCC08 @ =gSprites adds r1, r0, r1 movs r3, 0x3C ldrsh r0, [r1, r3] @@ -4026,7 +4026,7 @@ sub_80DCBE0: @ 80DCBE0 movs r0, 0 b _080DCC18 .align 2, 0 -_080DCC08: .4byte gUnknown_202063C +_080DCC08: .4byte gSprites _080DCC0C: movs r0, 0x2 strb r0, [r2] @@ -4068,7 +4068,7 @@ FldEff_Sparkle: @ 80DCC1C lsrs r2, r0, 24 cmp r2, 0x40 beq _080DCC7C - ldr r0, _080DCC8C @ =gUnknown_202063C + ldr r0, _080DCC8C @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -4096,7 +4096,7 @@ _080DCC7C: .align 2, 0 _080DCC84: .4byte gUnknown_20386E0 _080DCC88: .4byte gUnknown_83A0010 -_080DCC8C: .4byte gUnknown_202063C +_080DCC8C: .4byte gSprites thumb_func_end FldEff_Sparkle thumb_func_start sub_80DCC90 @@ -4229,7 +4229,7 @@ _080DCD5E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080DCDFC @ =gUnknown_202063C + ldr r1, _080DCDFC @ =gSprites adds r5, r0, r1 adds r0, r6, 0 adds r0, 0x28 @@ -4292,7 +4292,7 @@ _080DCDD8: b _080DCE0A .align 2, 0 _080DCDF8: .4byte gUnknown_2036E38 -_080DCDFC: .4byte gUnknown_202063C +_080DCDFC: .4byte gSprites _080DCE00: adds r0, r7, 0x1 lsls r0, 24 diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s index b227e7464..e0a6a91a7 100644 --- a/asm/field_fadetransition.s +++ b/asm/field_fadetransition.s @@ -1842,7 +1842,7 @@ sub_807E980: @ 807E980 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807E9CC @ =gUnknown_202063C + ldr r1, _0807E9CC @ =gSprites adds r7, r0, r1 movs r1, 0 ldrsh r0, [r5, r1] @@ -1857,7 +1857,7 @@ sub_807E980: @ 807E980 _0807E9C0: .4byte gUnknown_3005098 _0807E9C4: .4byte gUnknown_2037078 _0807E9C8: .4byte gUnknown_2036E38 -_0807E9CC: .4byte gUnknown_202063C +_0807E9CC: .4byte gSprites _0807E9D0: cmp r0, 0x2 beq _0807EA38 @@ -1989,7 +1989,7 @@ sub_807EAC4: @ 807EAC4 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _0807EB5C @ =gUnknown_202063C + ldr r2, _0807EB5C @ =gSprites adds r7, r0, r2 ldrb r2, [r3, 0x5] lsls r0, r2, 3 @@ -2050,7 +2050,7 @@ _0807EB4C: bx r0 .align 2, 0 _0807EB58: .4byte gUnknown_2037078 -_0807EB5C: .4byte gUnknown_202063C +_0807EB5C: .4byte gSprites _0807EB60: .4byte gUnknown_2036E38 thumb_func_end sub_807EAC4 @@ -2303,7 +2303,7 @@ _0807ED0C: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0807ED9C @ =gUnknown_202063C + ldr r0, _0807ED9C @ =gSprites adds r1, r0 mov r2, r9 ldrh r0, [r2] @@ -2334,7 +2334,7 @@ _0807ED0C: .align 2, 0 _0807ED94: .4byte gUnknown_2037078 _0807ED98: .4byte gUnknown_2036E38 -_0807ED9C: .4byte gUnknown_202063C +_0807ED9C: .4byte gSprites thumb_func_end sub_807ECBC thumb_func_start sub_807EDA0 @@ -2348,7 +2348,7 @@ sub_807EDA0: @ 807EDA0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0807EDCC @ =gUnknown_202063C + ldr r1, _0807EDCC @ =gSprites adds r1, r0, r1 movs r7, 0 ldrsh r0, [r4, r7] @@ -2360,7 +2360,7 @@ sub_807EDA0: @ 807EDA0 b _0807EDF8 .align 2, 0 _0807EDC8: .4byte gUnknown_2037078 -_0807EDCC: .4byte gUnknown_202063C +_0807EDCC: .4byte gSprites _0807EDD0: ldrh r0, [r5] ldrh r5, [r2] diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index 7bfe0772b..4fc86db2c 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -1069,7 +1069,7 @@ SetObjectSubpriorityByZCoord: @ 80682F8 movs r5, 0 ldrsb r5, [r3, r5] ldrh r4, [r1, 0x22] - ldr r3, _08068338 @ =gUnknown_2021BCA + ldr r3, _08068338 @ =gSpriteCoordOffsetY subs r4, r5 ldrh r3, [r3] adds r4, r3 @@ -1092,7 +1092,7 @@ SetObjectSubpriorityByZCoord: @ 80682F8 pop {r0} bx r0 .align 2, 0 -_08068338: .4byte gUnknown_2021BCA +_08068338: .4byte gSpriteCoordOffsetY _0806833C: .4byte gUnknown_83A706C thumb_func_end SetObjectSubpriorityByZCoord diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 0c3e20951..cd7ed755a 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -74,7 +74,7 @@ sub_805DE8C: @ 805DE8C bl CreateSpriteAtEnd lsls r0, 24 lsrs r0, 24 - ldr r1, _0805DF2C @ =gUnknown_202063C + ldr r1, _0805DF2C @ =gSprites mov r10, r1 lsls r4, r0, 4 adds r4, r0 @@ -134,7 +134,7 @@ sub_805DE8C: @ 805DE8C bx r0 .align 2, 0 _0805DF28: .4byte gUnknown_83A0010 -_0805DF2C: .4byte gUnknown_202063C +_0805DF2C: .4byte gSprites thumb_func_end sub_805DE8C thumb_func_start sub_805DF30 @@ -982,7 +982,7 @@ RemoveFieldObjectInternal: @ 805E510 ands r0, r1 orrs r0, r2 str r0, [sp, 0x4] - ldr r2, _0805E558 @ =gUnknown_202063C + ldr r2, _0805E558 @ =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -1004,7 +1004,7 @@ RemoveFieldObjectInternal: @ 805E510 bx r0 .align 2, 0 _0805E554: .4byte 0xffff0000 -_0805E558: .4byte gUnknown_202063C +_0805E558: .4byte gSprites thumb_func_end RemoveFieldObjectInternal thumb_func_start unref_sub_808D958 @@ -1135,7 +1135,7 @@ _0805E650: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _0805E728 @ =gUnknown_202063C + ldr r1, _0805E728 @ =gSprites adds r4, r0, r1 mov r1, r9 lsls r0, r1, 16 @@ -1237,7 +1237,7 @@ _0805E718: pop {r1} bx r1 .align 2, 0 -_0805E728: .4byte gUnknown_202063C +_0805E728: .4byte gSprites thumb_func_end sub_805E590 thumb_func_start SpawnFieldObject @@ -1301,7 +1301,7 @@ SpawnFieldObject: @ 805E72C .align 2, 0 _0805E7A4: .4byte 0xffff0000 _0805E7A8: - ldr r4, _0805E7EC @ =gUnknown_202063C + ldr r4, _0805E7EC @ =gSprites ldr r1, _0805E7F0 @ =gUnknown_2036E38 lsls r0, r2, 3 adds r0, r2 @@ -1337,7 +1337,7 @@ _0805E7DE: pop {r1} bx r1 .align 2, 0 -_0805E7EC: .4byte gUnknown_202063C +_0805E7EC: .4byte gSprites _0805E7F0: .4byte gUnknown_2036E38 thumb_func_end SpawnFieldObject @@ -1592,7 +1592,7 @@ _0805E9A8: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 - ldr r0, _0805E9F4 @ =gUnknown_202063C + ldr r0, _0805E9F4 @ =gSprites adds r4, r0 adds r0, r4, 0 bl SetSubspriteTables @@ -1611,7 +1611,7 @@ _0805E9E4: bx r1 .align 2, 0 _0805E9F0: .4byte 0x0000ffff -_0805E9F4: .4byte gUnknown_202063C +_0805E9F4: .4byte gSprites thumb_func_end AddPseudoFieldObject thumb_func_start sub_805E9F8 @@ -1683,7 +1683,7 @@ sub_805E9F8: @ 805E9F8 lsls r0, r6, 4 adds r0, r6 lsls r0, 2 - ldr r1, _0805EB40 @ =gUnknown_202063C + ldr r1, _0805EB40 @ =gSprites adds r5, r0, r1 ldrh r0, [r4, 0x8] lsls r0, 16 @@ -1771,7 +1771,7 @@ _0805EB24: .align 2, 0 _0805EB38: .4byte sub_8068FA8 _0805EB3C: .4byte 0x0000ffff -_0805EB40: .4byte gUnknown_202063C +_0805EB40: .4byte gSprites thumb_func_end sub_805E9F8 thumb_func_start sub_805EB44 @@ -1795,7 +1795,7 @@ sub_805EB44: @ 805EB44 adds r0, r6, 0 bl GetFieldObjectGraphicsInfo adds r7, r0, 0 - ldr r1, _0805EC24 @ =nullsub_8 + ldr r1, _0805EC24 @ =SpriteCallbackDummy add r3, sp, 0x18 adds r0, r6, 0 mov r2, sp @@ -1820,7 +1820,7 @@ sub_805EB44: @ 805EB44 lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _0805EC2C @ =gUnknown_202063C + ldr r1, _0805EC2C @ =gSprites adds r4, r0, r1 ldrh r0, [r7, 0xA] lsls r0, 16 @@ -1884,9 +1884,9 @@ _0805EC14: pop {r1} bx r1 .align 2, 0 -_0805EC24: .4byte nullsub_8 +_0805EC24: .4byte SpriteCallbackDummy _0805EC28: .4byte 0x0000ffff -_0805EC2C: .4byte gUnknown_202063C +_0805EC2C: .4byte gSprites thumb_func_end sub_805EB44 thumb_func_start sub_805EC30 @@ -2263,7 +2263,7 @@ _0805EEDC: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _0805EFF0 @ =gUnknown_202063C + ldr r1, _0805EFF0 @ =gSprites adds r4, r0, r1 mov r1, r9 lsls r0, r1, 16 @@ -2379,7 +2379,7 @@ _0805EFE0: .4byte gUnknown_2031DEC _0805EFE4: .4byte gUnknown_2036E38 _0805EFE8: .4byte 0xffff0000 _0805EFEC: .4byte 0x0000ffff -_0805EFF0: .4byte gUnknown_202063C +_0805EFF0: .4byte gSprites thumb_func_end sub_805EE3C thumb_func_start sub_805EFF4 @@ -2459,7 +2459,7 @@ sub_805F060: @ 805F060 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805F1CC @ =gUnknown_202063C + ldr r1, _0805F1CC @ =gSprites adds r4, r0, r1 ldrb r1, [r5, 0xC] movs r0, 0xF @@ -2622,7 +2622,7 @@ _0805F1BA: pop {r0} bx r0 .align 2, 0 -_0805F1CC: .4byte gUnknown_202063C +_0805F1CC: .4byte gSprites _0805F1D0: .4byte 0x000003ff _0805F1D4: .4byte 0xfffffc00 thumb_func_end sub_805F060 @@ -2677,7 +2677,7 @@ FieldObjectTurn: @ 805F218 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, _0805F264 @ =gUnknown_202063C + ldr r5, _0805F264 @ =gSprites adds r4, r5 ldrb r0, [r6, 0x18] lsls r0, 28 @@ -2700,7 +2700,7 @@ _0805F25E: pop {r0} bx r0 .align 2, 0 -_0805F264: .4byte gUnknown_202063C +_0805F264: .4byte gSprites thumb_func_end FieldObjectTurn thumb_func_start FieldObjectTurnByLocalIdAndMap @@ -2915,7 +2915,7 @@ sub_805F3A8: @ 805F3A8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805F3FC @ =gUnknown_202063C + ldr r1, _0805F3FC @ =gSprites adds r0, r1 ldrb r1, [r2, 0x3] movs r3, 0x4 @@ -2930,7 +2930,7 @@ _0805F3EE: bx r0 .align 2, 0 _0805F3F8: .4byte gUnknown_2036E38 -_0805F3FC: .4byte gUnknown_202063C +_0805F3FC: .4byte gSprites thumb_func_end sub_805F3A8 thumb_func_start sub_805F400 @@ -3003,7 +3003,7 @@ sub_805F448: @ 805F448 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805F498 @ =gUnknown_202063C + ldr r1, _0805F498 @ =gSprites adds r0, r1 strh r5, [r0, 0x24] strh r4, [r0, 0x26] @@ -3014,20 +3014,20 @@ _0805F48C: bx r0 .align 2, 0 _0805F494: .4byte gUnknown_2036E38 -_0805F498: .4byte gUnknown_202063C +_0805F498: .4byte gSprites thumb_func_end sub_805F448 thumb_func_start gpu_pal_allocator_reset__manage_upper_four gpu_pal_allocator_reset__manage_upper_four: @ 805F49C push {lr} bl FreeAllSpritePalettes - ldr r1, _0805F4AC @ =gUnknown_3003E58 + ldr r1, _0805F4AC @ =gReservedSpritePaletteCount movs r0, 0xC strb r0, [r1] pop {r0} bx r0 .align 2, 0 -_0805F4AC: .4byte gUnknown_3003E58 +_0805F4AC: .4byte gReservedSpritePaletteCount thumb_func_end gpu_pal_allocator_reset__manage_upper_four thumb_func_start sub_805F4B0 @@ -3392,7 +3392,7 @@ sub_805F724: @ 805F724 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805F7C0 @ =gUnknown_202063C + ldr r1, _0805F7C0 @ =gSprites adds r7, r0, r1 ldrb r0, [r6, 0x5] bl GetFieldObjectGraphicsInfo @@ -3453,7 +3453,7 @@ _0805F7B6: pop {r0} bx r0 .align 2, 0 -_0805F7C0: .4byte gUnknown_202063C +_0805F7C0: .4byte gSprites thumb_func_end sub_805F724 thumb_func_start sub_805F7C4 @@ -3688,7 +3688,7 @@ AddCameraObject: @ 805F950 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r2, _0805F990 @ =gUnknown_202063C + ldr r2, _0805F990 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -3707,7 +3707,7 @@ AddCameraObject: @ 805F950 bx r1 .align 2, 0 _0805F98C: .4byte gUnknown_835B944 -_0805F990: .4byte gUnknown_202063C +_0805F990: .4byte gSprites thumb_func_end AddCameraObject thumb_func_start ObjectCB_CameraObject @@ -3735,7 +3735,7 @@ _0805F9B8: .4byte gUnknown_835B95C thumb_func_start CameraObject_0 CameraObject_0: @ 805F9BC push {lr} - ldr r3, _0805F9F4 @ =gUnknown_202063C + ldr r3, _0805F9F4 @ =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -3762,13 +3762,13 @@ CameraObject_0: @ 805F9BC pop {r0} bx r0 .align 2, 0 -_0805F9F4: .4byte gUnknown_202063C +_0805F9F4: .4byte gSprites thumb_func_end CameraObject_0 thumb_func_start CameraObject_1 CameraObject_1: @ 805F9F8 push {r4,r5,lr} - ldr r3, _0805FA2C @ =gUnknown_202063C + ldr r3, _0805FA2C @ =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -3793,13 +3793,13 @@ CameraObject_1: @ 805F9F8 pop {r0} bx r0 .align 2, 0 -_0805FA2C: .4byte gUnknown_202063C +_0805FA2C: .4byte gSprites thumb_func_end CameraObject_1 thumb_func_start CameraObject_2 CameraObject_2: @ 805FA30 push {r4,lr} - ldr r4, _0805FA5C @ =gUnknown_202063C + ldr r4, _0805FA5C @ =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -3821,14 +3821,14 @@ CameraObject_2: @ 805FA30 pop {r0} bx r0 .align 2, 0 -_0805FA5C: .4byte gUnknown_202063C +_0805FA5C: .4byte gSprites thumb_func_end CameraObject_2 thumb_func_start FindCameraObject FindCameraObject: @ 805FA60 push {r4,r5,lr} movs r3, 0 - ldr r4, _0805FA8C @ =gUnknown_202063C + ldr r4, _0805FA8C @ =gSprites adds r5, r4, 0 adds r5, 0x1C _0805FA6A: @@ -3850,7 +3850,7 @@ _0805FA6A: adds r0, r2, 0 b _0805FAA0 .align 2, 0 -_0805FA8C: .4byte gUnknown_202063C +_0805FA8C: .4byte gSprites _0805FA90: .4byte ObjectCB_CameraObject _0805FA94: adds r0, r3, 0x1 @@ -3939,7 +3939,7 @@ CopySprite: @ 805FB08 lsls r3, 24 lsrs r7, r3, 24 movs r5, 0 - ldr r1, _0805FB50 @ =gUnknown_202063C + ldr r1, _0805FB50 @ =gSprites _0805FB22: lsls r0, r5, 4 adds r0, r5 @@ -3963,7 +3963,7 @@ _0805FB22: strb r7, [r0] b _0805FB5E .align 2, 0 -_0805FB50: .4byte gUnknown_202063C +_0805FB50: .4byte gSprites _0805FB54: adds r0, r5, 0x1 lsls r0, 24 @@ -3993,7 +3993,7 @@ obj_unfreeze: @ 805FB6C lsls r3, 24 lsrs r7, r3, 24 movs r5, 0x3F - ldr r3, _0805FBC0 @ =gUnknown_202063C + ldr r3, _0805FBC0 @ =gSprites movs r2, 0x1 negs r2, r2 _0805FB8A: @@ -4023,7 +4023,7 @@ _0805FB8A: lsrs r0, 24 b _0805FBD2 .align 2, 0 -_0805FBC0: .4byte gUnknown_202063C +_0805FBC0: .4byte gSprites _0805FBC4: subs r0, r1, 0x1 lsls r0, 16 @@ -4497,7 +4497,7 @@ npc_paltag_set_load: @ 805FECC movs r1, 0 movs r2, 0x6 bl pal_patch_for_npc_range - ldr r1, _0805FF14 @ =gUnknown_3003E58 + ldr r1, _0805FF14 @ =gReservedSpritePaletteCount movs r0, 0x8 strb r0, [r1] b _0805FF2A @@ -4506,7 +4506,7 @@ _0805FF04: .4byte gUnknown_203709A _0805FF08: .4byte 0x000011ff _0805FF0C: .4byte gUnknown_2037098 _0805FF10: .4byte gUnknown_83A5330 -_0805FF14: .4byte gUnknown_3003E58 +_0805FF14: .4byte gReservedSpritePaletteCount _0805FF18: ldr r0, _0805FF30 @ =gUnknown_83A5330 ldrb r1, [r2] @@ -12226,7 +12226,7 @@ npc_set_running_behaviour_etc: @ 8063610 strb r3, [r0] adds r0, 0x1 strb r3, [r0] - ldr r4, _08063654 @ =gUnknown_202063C + ldr r4, _08063654 @ =gSprites mov r0, r12 ldrb r2, [r0, 0x4] lsls r0, r2, 4 @@ -12251,7 +12251,7 @@ npc_set_running_behaviour_etc: @ 8063610 pop {r0} bx r0 .align 2, 0 -_08063654: .4byte gUnknown_202063C +_08063654: .4byte gSprites _08063658: .4byte gUnknown_839FBC8 thumb_func_end npc_set_running_behaviour_etc @@ -12698,7 +12698,7 @@ IsBerryTreeSparkling: @ 8063980 lsls r0, 24 cmp r0, 0 bne _080639CC - ldr r3, _080639C4 @ =gUnknown_202063C + ldr r3, _080639C4 @ =gSprites ldr r2, _080639C8 @ =gUnknown_2036E38 mov r0, sp ldrb r1, [r0] @@ -12719,7 +12719,7 @@ IsBerryTreeSparkling: @ 8063980 movs r0, 0x1 b _080639CE .align 2, 0 -_080639C4: .4byte gUnknown_202063C +_080639C4: .4byte gSprites _080639C8: .4byte gUnknown_2036E38 _080639CC: movs r0, 0 @@ -12744,7 +12744,7 @@ sub_80639D4: @ 80639D4 lsls r0, 24 cmp r0, 0 bne _08063A12 - ldr r3, _08063A18 @ =gUnknown_202063C + ldr r3, _08063A18 @ =gSprites ldr r2, _08063A1C @ =gUnknown_2036E38 mov r0, sp ldrb r1, [r0] @@ -12766,7 +12766,7 @@ _08063A12: pop {r0} bx r0 .align 2, 0 -_08063A18: .4byte gUnknown_202063C +_08063A18: .4byte gSprites _08063A1C: .4byte gUnknown_2036E38 thumb_func_end sub_80639D4 @@ -13166,7 +13166,7 @@ _08063CCE: movs r1, 0x7F ands r0, r1 strb r0, [r4] - ldr r2, _08063CFC @ =gUnknown_202063C + ldr r2, _08063CFC @ =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -13179,7 +13179,7 @@ _08063CF4: pop {r1} bx r1 .align 2, 0 -_08063CFC: .4byte gUnknown_202063C +_08063CFC: .4byte gSprites thumb_func_end sub_8063CA4 thumb_func_start FieldObjectForceSetSpecialAnim @@ -13223,7 +13223,7 @@ FieldObjectClearAnim: @ 8063D34 movs r2, 0x7F ands r1, r2 strb r1, [r0] - ldr r3, _08063D64 @ =gUnknown_202063C + ldr r3, _08063D64 @ =gSprites ldrb r2, [r0, 0x4] lsls r1, r2, 4 adds r1, r2 @@ -13239,7 +13239,7 @@ FieldObjectClearAnim: @ 8063D34 strh r2, [r0, 0x32] bx lr .align 2, 0 -_08063D64: .4byte gUnknown_202063C +_08063D64: .4byte gSprites thumb_func_end FieldObjectClearAnim thumb_func_start FieldObjectCheckIfSpecialAnimFinishedOrInactive @@ -21930,7 +21930,7 @@ sub_8067A10: @ 8067A10 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - ldr r2, _08067A6C @ =gUnknown_2021BC8 + ldr r2, _08067A6C @ =gSpriteCoordOffsetX adds r0, r1 ldrh r2, [r2] adds r0, r2 @@ -21944,14 +21944,14 @@ sub_8067A10: @ 8067A10 ldrb r0, [r0] lsls r0, 24 asrs r0, 24 - ldr r2, _08067A70 @ =gUnknown_2021BCA + ldr r2, _08067A70 @ =gSpriteCoordOffsetY adds r0, r1 ldrh r2, [r2] adds r0, r2 b _08067A9C .align 2, 0 -_08067A6C: .4byte gUnknown_2021BC8 -_08067A70: .4byte gUnknown_2021BCA +_08067A6C: .4byte gSpriteCoordOffsetX +_08067A70: .4byte gSpriteCoordOffsetY _08067A74: ldrh r1, [r4, 0x24] ldrh r0, [r4, 0x20] diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index a0a4bdb96..ddb704c20 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -2464,7 +2464,7 @@ plaer_get_pos_including_state_based_drift: @ 805C568 beq _0805C588 b _0805C6B0 _0805C588: - ldr r2, _0805C5C4 @ =gUnknown_202063C + ldr r2, _0805C5C4 @ =gSprites ldrb r1, [r3, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -2494,7 +2494,7 @@ _0805C5B0: .align 2, 0 _0805C5BC: .4byte gUnknown_2037078 _0805C5C0: .4byte gUnknown_2036E38 -_0805C5C4: .4byte gUnknown_202063C +_0805C5C4: .4byte gSprites _0805C5C8: .4byte _0805C5CC .align 2, 0 _0805C5CC: @@ -3212,7 +3212,7 @@ sub_805CB04: @ 805CB04 lsls r0, 24 cmp r0, 0 beq _0805CB5C - ldr r2, _0805CB6C @ =gUnknown_202063C + ldr r2, _0805CB6C @ =gSprites ldrb r1, [r5, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -3238,7 +3238,7 @@ _0805CB5C: .align 2, 0 _0805CB64: .4byte gUnknown_2036E38 _0805CB68: .4byte gUnknown_2037078 -_0805CB6C: .4byte gUnknown_202063C +_0805CB6C: .4byte gSprites thumb_func_end sub_805CB04 thumb_func_start sub_805CB70 @@ -3262,7 +3262,7 @@ sub_805CB70: @ 805CB70 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805CBB4 @ =gUnknown_202063C + ldr r1, _0805CBB4 @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAnim @@ -3272,7 +3272,7 @@ sub_805CB70: @ 805CB70 .align 2, 0 _0805CBAC: .4byte gUnknown_2037078 _0805CBB0: .4byte gUnknown_2036E38 -_0805CBB4: .4byte gUnknown_202063C +_0805CBB4: .4byte gSprites thumb_func_end sub_805CB70 thumb_func_start sub_805CBB8 @@ -3323,7 +3323,7 @@ sub_805CBE8: @ 805CBE8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805CC28 @ =gUnknown_202063C + ldr r1, _0805CC28 @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAnim @@ -3333,7 +3333,7 @@ sub_805CBE8: @ 805CBE8 .align 2, 0 _0805CC20: .4byte gUnknown_2037078 _0805CC24: .4byte gUnknown_2036E38 -_0805CC28: .4byte gUnknown_202063C +_0805CC28: .4byte gSprites thumb_func_end sub_805CBE8 thumb_func_start sub_805CC2C @@ -3569,7 +3569,7 @@ sub_805CD84: @ 805CD84 ldrb r0, [r4, 0xB] lsrs r0, 4 str r0, [r2, 0x8] - ldr r3, _0805CE1C @ =gUnknown_202063C + ldr r3, _0805CE1C @ =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -3593,7 +3593,7 @@ _0805CE0E: bx r1 .align 2, 0 _0805CE18: .4byte gUnknown_20386E0 -_0805CE1C: .4byte gUnknown_202063C +_0805CE1C: .4byte gSprites thumb_func_end sub_805CD84 thumb_func_start sub_805CE20 @@ -4152,7 +4152,7 @@ sub_805D240: @ 805D240 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D2BC @ =gUnknown_202063C + ldr r1, _0805D2BC @ =gSprites adds r0, r1 bl DestroySprite adds r0, r5, 0 @@ -4165,7 +4165,7 @@ _0805D2AE: .align 2, 0 _0805D2B4: .4byte gUnknown_2037078 _0805D2B8: .4byte gUnknown_2036E38 -_0805D2BC: .4byte gUnknown_202063C +_0805D2BC: .4byte gSprites thumb_func_end sub_805D240 thumb_func_start sub_805D2C0 @@ -4329,7 +4329,7 @@ fish2: @ 805D3F4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D42C @ =gUnknown_202063C + ldr r1, _0805D42C @ =gSprites adds r0, r1 bl sub_805D9C4 ldrh r0, [r4, 0xA] @@ -4349,7 +4349,7 @@ _0805D41E: bx r1 .align 2, 0 _0805D428: .4byte gUnknown_2037078 -_0805D42C: .4byte gUnknown_202063C +_0805D42C: .4byte gSprites thumb_func_end fish2 thumb_func_start sub_805D430 @@ -4403,7 +4403,7 @@ sub_805D47C: @ 805D47C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D4D0 @ =gUnknown_202063C + ldr r1, _0805D4D0 @ =gSprites adds r0, r1 bl sub_805D9C4 ldrh r0, [r4, 0xA] @@ -4437,7 +4437,7 @@ _0805D4C6: b _0805D4F8 .align 2, 0 _0805D4CC: .4byte gUnknown_2037078 -_0805D4D0: .4byte gUnknown_202063C +_0805D4D0: .4byte gSprites _0805D4D4: ldr r2, _0805D504 @ =gUnknown_835B918 movs r1, 0xC @@ -4475,7 +4475,7 @@ sub_805D508: @ 805D508 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0805D544 @ =gUnknown_202063C + ldr r5, _0805D544 @ =gSprites adds r0, r5 bl sub_805D9C4 ldrh r0, [r4, 0x8] @@ -4496,7 +4496,7 @@ _0805D53A: b _0805D56A .align 2, 0 _0805D540: .4byte gUnknown_2037078 -_0805D544: .4byte gUnknown_202063C +_0805D544: .4byte gSprites _0805D548: ldrb r0, [r6, 0x4] lsls r4, r0, 4 @@ -4542,7 +4542,7 @@ sub_805D580: @ 805D580 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D5C8 @ =gUnknown_202063C + ldr r1, _0805D5C8 @ =gSprites adds r0, r1 bl sub_805D9C4 ldrh r1, [r4, 0xA] @@ -4563,7 +4563,7 @@ sub_805D580: @ 805D580 .align 2, 0 _0805D5C0: .4byte gUnknown_835B91A _0805D5C4: .4byte gUnknown_2037078 -_0805D5C8: .4byte gUnknown_202063C +_0805D5C8: .4byte gSprites _0805D5CC: ldr r0, _0805D5E8 @ =gMain ldrh r1, [r0, 0x2E] @@ -4599,7 +4599,7 @@ sub_805D5EC: @ 805D5EC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D668 @ =gUnknown_202063C + ldr r1, _0805D668 @ =gSprites adds r0, r1 bl sub_805D9C4 ldrh r0, [r4, 0x8] @@ -4645,7 +4645,7 @@ _0805D654: .align 2, 0 _0805D660: .4byte gUnknown_835B920 _0805D664: .4byte gUnknown_2037078 -_0805D668: .4byte gUnknown_202063C +_0805D668: .4byte gSprites thumb_func_end sub_805D5EC thumb_func_start sub_805D66C @@ -4658,7 +4658,7 @@ sub_805D66C: @ 805D66C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D6C0 @ =gUnknown_202063C + ldr r1, _0805D6C0 @ =gSprites adds r0, r1 bl sub_805D9C4 movs r0, 0 @@ -4688,7 +4688,7 @@ sub_805D66C: @ 805D66C bx r1 .align 2, 0 _0805D6BC: .4byte gUnknown_2037078 -_0805D6C0: .4byte gUnknown_202063C +_0805D6C0: .4byte gSprites _0805D6C4: .4byte gUnknown_841D14E thumb_func_end sub_805D66C @@ -4707,7 +4707,7 @@ sub_805D6C8: @ 805D6C8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D778 @ =gUnknown_202063C + ldr r1, _0805D778 @ =gSprites adds r0, r1 bl sub_805D9C4 _0805D6EA: @@ -4754,7 +4754,7 @@ _0805D6EA: movs r2, 0 bl sub_80DC4A4 _0805D748: - ldr r2, _0805D778 @ =gUnknown_202063C + ldr r2, _0805D778 @ =gSprites ldrb r1, [r7, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -4776,7 +4776,7 @@ _0805D748: b _0805D7AA .align 2, 0 _0805D774: .4byte gUnknown_2037078 -_0805D778: .4byte gUnknown_202063C +_0805D778: .4byte gSprites _0805D77C: .4byte gUnknown_2036E38 _0805D780: movs r1, 0xA @@ -4819,7 +4819,7 @@ sub_805D7C0: @ 805D7C0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0805D830 @ =gUnknown_202063C + ldr r5, _0805D830 @ =gSprites adds r0, r5 bl sub_805D9C4 ldrb r0, [r4, 0x4] @@ -4861,7 +4861,7 @@ sub_805D7C0: @ 805D7C0 bx r1 .align 2, 0 _0805D82C: .4byte gUnknown_2037078 -_0805D830: .4byte gUnknown_202063C +_0805D830: .4byte gSprites _0805D834: .4byte gUnknown_841D169 thumb_func_end sub_805D7C0 @@ -4875,7 +4875,7 @@ sub_805D838: @ 805D838 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0805D8A4 @ =gUnknown_202063C + ldr r5, _0805D8A4 @ =gSprites adds r0, r5 bl sub_805D9C4 ldrb r0, [r4, 0x4] @@ -4915,7 +4915,7 @@ sub_805D838: @ 805D838 bx r1 .align 2, 0 _0805D8A0: .4byte gUnknown_2037078 -_0805D8A4: .4byte gUnknown_202063C +_0805D8A4: .4byte gSprites _0805D8A8: .4byte gUnknown_841D17E thumb_func_end sub_805D838 @@ -4928,7 +4928,7 @@ sub_805D8AC: @ 805D8AC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805D8D4 @ =gUnknown_202063C + ldr r1, _0805D8D4 @ =gSprites adds r0, r1 bl sub_805D9C4 ldrh r0, [r4, 0x8] @@ -4940,7 +4940,7 @@ sub_805D8AC: @ 805D8AC bx r1 .align 2, 0 _0805D8D0: .4byte gUnknown_2037078 -_0805D8D4: .4byte gUnknown_202063C +_0805D8D4: .4byte gSprites thumb_func_end sub_805D8AC thumb_func_start sub_805D8D8 @@ -4954,7 +4954,7 @@ sub_805D8D8: @ 805D8D8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r7, _0805D978 @ =gUnknown_202063C + ldr r7, _0805D978 @ =gSprites adds r0, r7 bl sub_805D9C4 ldrb r1, [r5, 0x4] @@ -5023,7 +5023,7 @@ _0805D968: bx r1 .align 2, 0 _0805D974: .4byte gUnknown_2037078 -_0805D978: .4byte gUnknown_202063C +_0805D978: .4byte gSprites _0805D97C: .4byte gUnknown_2036E38 thumb_func_end sub_805D8D8 @@ -5253,7 +5253,7 @@ sub_805DB04: @ 805DB04 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805DB50 @ =gUnknown_202063C + ldr r1, _0805DB50 @ =gSprites adds r7, r0, r1 lsls r0, r2, 2 adds r0, r2 @@ -5272,7 +5272,7 @@ sub_805DB04: @ 805DB04 .align 2, 0 _0805DB48: .4byte gUnknown_2037078 _0805DB4C: .4byte gUnknown_2036E38 -_0805DB50: .4byte gUnknown_202063C +_0805DB50: .4byte gSprites _0805DB54: .4byte gUnknown_3005098 _0805DB58: cmp r6, 0x2 @@ -5412,7 +5412,7 @@ sub_805DC38: @ 805DC38 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0805DC88 @ =gUnknown_202063C + ldr r1, _0805DC88 @ =gSprites adds r7, r0, r1 mov r1, r8 lsls r0, r1, 2 @@ -5432,7 +5432,7 @@ sub_805DC38: @ 805DC38 .align 2, 0 _0805DC80: .4byte gUnknown_2037078 _0805DC84: .4byte gUnknown_2036E38 -_0805DC88: .4byte gUnknown_202063C +_0805DC88: .4byte gSprites _0805DC8C: .4byte gUnknown_3005098 _0805DC90: cmp r6, 0x2 diff --git a/asm/field_weather_effects.s b/asm/field_weather_effects.s index 1f4c51568..7e4f90209 100644 --- a/asm/field_weather_effects.s +++ b/asm/field_weather_effects.s @@ -235,7 +235,7 @@ _0807B456: lsls r4, r3, 4 adds r4, r3 lsls r4, 2 - ldr r0, _0807B4C4 @ =gUnknown_202063C + ldr r0, _0807B4C4 @ =gSprites adds r4, r0 str r4, [r1] ldr r0, _0807B4C8 @ =gUnknown_83C65C8 @@ -265,7 +265,7 @@ _0807B4B4: .4byte 0x000006de _0807B4B8: .4byte gUnknown_83C65D4 _0807B4BC: .4byte gUnknown_83C2D00 _0807B4C0: .4byte gUnknown_83C65F0 -_0807B4C4: .4byte gUnknown_202063C +_0807B4C4: .4byte gSprites _0807B4C8: .4byte gUnknown_83C65C8 _0807B4CC: ldr r0, _0807B4FC @ =gUnknown_83C2BBC @@ -1048,12 +1048,12 @@ _0807BAAE: bl StartSpriteAnim movs r0, 0x1 strh r0, [r5, 0x36] - ldr r1, _0807BAF8 @ =gUnknown_2021BC8 + ldr r1, _0807BAF8 @ =gSpriteCoordOffsetX ldrh r0, [r5, 0x20] ldrh r1, [r1] subs r0, r1 strh r0, [r5, 0x20] - ldr r1, _0807BAFC @ =gUnknown_2021BCA + ldr r1, _0807BAFC @ =gSpriteCoordOffsetY ldrh r0, [r5, 0x22] ldrh r1, [r1] subs r0, r1 @@ -1065,8 +1065,8 @@ _0807BAAE: b _0807BB20 .align 2, 0 _0807BAF4: .4byte 0x000006dc -_0807BAF8: .4byte gUnknown_2021BC8 -_0807BAFC: .4byte gUnknown_2021BCA +_0807BAF8: .4byte gSpriteCoordOffsetX +_0807BAFC: .4byte gSpriteCoordOffsetY _0807BB00: adds r0, r5, 0 adds r0, 0x3F @@ -1249,7 +1249,7 @@ _0807BC32: lsrs r5, r0, 24 cmp r5, 0x40 beq _0807BCE0 - ldr r3, _0807BCD4 @ =gUnknown_202063C + ldr r3, _0807BCD4 @ =gSprites lsls r4, r5, 4 adds r1, r4, r5 lsls r1, 2 @@ -1274,7 +1274,7 @@ _0807BC32: _0807BC7E: adds r0, r4, r5 lsls r0, 2 - ldr r6, _0807BCD4 @ =gUnknown_202063C + ldr r6, _0807BCD4 @ =gSprites adds r0, r6 ldr r3, _0807BCDC @ =0xfffffda8 ldrh r6, [r0, 0x30] @@ -1311,7 +1311,7 @@ _0807BCC4: .4byte gUnknown_83C2BBC _0807BCC8: .4byte 0x000006da _0807BCCC: .4byte gUnknown_83C66A4 _0807BCD0: .4byte gUnknown_83C6608 -_0807BCD4: .4byte gUnknown_202063C +_0807BCD4: .4byte gSprites _0807BCD8: .4byte 0x00000257 _0807BCDC: .4byte 0xfffffda8 _0807BCE0: @@ -1750,7 +1750,7 @@ snowflake_add: @ 807C004 lsrs r1, r0, 24 cmp r1, 0x40 beq _0807C068 - ldr r0, _0807C05C @ =gUnknown_202063C + ldr r0, _0807C05C @ =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -1781,7 +1781,7 @@ snowflake_add: @ 807C004 b _0807C06A .align 2, 0 _0807C058: .4byte gUnknown_83C6704 -_0807C05C: .4byte gUnknown_202063C +_0807C05C: .4byte gSprites _0807C060: .4byte gUnknown_83C2BBC _0807C064: .4byte 0x000006e4 _0807C068: @@ -1843,7 +1843,7 @@ sub_807C0A4: @ 807C0A4 adds r4, r0 lsls r4, 16 lsrs r4, 16 - ldr r1, _0807C148 @ =gUnknown_2021BCA + ldr r1, _0807C148 @ =gSpriteCoordOffsetY adds r0, r5, 0 adds r0, 0x29 ldrb r0, [r0] @@ -1857,7 +1857,7 @@ sub_807C0A4: @ 807C0A4 subs r1, r0 movs r7, 0 strh r1, [r5, 0x22] - ldr r1, _0807C14C @ =gUnknown_2021BC8 + ldr r1, _0807C14C @ =gSpriteCoordOffsetX adds r0, r5, 0 adds r0, 0x28 ldrb r0, [r0] @@ -1903,8 +1903,8 @@ _0807C134: pop {r0} bx r0 .align 2, 0 -_0807C148: .4byte gUnknown_2021BCA -_0807C14C: .4byte gUnknown_2021BC8 +_0807C148: .4byte gSpriteCoordOffsetY +_0807C14C: .4byte gSpriteCoordOffsetX thumb_func_end sub_807C0A4 thumb_func_start sub_807C150 @@ -1927,7 +1927,7 @@ sub_807C150: @ 807C150 strb r0, [r2] ldr r0, _0807C1A4 @ =sub_807C1AC str r0, [r3, 0x1C] - ldr r1, _0807C1A8 @ =gUnknown_2021BCA + ldr r1, _0807C1A8 @ =gSpriteCoordOffsetY adds r0, r3, 0 adds r0, 0x29 ldrb r0, [r0] @@ -1952,7 +1952,7 @@ _0807C196: _0807C19C: .4byte gUnknown_83C2BBC _0807C1A0: .4byte 0x000006e2 _0807C1A4: .4byte sub_807C1AC -_0807C1A8: .4byte gUnknown_2021BCA +_0807C1A8: .4byte gSpriteCoordOffsetY thumb_func_end sub_807C150 thumb_func_start sub_807C1AC @@ -1991,7 +1991,7 @@ _0807C1DE: ldrsb r5, [r0, r5] ldrh r0, [r4, 0x20] adds r0, r5 - ldr r1, _0807C228 @ =gUnknown_2021BC8 + ldr r1, _0807C228 @ =gSpriteCoordOffsetX ldrh r1, [r1] adds r3, r1, r0 ldr r2, _0807C22C @ =0x000001ff @@ -2021,7 +2021,7 @@ _0807C210: b _0807C23C .align 2, 0 _0807C224: .4byte gUnknown_825E074 -_0807C228: .4byte gUnknown_2021BC8 +_0807C228: .4byte gSpriteCoordOffsetX _0807C22C: .4byte 0x000001ff _0807C230: .4byte 0xffffff00 _0807C234: @@ -2038,7 +2038,7 @@ _0807C23E: ldrsb r3, [r0, r3] ldrh r0, [r4, 0x22] adds r0, r3 - ldr r1, _0807C27C @ =gUnknown_2021BCA + ldr r1, _0807C27C @ =gSpriteCoordOffsetY ldrh r1, [r1] adds r2, r1, r0 movs r0, 0xFF @@ -2063,7 +2063,7 @@ _0807C23E: strh r0, [r4, 0x3A] b _0807C2AC .align 2, 0 -_0807C27C: .4byte gUnknown_2021BCA +_0807C27C: .4byte gSpriteCoordOffsetY _0807C280: adds r0, r2, 0 subs r0, 0xF3 @@ -2942,7 +2942,7 @@ Fog1_Main: @ 807C990 push {r4-r6,lr} ldr r0, _0807C9DC @ =gUnknown_83C2BBC ldr r6, [r0] - ldr r0, _0807C9E0 @ =gUnknown_2021BC8 + ldr r0, _0807C9E0 @ =gSpriteCoordOffsetX ldr r1, _0807C9E4 @ =0x000006f2 adds r2, r6, r1 ldrh r0, [r0] @@ -2979,7 +2979,7 @@ _0807C9CA: b _0807CA46 .align 2, 0 _0807C9DC: .4byte gUnknown_83C2BBC -_0807C9E0: .4byte gUnknown_2021BC8 +_0807C9E0: .4byte gSpriteCoordOffsetX _0807C9E4: .4byte 0x000006f2 _0807C9E8: .4byte 0x000006ee _0807C9EC: .4byte 0x000006cc @@ -3037,7 +3037,7 @@ Fog1_Finish: @ 807CA50 push {r4,lr} ldr r0, _0807CAA0 @ =gUnknown_83C2BBC ldr r2, [r0] - ldr r0, _0807CAA4 @ =gUnknown_2021BC8 + ldr r0, _0807CAA4 @ =gSpriteCoordOffsetX ldr r1, _0807CAA8 @ =0x000006f2 adds r3, r2, r1 ldrh r0, [r0] @@ -3076,7 +3076,7 @@ _0807CA8A: b _0807CADE .align 2, 0 _0807CAA0: .4byte gUnknown_83C2BBC -_0807CAA4: .4byte gUnknown_2021BC8 +_0807CAA4: .4byte gSpriteCoordOffsetX _0807CAA8: .4byte 0x000006f2 _0807CAAC: .4byte 0x000006ee _0807CAB0: .4byte 0x000006ce @@ -3118,7 +3118,7 @@ _0807CAE4: Fog1SpriteCallback: @ 807CAEC push {r4,lr} adds r3, r0, 0 - ldr r0, _0807CB38 @ =gUnknown_2021BCA + ldr r0, _0807CB38 @ =gSpriteCoordOffsetY ldrb r0, [r0] strh r0, [r3, 0x26] ldr r0, _0807CB3C @ =gUnknown_83C2BBC @@ -3155,7 +3155,7 @@ _0807CB30: pop {r0} bx r0 .align 2, 0 -_0807CB38: .4byte gUnknown_2021BCA +_0807CB38: .4byte gSpriteCoordOffsetY _0807CB3C: .4byte gUnknown_83C2BBC _0807CB40: .4byte 0x000006ee _0807CB44: .4byte 0x010f0000 @@ -3194,7 +3194,7 @@ _0807CB70: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0807CBD0 @ =gUnknown_202063C + ldr r0, _0807CBD0 @ =gSprites adds r4, r0 adds r0, r5, 0 movs r1, 0x5 @@ -3223,7 +3223,7 @@ _0807CBC0: .4byte gUnknown_83C2BBC _0807CBC4: .4byte 0x000006fb _0807CBC8: .4byte gUnknown_83C67A8 _0807CBCC: .4byte gUnknown_83C6790 -_0807CBD0: .4byte gUnknown_202063C +_0807CBD0: .4byte gSprites _0807CBD4: ldr r2, _0807CC00 @ =gUnknown_83C2BBC ldr r1, [r2] @@ -3374,7 +3374,7 @@ Ash_Main: @ 807CCE8 push {r4,r5,lr} ldr r2, _0807CD2C @ =gUnknown_83C2BBC ldr r1, [r2] - ldr r0, _0807CD30 @ =gUnknown_2021BC8 + ldr r0, _0807CD30 @ =gSpriteCoordOffsetX ldrh r0, [r0] ldr r3, _0807CD34 @ =0x000001ff ands r3, r0 @@ -3408,7 +3408,7 @@ _0807CD14: b _0807CD88 .align 2, 0 _0807CD2C: .4byte gUnknown_83C2BBC -_0807CD30: .4byte gUnknown_2021BC8 +_0807CD30: .4byte gSpriteCoordOffsetX _0807CD34: .4byte 0x000001ff _0807CD38: .4byte 0x000006fc _0807CD3C: .4byte 0x000006cc @@ -3550,7 +3550,7 @@ _0807CE20: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0807CE80 @ =gUnknown_202063C + ldr r0, _0807CE80 @ =gSprites adds r4, r0 movs r0, 0 strh r0, [r4, 0x30] @@ -3581,7 +3581,7 @@ _0807CE20: .align 2, 0 _0807CE78: .4byte gUnknown_83C2BBC _0807CE7C: .4byte gUnknown_83C67D0 -_0807CE80: .4byte gUnknown_202063C +_0807CE80: .4byte gSprites _0807CE84: ldr r2, _0807CEB0 @ =gUnknown_83C2BBC ldr r1, [r2] @@ -3672,7 +3672,7 @@ sub_807CF08: @ 807CF08 adds r0, 0x1 strh r0, [r3, 0x2E] _0807CF24: - ldr r1, _0807CF70 @ =gUnknown_2021BCA + ldr r1, _0807CF70 @ =gSpriteCoordOffsetY ldrh r0, [r3, 0x2E] ldrh r1, [r1] adds r0, r1 @@ -3711,7 +3711,7 @@ _0807CF68: pop {r0} bx r0 .align 2, 0 -_0807CF70: .4byte gUnknown_2021BCA +_0807CF70: .4byte gSpriteCoordOffsetY _0807CF74: .4byte gUnknown_83C2BBC _0807CF78: .4byte 0x000006fc _0807CF7C: .4byte 0x010f0000 @@ -3956,7 +3956,7 @@ _0807D128: strh r0, [r1] strh r5, [r2] _0807D144: - ldr r0, _0807D188 @ =gUnknown_2021BC8 + ldr r0, _0807D188 @ =gSpriteCoordOffsetX movs r2, 0xE4 lsls r2, 3 adds r1, r3, r2 @@ -3968,7 +3968,7 @@ _0807D144: subs r2, 0x8 adds r1, r3, r2 strh r0, [r1] - ldr r1, _0807D18C @ =gUnknown_2021BCA + ldr r1, _0807D18C @ =gSpriteCoordOffsetY adds r2, 0xA adds r0, r3, r2 ldrh r0, [r0] @@ -3986,8 +3986,8 @@ _0807D178: .4byte 0x0000071c _0807D17C: .4byte 0x0000ffff _0807D180: .4byte 0x0000071e _0807D184: .4byte 0x00000722 -_0807D188: .4byte gUnknown_2021BC8 -_0807D18C: .4byte gUnknown_2021BCA +_0807D188: .4byte gSpriteCoordOffsetX +_0807D18C: .4byte gSpriteCoordOffsetY thumb_func_end sub_807D0FC thumb_func_start CreateFog2Sprites @@ -4027,7 +4027,7 @@ _0807D1B4: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0807D20C @ =gUnknown_202063C + ldr r0, _0807D20C @ =gSprites adds r4, r0 adds r0, r6, 0 movs r1, 0x5 @@ -4048,7 +4048,7 @@ _0807D1FC: .4byte gUnknown_83C2BBC _0807D200: .4byte 0x00000724 _0807D204: .4byte gUnknown_83C67E8 _0807D208: .4byte gUnknown_83C6804 -_0807D20C: .4byte gUnknown_202063C +_0807D20C: .4byte gSprites _0807D210: ldr r2, _0807D240 @ =gUnknown_83C2BBC ldr r1, [r2] @@ -4440,7 +4440,7 @@ sub_807D4C4: @ 807D4C4 ldr r0, [r3] subs r0, r1 str r0, [r3] - ldr r1, _0807D538 @ =gUnknown_2021BC8 + ldr r1, _0807D538 @ =gSpriteCoordOffsetX ldr r0, [r4] lsrs r0, 8 ldrh r1, [r1] @@ -4450,7 +4450,7 @@ sub_807D4C4: @ 807D4C4 ldr r4, _0807D53C @ =0x0000070e adds r1, r2, r4 strh r0, [r1] - ldr r1, _0807D540 @ =gUnknown_2021BCA + ldr r1, _0807D540 @ =gSpriteCoordOffsetY ldr r0, [r3] lsrs r0, 8 ldrh r1, [r1] @@ -4467,9 +4467,9 @@ _0807D528: .4byte gUnknown_83C2BBC _0807D52C: .4byte 0x00000704 _0807D530: .4byte gUnknown_825E074 _0807D534: .4byte 0x00000712 -_0807D538: .4byte gUnknown_2021BC8 +_0807D538: .4byte gSpriteCoordOffsetX _0807D53C: .4byte 0x0000070e -_0807D540: .4byte gUnknown_2021BCA +_0807D540: .4byte gSpriteCoordOffsetY thumb_func_end sub_807D4C4 thumb_func_start sub_807D544 @@ -4590,7 +4590,7 @@ _0807D5F8: lsls r4, r1, 4 adds r4, r1 lsls r4, 2 - ldr r0, _0807D65C @ =gUnknown_202063C + ldr r0, _0807D65C @ =gSprites adds r4, r0 str r4, [r5] adds r0, r7, 0 @@ -4608,7 +4608,7 @@ _0807D64C: .4byte 0x00000716 _0807D650: .4byte gUnknown_83C6854 _0807D654: .4byte gUnknown_83C2D20 _0807D658: .4byte gUnknown_83C683C -_0807D65C: .4byte gUnknown_202063C +_0807D65C: .4byte gSprites _0807D660: ldr r2, _0807D690 @ =gUnknown_83C2BBC ldr r1, [r2] @@ -4685,7 +4685,7 @@ _0807D6B8: lsls r2, r1, 4 adds r2, r1 lsls r2, 2 - ldr r0, _0807D74C @ =gUnknown_202063C + ldr r0, _0807D74C @ =gSprites adds r2, r0 str r2, [r4] ldrb r1, [r2, 0x3] @@ -4727,7 +4727,7 @@ _0807D6B8: _0807D740: .4byte gUnknown_83C2BBC _0807D744: .4byte 0x00000717 _0807D748: .4byte gUnknown_83C683C -_0807D74C: .4byte gUnknown_202063C +_0807D74C: .4byte gSprites _0807D750: .4byte 0x00006730 _0807D754: .4byte gUnknown_83C685C _0807D758: .4byte SandstormSpriteCallback2 @@ -5092,7 +5092,7 @@ sub_807D9E8: @ 807D9E8 adds r3, r0, r1 adds r1, 0x2 adds r0, r1 - ldr r1, _0807DA5C @ =gUnknown_2021BCA + ldr r1, _0807DA5C @ =gSpriteCoordOffsetY ldrh r2, [r0] ldrh r0, [r1] subs r2, r0 @@ -5107,7 +5107,7 @@ sub_807D9E8: @ 807D9E8 lsrs r2, r0, 24 cmp r2, 0x40 beq _0807DA50 - ldr r0, _0807DA64 @ =gUnknown_202063C + ldr r0, _0807DA64 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -5142,9 +5142,9 @@ _0807DA50: bx r0 .align 2, 0 _0807DA58: .4byte gUnknown_83C6878 -_0807DA5C: .4byte gUnknown_2021BCA +_0807DA5C: .4byte gSpriteCoordOffsetY _0807DA60: .4byte gUnknown_83C68BC -_0807DA64: .4byte gUnknown_202063C +_0807DA64: .4byte gSprites _0807DA68: .4byte gUnknown_83C2BBC _0807DA6C: .4byte 0x0000072c thumb_func_end sub_807D9E8 @@ -5153,7 +5153,7 @@ _0807DA6C: .4byte 0x0000072c sub_807DA70: @ 807DA70 push {r4,r5,lr} movs r4, 0 - ldr r5, _0807DAA8 @ =gUnknown_202063C + ldr r5, _0807DAA8 @ =gSprites _0807DA76: lsls r0, r4, 4 adds r0, r4 @@ -5179,7 +5179,7 @@ _0807DA90: pop {r0} bx r0 .align 2, 0 -_0807DAA8: .4byte gUnknown_202063C +_0807DAA8: .4byte gSprites _0807DAAC: .4byte gUnknown_83C68BC _0807DAB0: .4byte 0x00001205 thumb_func_end sub_807DA70 diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index c13f2c389..71ca8f080 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -317,7 +317,7 @@ _08097ABC: bl Alloc str r0, [r4] movs r7, 0 - ldr r5, _08097B44 @ =gUnknown_202063C + ldr r5, _08097B44 @ =gSprites _08097AE2: ldr r0, _08097B48 @ =gUnknown_2037078 ldrb r1, [r0, 0x4] @@ -365,7 +365,7 @@ _08097AE2: _08097B38: .4byte gUnknown_2039A04 _08097B3C: .4byte 0x0000ffff _08097B40: .4byte gUnknown_2039870 -_08097B44: .4byte gUnknown_202063C +_08097B44: .4byte gSprites _08097B48: .4byte gUnknown_2037078 _08097B4C: .4byte gUnknown_83D414C thumb_func_end sub_8097A48 @@ -492,7 +492,7 @@ _08097C1C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08097C68 @ =gUnknown_202063C + ldr r5, _08097C68 @ =gSprites adds r0, r5 bl DestroySprite adds r0, r4, 0x1 @@ -517,7 +517,7 @@ _08097C1C: bx r0 .align 2, 0 _08097C64: .4byte gUnknown_2039870 -_08097C68: .4byte gUnknown_202063C +_08097C68: .4byte gSprites thumb_func_end sub_8097C18 thumb_func_start sub_8097C6C diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s index a2ff63c00..a44f60980 100644 --- a/asm/fldeff_sweetscent.s +++ b/asm/fldeff_sweetscent.s @@ -98,7 +98,7 @@ sub_80DE134: @ 80DE134 adds r2, r5, 0 bl CpuFastSet bl GetPlayerAvatarObjectId - ldr r2, _080DE1C4 @ =gUnknown_202063C + ldr r2, _080DE1C4 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -139,7 +139,7 @@ sub_80DE134: @ 80DE134 _080DE1B8: .4byte gUnknown_203AAB0 _080DE1BC: .4byte gUnknown_20371F8 _080DE1C0: .4byte gUnknown_20375F8 -_080DE1C4: .4byte gUnknown_202063C +_080DE1C4: .4byte gSprites _080DE1C8: .4byte sub_80DE1D0 _080DE1CC: .4byte gUnknown_3005090 thumb_func_end sub_80DE134 @@ -191,7 +191,7 @@ _080DE228: ldr r1, _080DE260 @ =sub_80DE274 str r1, [r0] bl GetPlayerAvatarObjectId - ldr r2, _080DE264 @ =gUnknown_202063C + ldr r2, _080DE264 @ =gSprites lsls r0, 24 lsrs r0, 24 lsls r1, r0, 4 @@ -213,7 +213,7 @@ _080DE228: b _080DE26C .align 2, 0 _080DE260: .4byte sub_80DE274 -_080DE264: .4byte gUnknown_202063C +_080DE264: .4byte gSprites _080DE268: adds r0, r3, 0x1 strh r0, [r2] diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index ea1c07052..3991404e9 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -695,7 +695,7 @@ _080F22F2: bl sub_810C1CC lsls r0, 24 lsrs r0, 24 - ldr r3, _080F2390 @ =gUnknown_202063C + ldr r3, _080F2390 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -737,7 +737,7 @@ _080F22F2: .align 2, 0 _080F2388: .4byte gUnknown_840C298 _080F238C: .4byte 0x0000ffff -_080F2390: .4byte gUnknown_202063C +_080F2390: .4byte gSprites _080F2394: .4byte sub_80F3870 _080F2398: .4byte gUnknown_3005090 _080F239C: .4byte sub_80F23A0 @@ -760,7 +760,7 @@ sub_80F23A0: @ 80F23A0 lsls r0, 2 ldr r2, [r2] adds r6, r2, r0 - ldr r2, _080F2418 @ =gUnknown_202063C + ldr r2, _080F2418 @ =gSprites adds r1, 0x5 lsls r1, 1 adds r1, r3 @@ -803,7 +803,7 @@ _080F2408: .align 2, 0 _080F2410: .4byte gUnknown_3005090 _080F2414: .4byte gUnknown_203AB38 -_080F2418: .4byte gUnknown_202063C +_080F2418: .4byte gSprites _080F241C: .4byte 0x000001ff _080F2420: .4byte Task_Hof_TryDisplayAnotherMon thumb_func_end sub_80F23A0 @@ -844,7 +844,7 @@ _080F2460: .4byte gUnknown_3005090 _080F2464: .4byte gUnknown_203AB38 _080F2468: ldr r2, _080F24E0 @ =gUnknown_203AB34 - ldr r0, _080F24E4 @ =gUnknown_202063C + ldr r0, _080F24E4 @ =gSprites mov r8, r0 adds r0, r3, 0x5 lsls r0, 1 @@ -904,7 +904,7 @@ _080F2468: b _080F2500 .align 2, 0 _080F24E0: .4byte gUnknown_203AB34 -_080F24E4: .4byte gUnknown_202063C +_080F24E4: .4byte gSprites _080F24E8: .4byte 0x000001ff _080F24EC: .4byte 0x00007716 _080F24F0: .4byte sub_80F22B0 @@ -948,7 +948,7 @@ Task_Hof_PaletteFadeAndPrintWelcomeText: @ 80F2514 ldr r0, _080F25A0 @ =gUnknown_3005098 mov r12, r0 mov r8, r1 - ldr r6, _080F25A4 @ =gUnknown_202063C + ldr r6, _080F25A4 @ =gSprites movs r7, 0xD negs r7, r7 _080F2542: @@ -999,7 +999,7 @@ _080F2564: .align 2, 0 _080F259C: .4byte 0xffff0000 _080F25A0: .4byte gUnknown_3005098 -_080F25A4: .4byte gUnknown_202063C +_080F25A4: .4byte gSprites _080F25A8: .4byte gUnknown_3005090 _080F25AC: .4byte sub_80F25B0 thumb_func_end Task_Hof_PaletteFadeAndPrintWelcomeText @@ -1046,7 +1046,7 @@ _080F25F4: adds r4, r5, 0 adds r7, 0x8 mov r8, r7 - ldr r7, _080F2684 @ =gUnknown_202063C + ldr r7, _080F2684 @ =gSprites movs r1, 0xD negs r1, r1 mov r12, r1 @@ -1110,7 +1110,7 @@ _080F266E: bx r0 .align 2, 0 _080F2680: .4byte gUnknown_203AB34 -_080F2684: .4byte gUnknown_202063C +_080F2684: .4byte gSprites _080F2688: .4byte 0x00007716 _080F268C: .4byte gUnknown_3005090 _080F2690: .4byte sub_80F2694 @@ -1234,7 +1234,7 @@ Task_Hof_WaitAndPrintPlayerInfo: @ 80F2760 .align 2, 0 _080F2784: .4byte gUnknown_3005090 _080F2788: - ldr r2, _080F27A8 @ =gUnknown_202063C + ldr r2, _080F27A8 @ =gSprites movs r3, 0x10 ldrsh r1, [r4, r3] lsls r0, r1, 4 @@ -1250,7 +1250,7 @@ _080F2788: strh r0, [r1, 0x20] b _080F27F4 .align 2, 0 -_080F27A8: .4byte gUnknown_202063C +_080F27A8: .4byte gSprites _080F27AC: movs r0, 0x20 str r0, [sp] @@ -1828,7 +1828,7 @@ _080F2C4C: bl sub_810C1CC lsls r0, 16 lsrs r0, 16 - ldr r2, _080F2CA4 @ =gUnknown_202063C + ldr r2, _080F2CA4 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -1850,7 +1850,7 @@ _080F2C4C: .align 2, 0 _080F2C9C: .4byte gUnknown_840C298 _080F2CA0: .4byte 0x0000ffff -_080F2CA4: .4byte gUnknown_202063C +_080F2CA4: .4byte gSprites _080F2CA8: adds r0, r5, 0x5 lsls r0, 1 @@ -1970,7 +1970,7 @@ _080F2D94: lsls r6, r0, 3 ldr r0, _080F2E70 @ =gUnknown_3005098 mov r10, r0 - ldr r1, _080F2E74 @ =gUnknown_202063C + ldr r1, _080F2E74 @ =gSprites mov r8, r1 movs r2, 0xD negs r2, r2 @@ -2017,7 +2017,7 @@ _080F2DD0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080F2E74 @ =gUnknown_202063C + ldr r1, _080F2E74 @ =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r1, 0xD @@ -2072,7 +2072,7 @@ _080F2E4A: _080F2E68: .4byte gUnknown_203AB38 _080F2E6C: .4byte gUnknown_3005090 _080F2E70: .4byte gUnknown_3005098 -_080F2E74: .4byte gUnknown_202063C +_080F2E74: .4byte gSprites _080F2E78: .4byte 0xffff0000 _080F2E7C: .4byte gUnknown_203AB34 _080F2E80: .4byte 0x00007716 @@ -3076,7 +3076,7 @@ sub_80F36BC: @ 80F36BC bl reset_temp_tile_data_buffers bl dp13_810BB8C bl FreeAllSpritePalettes - ldr r1, _080F36EC @ =gUnknown_3003E58 + ldr r1, _080F36EC @ =gReservedSpritePaletteCount movs r0, 0x8 strb r0, [r1] ldr r0, _080F36F0 @ =gUnknown_840C248 @@ -3086,7 +3086,7 @@ sub_80F36BC: @ 80F36BC pop {r0} bx r0 .align 2, 0 -_080F36EC: .4byte gUnknown_3003E58 +_080F36EC: .4byte gReservedSpritePaletteCount _080F36F0: .4byte gUnknown_840C248 _080F36F4: .4byte gUnknown_840C258 thumb_func_end sub_80F36BC @@ -3407,7 +3407,7 @@ sub_80F3930: @ 80F3930 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080F39A4 @ =gUnknown_202063C + ldr r0, _080F39A4 @ =gSprites adds r4, r1, r0 bl Random lsls r0, 16 @@ -3428,7 +3428,7 @@ sub_80F3930: @ 80F3930 b _080F39AA .align 2, 0 _080F39A0: .4byte gUnknown_840C384 -_080F39A4: .4byte gUnknown_202063C +_080F39A4: .4byte gSprites _080F39A8: movs r0, 0x1 _080F39AA: diff --git a/asm/intro.s b/asm/intro.s index 824471b40..0658c0965 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -1753,7 +1753,7 @@ sub_80ED444: @ 80ED444 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080ED498 @ =gUnknown_202063C + ldr r1, _080ED498 @ =gSprites adds r0, r1 str r0, [r4, 0x20] _080ED46E: @@ -1769,7 +1769,7 @@ _080ED46E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080ED498 @ =gUnknown_202063C + ldr r1, _080ED498 @ =gSprites adds r0, r1 str r0, [r4, 0x1C] _080ED48E: @@ -1778,7 +1778,7 @@ _080ED48E: bx r0 .align 2, 0 _080ED494: .4byte gUnknown_840BDA8 -_080ED498: .4byte gUnknown_202063C +_080ED498: .4byte gSprites _080ED49C: .4byte gUnknown_840BDC0 thumb_func_end sub_80ED444 @@ -2190,7 +2190,7 @@ sub_80ED7D4: @ 80ED7D4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080ED804 @ =gUnknown_202063C + ldr r1, _080ED804 @ =gSprites adds r0, r1 str r0, [r4, 0x24] ldr r1, _080ED808 @ =sub_80ED818 @@ -2198,7 +2198,7 @@ sub_80ED7D4: @ 80ED7D4 b _080ED810 .align 2, 0 _080ED800: .4byte gUnknown_840BDFC -_080ED804: .4byte gUnknown_202063C +_080ED804: .4byte gSprites _080ED808: .4byte sub_80ED818 _080ED80C: movs r0, 0 @@ -2608,7 +2608,7 @@ _080EDAF6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080EDB6C @ =gUnknown_202063C + ldr r1, _080EDB6C @ =gSprites adds r4, r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -2639,7 +2639,7 @@ _080EDB5C: bx r0 .align 2, 0 _080EDB68: .4byte gUnknown_840BE4C -_080EDB6C: .4byte gUnknown_202063C +_080EDB6C: .4byte gSprites thumb_func_end sub_80EDAF0 thumb_func_start sub_80EDB70 @@ -2661,7 +2661,7 @@ sub_80EDB70: @ 80EDB70 movs r2, 0x2A bl sub_8007FFC ldr r0, [r4, 0x18] - ldr r1, _080EDBA4 @ =nullsub_8 + ldr r1, _080EDBA4 @ =SpriteCallbackDummy str r1, [r0, 0x1C] movs r1, 0x1 bl StartSpriteAffineAnim @@ -2669,7 +2669,7 @@ sub_80EDB70: @ 80EDB70 pop {r0} bx r0 .align 2, 0 -_080EDBA4: .4byte nullsub_8 +_080EDBA4: .4byte SpriteCallbackDummy thumb_func_end sub_80EDB70 thumb_func_start nullsub_83 @@ -2812,7 +2812,7 @@ _080EDCA2: lsrs r1, r0, 24 cmp r1, 0x40 beq _080EDCDE - ldr r0, _080EDD24 @ =gUnknown_202063C + ldr r0, _080EDD24 @ =gSprites lsls r3, r1, 4 adds r3, r1 lsls r3, 2 @@ -2852,7 +2852,7 @@ _080EDD14: .4byte gUnknown_203AB24 _080EDD18: .4byte gUnknown_203AB28 _080EDD1C: .4byte 0x151b9245 _080EDD20: .4byte gUnknown_840BC6C -_080EDD24: .4byte gUnknown_202063C +_080EDD24: .4byte gSprites thumb_func_end sub_80EDC40 thumb_func_start sub_80EDD28 @@ -2914,7 +2914,7 @@ _080EDD5C: lsrs r2, r0, 24 cmp r2, 0x40 beq _080EDDC6 - ldr r0, _080EDDDC @ =gUnknown_202063C + ldr r0, _080EDDDC @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -2945,7 +2945,7 @@ _080EDDCC: .4byte gUnknown_203AB12 _080EDDD0: .4byte gUnknown_203AB2C _080EDDD4: .4byte 0xffff0000 _080EDDD8: .4byte gUnknown_840BC84 -_080EDDDC: .4byte gUnknown_202063C +_080EDDDC: .4byte gSprites _080EDDE0: .4byte gUnknown_203AB22 _080EDDE4: .4byte gUnknown_203AB24 _080EDDE8: .4byte gUnknown_203AB1E @@ -3008,7 +3008,7 @@ sub_80EDE04: @ 80EDE04 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, _080EDEBC @ =gUnknown_202063C + ldr r5, _080EDEBC @ =gSprites adds r7, r4, r5 adds r0, r7, 0 movs r1, 0x1 @@ -3053,7 +3053,7 @@ _080EDE88: _080EDEB0: .4byte gUnknown_3005098 _080EDEB4: .4byte gUnknown_840BC84 _080EDEB8: .4byte gUnknown_840BC08 -_080EDEBC: .4byte gUnknown_202063C +_080EDEBC: .4byte gSprites _080EDEC0: .4byte sub_80EE40C _080EDEC4: movs r0, 0 @@ -3159,13 +3159,13 @@ sub_80EDF68: @ 80EDF68 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080EDF90 @ =gUnknown_202063C + ldr r1, _080EDF90 @ =gSprites adds r0, r1 pop {r1} bx r1 .align 2, 0 _080EDF8C: .4byte gUnknown_840BCDC -_080EDF90: .4byte gUnknown_202063C +_080EDF90: .4byte gSprites thumb_func_end sub_80EDF68 thumb_func_start sub_80EDF94 @@ -3421,7 +3421,7 @@ sub_80EE160: @ 80EE160 lsrs r1, r0, 24 cmp r1, 0x40 beq _080EE1B4 - ldr r0, _080EE1C0 @ =gUnknown_202063C + ldr r0, _080EE1C0 @ =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -3449,7 +3449,7 @@ _080EE1B4: bx r0 .align 2, 0 _080EE1BC: .4byte gUnknown_840BE8C -_080EE1C0: .4byte gUnknown_202063C +_080EE1C0: .4byte gSprites thumb_func_end sub_80EE160 thumb_func_start sub_80EE1C4 @@ -3888,7 +3888,7 @@ sub_80EE4F8: @ 80EE4F8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080EE524 @ =gUnknown_202063C + ldr r0, _080EE524 @ =gSprites adds r1, r0 str r1, [r4, 0x18] pop {r4} @@ -3896,7 +3896,7 @@ sub_80EE4F8: @ 80EE4F8 bx r0 .align 2, 0 _080EE520: .4byte gUnknown_840BD88 -_080EE524: .4byte gUnknown_202063C +_080EE524: .4byte gSprites thumb_func_end sub_80EE4F8 thumb_func_start sub_80EE528 @@ -3978,14 +3978,14 @@ _080EE5A0: cmp r0, r1 blt _080EE5BE strh r3, [r2, 0x20] - ldr r0, _080EE5C4 @ =nullsub_8 + ldr r0, _080EE5C4 @ =SpriteCallbackDummy str r0, [r2, 0x1C] _080EE5BE: pop {r4} pop {r0} bx r0 .align 2, 0 -_080EE5C4: .4byte nullsub_8 +_080EE5C4: .4byte SpriteCallbackDummy thumb_func_end sub_80EE580 thumb_func_start sub_80EE5C8 @@ -4104,14 +4104,14 @@ _080EE67C: bl StartSpriteAnim movs r0, 0 strh r0, [r4, 0x26] - ldr r0, _080EE6A0 @ =nullsub_8 + ldr r0, _080EE6A0 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _080EE69A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080EE6A0: .4byte nullsub_8 +_080EE6A0: .4byte SpriteCallbackDummy thumb_func_end sub_80EE610 thumb_func_start sub_80EE6A4 @@ -4336,14 +4336,14 @@ _080EE84C: .4byte gUnknown_203AB0A sub_80EE850: @ 80EE850 ldr r0, [r0, 0x18] ldr r1, [r0, 0x1C] - ldr r0, _080EE860 @ =nullsub_8 + ldr r0, _080EE860 @ =SpriteCallbackDummy eors r1, r0 negs r0, r1 orrs r0, r1 lsrs r0, 31 bx lr .align 2, 0 -_080EE860: .4byte nullsub_8 +_080EE860: .4byte SpriteCallbackDummy thumb_func_end sub_80EE850 thumb_func_start sub_80EE864 @@ -4373,7 +4373,7 @@ _080EE880: lsrs r1, r0, 24 cmp r1, 0x40 beq _080EE8C4 - ldr r0, _080EE8DC @ =gUnknown_202063C + ldr r0, _080EE8DC @ =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -4406,7 +4406,7 @@ _080EE8C4: .align 2, 0 _080EE8D4: .4byte 0xffea0000 _080EE8D8: .4byte gUnknown_840BEC4 -_080EE8DC: .4byte gUnknown_202063C +_080EE8DC: .4byte gSprites _080EE8E0: .4byte 0x41c64e6d thumb_func_end sub_80EE864 @@ -4630,14 +4630,14 @@ _080EEA6E: movs r1, 0 bl StartSpriteAnim _080EEA84: - ldr r0, _080EEA90 @ =nullsub_8 + ldr r0, _080EEA90 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _080EEA88: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_080EEA90: .4byte nullsub_8 +_080EEA90: .4byte SpriteCallbackDummy thumb_func_end sub_80EE9D4 thumb_func_start sub_80EEA94 @@ -4803,7 +4803,7 @@ _080EEBC0: asrs r0, 20 cmp r0, 0x3F ble _080EEBCE - ldr r0, _080EEBE0 @ =nullsub_8 + ldr r0, _080EEBE0 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _080EEBCE: pop {r4,r5} @@ -4813,7 +4813,7 @@ _080EEBCE: _080EEBD4: .4byte gUnknown_825E074 _080EEBD8: .4byte gUnknown_203AB04 _080EEBDC: .4byte gUnknown_203AB08 -_080EEBE0: .4byte nullsub_8 +_080EEBE0: .4byte SpriteCallbackDummy thumb_func_end sub_80EEB08 thumb_func_start sub_80EEBE4 diff --git a/asm/item_menu_icons.s b/asm/item_menu_icons.s index 9a09111cb..118591dc2 100644 --- a/asm/item_menu_icons.s +++ b/asm/item_menu_icons.s @@ -62,7 +62,7 @@ sub_8098528: @ 8098528 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _08098554 @ =gUnknown_202063C + ldr r2, _08098554 @ =gSprites adds r0, r2 ldr r2, _08098558 @ =0x0000fffb strh r2, [r0, 0x26] @@ -73,7 +73,7 @@ sub_8098528: @ 8098528 bx r0 .align 2, 0 _08098550: .4byte gUnknown_2039878 -_08098554: .4byte gUnknown_202063C +_08098554: .4byte gSprites _08098558: .4byte 0x0000fffb _0809855C: .4byte sub_8098560 thumb_func_end sub_8098528 @@ -91,13 +91,13 @@ sub_8098560: @ 8098560 strh r0, [r1, 0x26] b _08098578 _08098574: - ldr r0, _0809857C @ =nullsub_8 + ldr r0, _0809857C @ =SpriteCallbackDummy str r0, [r1, 0x1C] _08098578: pop {r0} bx r0 .align 2, 0 -_0809857C: .4byte nullsub_8 +_0809857C: .4byte SpriteCallbackDummy thumb_func_end sub_8098560 thumb_func_start sub_8098580 @@ -108,7 +108,7 @@ sub_8098580: @ 8098580 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080985B4 @ =gUnknown_202063C + ldr r1, _080985B4 @ =gSprites adds r4, r0, r1 adds r0, r4, 0 adds r0, 0x3F @@ -128,7 +128,7 @@ _080985AA: bx r0 .align 2, 0 _080985B0: .4byte gUnknown_2039878 -_080985B4: .4byte gUnknown_202063C +_080985B4: .4byte gSprites _080985B8: .4byte sub_80985BC thumb_func_end sub_8098580 @@ -145,14 +145,14 @@ sub_80985BC: @ 80985BC adds r0, r4, 0 movs r1, 0 bl StartSpriteAffineAnim - ldr r0, _080985E0 @ =nullsub_8 + ldr r0, _080985E0 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _080985D8: pop {r4} pop {r0} bx r0 .align 2, 0 -_080985E0: .4byte nullsub_8 +_080985E0: .4byte SpriteCallbackDummy thumb_func_end sub_80985BC thumb_func_start sub_80985E4 @@ -160,7 +160,7 @@ sub_80985E4: @ 80985E4 push {r4-r7,lr} ldr r7, _08098620 @ =gUnknown_2039879 movs r5, 0 - ldr r6, _08098624 @ =gUnknown_202063C + ldr r6, _08098624 @ =gSprites _080985EC: lsls r1, r5, 20 movs r0, 0xC0 @@ -188,7 +188,7 @@ _080985EC: b _0809863C .align 2, 0 _08098620: .4byte gUnknown_2039879 -_08098624: .4byte gUnknown_202063C +_08098624: .4byte gSprites _08098628: .4byte gUnknown_83D4250 _0809862C: ldrb r1, [r4] @@ -226,7 +226,7 @@ sub_8098660: @ 8098660 lsrs r0, 24 ldr r7, _080986A0 @ =gUnknown_2039879 movs r3, 0 - ldr r6, _080986A4 @ =gUnknown_202063C + ldr r6, _080986A4 @ =gSprites movs r1, 0x1 ands r0, r1 lsls r4, r0, 2 @@ -255,7 +255,7 @@ _08098676: bx r0 .align 2, 0 _080986A0: .4byte gUnknown_2039879 -_080986A4: .4byte gUnknown_202063C +_080986A4: .4byte gSprites thumb_func_end sub_8098660 thumb_func_start sub_80986A8 @@ -267,7 +267,7 @@ sub_80986A8: @ 80986A8 lsrs r1, 16 ldr r7, _080986E4 @ =gUnknown_2039879 movs r3, 0 - ldr r4, _080986E8 @ =gUnknown_202063C + ldr r4, _080986E8 @ =gSprites adds r5, r1, 0x7 _080986BA: adds r2, r7, r3 @@ -293,7 +293,7 @@ _080986BA: bx r0 .align 2, 0 _080986E4: .4byte gUnknown_2039879 -_080986E8: .4byte gUnknown_202063C +_080986E8: .4byte gSprites thumb_func_end sub_80986A8 thumb_func_start sub_80986EC @@ -561,7 +561,7 @@ sub_80988E8: @ 80988E8 cmp r2, 0x40 beq _08098932 strb r2, [r5] - ldr r1, _0809893C @ =gUnknown_202063C + ldr r1, _0809893C @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -576,7 +576,7 @@ _08098932: bx r0 .align 2, 0 _08098938: .4byte gUnknown_2039882 -_0809893C: .4byte gUnknown_202063C +_0809893C: .4byte gSprites thumb_func_end sub_80988E8 thumb_func_start sub_8098940 @@ -593,7 +593,7 @@ sub_8098940: @ 8098940 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08098970 @ =gUnknown_202063C + ldr r1, _08098970 @ =gSprites adds r0, r1 bl DestroySpriteAndFreeResources movs r0, 0xFF @@ -604,7 +604,7 @@ _08098964: bx r0 .align 2, 0 _0809896C: .4byte gUnknown_2039882 -_08098970: .4byte gUnknown_202063C +_08098970: .4byte gSprites thumb_func_end sub_8098940 thumb_func_start sub_8098974 @@ -659,7 +659,7 @@ sub_80989A0: @ 80989A0 cmp r2, 0x40 beq _080989EA strb r2, [r5] - ldr r1, _080989F4 @ =gUnknown_202063C + ldr r1, _080989F4 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -674,7 +674,7 @@ _080989EA: bx r0 .align 2, 0 _080989F0: .4byte gUnknown_2039882 -_080989F4: .4byte gUnknown_202063C +_080989F4: .4byte gSprites thumb_func_end sub_80989A0 .align 2, 0 @ Don't pad with nop. diff --git a/asm/itemfinder.s b/asm/itemfinder.s index 667cf65fc..42cb10b09 100644 --- a/asm/itemfinder.s +++ b/asm/itemfinder.s @@ -1051,7 +1051,7 @@ sub_813F40C: @ 813F40C bl CreateSprite lsls r0, 24 lsrs r6, r0, 24 - ldr r0, _0813F468 @ =gUnknown_202063C + ldr r0, _0813F468 @ =gSprites lsls r4, r6, 4 adds r4, r6 lsls r4, 2 @@ -1081,7 +1081,7 @@ sub_813F40C: @ 813F40C mov pc, r0 .align 2, 0 _0813F464: .4byte gUnknown_84647E4 -_0813F468: .4byte gUnknown_202063C +_0813F468: .4byte gSprites _0813F46C: .4byte _0813F470 .align 2, 0 _0813F470: @@ -1108,7 +1108,7 @@ _0813F49A: beq _0813F4EC b _0813F53E _0813F4A4: - ldr r1, _0813F4C0 @ =gUnknown_202063C + ldr r1, _0813F4C0 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1121,10 +1121,10 @@ _0813F4A4: bl StartSpriteAffineAnim b _0813F53E .align 2, 0 -_0813F4C0: .4byte gUnknown_202063C +_0813F4C0: .4byte gSprites _0813F4C4: .4byte 0x0000ff9c _0813F4C8: - ldr r1, _0813F4E4 @ =gUnknown_202063C + ldr r1, _0813F4E4 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1137,10 +1137,10 @@ _0813F4C8: bl StartSpriteAffineAnim b _0813F53E .align 2, 0 -_0813F4E4: .4byte gUnknown_202063C +_0813F4E4: .4byte gSprites _0813F4E8: .4byte 0x0000ff9c _0813F4EC: - ldr r1, _0813F508 @ =gUnknown_202063C + ldr r1, _0813F508 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1153,9 +1153,9 @@ _0813F4EC: bl StartSpriteAffineAnim b _0813F53E .align 2, 0 -_0813F508: .4byte gUnknown_202063C +_0813F508: .4byte gSprites _0813F50C: - ldr r1, _0813F528 @ =gUnknown_202063C + ldr r1, _0813F528 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1168,9 +1168,9 @@ _0813F50C: bl StartSpriteAffineAnim b _0813F53E .align 2, 0 -_0813F528: .4byte gUnknown_202063C +_0813F528: .4byte gSprites _0813F52C: - ldr r1, _0813F544 @ =gUnknown_202063C + ldr r1, _0813F544 @ =gSprites lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -1184,7 +1184,7 @@ _0813F53E: pop {r0} bx r0 .align 2, 0 -_0813F544: .4byte gUnknown_202063C +_0813F544: .4byte gSprites _0813F548: .4byte 0x0000ff9c thumb_func_end sub_813F40C @@ -1254,7 +1254,7 @@ sub_813F5AC: @ 813F5AC adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r2, _0813F608 @ =gUnknown_202063C + ldr r2, _0813F608 @ =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -1288,7 +1288,7 @@ sub_813F5AC: @ 813F5AC bx r1 .align 2, 0 _0813F604: .4byte gUnknown_84647E4 -_0813F608: .4byte gUnknown_202063C +_0813F608: .4byte gSprites _0813F60C: .4byte sub_813F614 _0813F610: .4byte 0x0000ff9c thumb_func_end sub_813F5AC diff --git a/asm/learn_move.s b/asm/learn_move.s index 01cd369b7..5838d7d9a 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1178,7 +1178,7 @@ sub_80E5004: @ 80E5004 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _080E50C4 @ =gUnknown_202063C + ldr r4, _080E50C4 @ =gSprites adds r0, r4 movs r1, 0x1 bl StartSpriteAnim @@ -1246,7 +1246,7 @@ _080E50B4: .4byte gUnknown_83FF9F4 _080E50B8: .4byte gUnknown_83FF9FC _080E50BC: .4byte gUnknown_83FFA24 _080E50C0: .4byte gUnknown_203AAB4 -_080E50C4: .4byte gUnknown_202063C +_080E50C4: .4byte gSprites _080E50C8: .4byte 0x0000ffff thumb_func_end sub_80E5004 @@ -1474,7 +1474,7 @@ _080E529E: ldrb r0, [r4, 0x1A] cmp r0, 0x6 bls _080E52FA - ldr r2, _080E52E4 @ =gUnknown_202063C + ldr r2, _080E52E4 @ =gSprites movs r0, 0x3E adds r0, r2 mov r12, r0 @@ -1503,7 +1503,7 @@ _080E529E: .align 2, 0 _080E52DC: .4byte gUnknown_841E4E2 _080E52E0: .4byte gUnknown_203AAB4 -_080E52E4: .4byte gUnknown_202063C +_080E52E4: .4byte gSprites _080E52E8: ldrb r1, [r4, 0x19] ldrb r0, [r4, 0x1A] diff --git a/asm/link_rfu.s b/asm/link_rfu.s index c6c47eb25..588b6e5bb 100644 --- a/asm/link_rfu.s +++ b/asm/link_rfu.s @@ -9510,7 +9510,7 @@ sub_8101AC4: @ 8101AC4 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08101B1C @ =gUnknown_202063C + ldr r0, _08101B1C @ =gSprites adds r1, r0 str r1, [r2] movs r0, 0x1 @@ -9521,7 +9521,7 @@ sub_8101AC4: @ 8101AC4 _08101B10: .4byte gUnknown_843F888 _08101B14: .4byte gUnknown_843F968 _08101B18: .4byte gUnknown_203ACEC -_08101B1C: .4byte gUnknown_202063C +_08101B1C: .4byte gSprites thumb_func_end sub_8101AC4 thumb_func_start sub_8101B20 @@ -9640,7 +9640,7 @@ sub_8101BC0: @ 8101BC0 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _08101C40 @ =gUnknown_202063C + ldr r4, _08101C40 @ =gSprites adds r1, r4 str r1, [r2] movs r0, 0x20 @@ -9679,7 +9679,7 @@ sub_8101BC0: @ 8101BC0 .align 2, 0 _08101C38: .4byte gUnknown_843F9B8 _08101C3C: .4byte gUnknown_203ACEC -_08101C40: .4byte gUnknown_202063C +_08101C40: .4byte gSprites _08101C44: .4byte 0x0000ffe0 thumb_func_end sub_8101BC0 @@ -9991,7 +9991,7 @@ sub_8101E80: @ 8101E80 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08101ECC @ =gUnknown_202063C + ldr r0, _08101ECC @ =gSprites adds r1, r0 str r1, [r2] ldr r0, _08101ED0 @ =sub_8101ED4 @@ -10009,7 +10009,7 @@ sub_8101E80: @ 8101E80 .align 2, 0 _08101EC4: .4byte gUnknown_843F968 _08101EC8: .4byte gUnknown_203ACEC -_08101ECC: .4byte gUnknown_202063C +_08101ECC: .4byte gSprites _08101ED0: .4byte sub_8101ED4 thumb_func_end sub_8101E80 @@ -10152,7 +10152,7 @@ sub_8101FAC: @ 8101FAC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _0810200C @ =gUnknown_202063C + ldr r4, _0810200C @ =gSprites adds r1, r4 str r1, [r2] movs r6, 0 @@ -10181,7 +10181,7 @@ sub_8101FAC: @ 8101FAC .align 2, 0 _08102004: .4byte gUnknown_843FA40 _08102008: .4byte gUnknown_203ACEC -_0810200C: .4byte gUnknown_202063C +_0810200C: .4byte gSprites _08102010: .4byte 0x0000ffc0 _08102014: .4byte gUnknown_843FA20 thumb_func_end sub_8101FAC @@ -10451,7 +10451,7 @@ sub_81021D4: @ 81021D4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08102248 @ =gUnknown_202063C + ldr r1, _08102248 @ =gSprites adds r0, r1 str r0, [r2] _08102202: @@ -10472,7 +10472,7 @@ _08102202: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08102248 @ =gUnknown_202063C + ldr r1, _08102248 @ =gSprites adds r0, r1 str r0, [r2] adds r0, 0x3F @@ -10488,7 +10488,7 @@ _08102236: .align 2, 0 _08102240: .4byte gUnknown_843FA98 _08102244: .4byte gUnknown_203ACEC -_08102248: .4byte gUnknown_202063C +_08102248: .4byte gSprites thumb_func_end sub_81021D4 thumb_func_start sub_810224C @@ -10629,7 +10629,7 @@ sub_8102320: @ 8102320 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08102390 @ =gUnknown_202063C + ldr r1, _08102390 @ =gSprites adds r0, r1 str r0, [r2] _0810234E: @@ -10650,7 +10650,7 @@ _0810234E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08102390 @ =gUnknown_202063C + ldr r1, _08102390 @ =gSprites adds r0, r1 str r0, [r2] movs r1, 0x1 @@ -10663,7 +10663,7 @@ _0810237E: .align 2, 0 _08102388: .4byte gUnknown_843FA80 _0810238C: .4byte gUnknown_203ACEC -_08102390: .4byte gUnknown_202063C +_08102390: .4byte gSprites thumb_func_end sub_8102320 thumb_func_start sub_8102394 diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index 531ebfe0f..d2b9db6e4 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -9394,7 +9394,7 @@ _080FCD8A: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r0, _080FCDD4 @ =gUnknown_202063C + ldr r0, _080FCDD4 @ =gSprites lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -9416,7 +9416,7 @@ _080FCD8A: .align 2, 0 _080FCDCC: .4byte gUnknown_3007460 _080FCDD0: .4byte gUnknown_843F284 -_080FCDD4: .4byte gUnknown_202063C +_080FCDD4: .4byte gSprites _080FCDD8: .4byte 0x00001234 _080FCDDC: .4byte gUnknown_843F274 _080FCDE0: .4byte gUnknown_203ACE4 @@ -9427,7 +9427,7 @@ _080FCDE4: bl CreateSprite ldr r4, _080FCE34 @ =gUnknown_203ACE4 strb r0, [r4] - ldr r5, _080FCE38 @ =gUnknown_202063C + ldr r5, _080FCE38 @ =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -9461,7 +9461,7 @@ _080FCE2A: .align 2, 0 _080FCE30: .4byte gUnknown_843F284 _080FCE34: .4byte gUnknown_203ACE4 -_080FCE38: .4byte gUnknown_202063C +_080FCE38: .4byte gSprites _080FCE3C: .4byte 0x00001234 _080FCE40: .4byte gUnknown_843F274 thumb_func_end sub_80FCD74 @@ -9469,7 +9469,7 @@ _080FCE40: .4byte gUnknown_843F274 thumb_func_start sub_80FCE44 sub_80FCE44: @ 80FCE44 push {r4,lr} - ldr r4, _080FCE90 @ =gUnknown_202063C + ldr r4, _080FCE90 @ =gSprites ldr r3, _080FCE94 @ =gUnknown_203ACE4 ldrb r1, [r3] lsls r0, r1, 4 @@ -9493,7 +9493,7 @@ sub_80FCE44: @ 80FCE44 movs r0, 0x84 lsls r0, 3 adds r3, r0 - ldr r0, _080FCEA0 @ =gUnknown_8231CE4 + ldr r0, _080FCEA0 @ =gDummyOamData ldr r1, [r0] ldr r2, [r0, 0x4] str r1, [r3] @@ -9506,11 +9506,11 @@ _080FCE8A: pop {r0} bx r0 .align 2, 0 -_080FCE90: .4byte gUnknown_202063C +_080FCE90: .4byte gSprites _080FCE94: .4byte gUnknown_203ACE4 _080FCE98: .4byte 0x00001234 _080FCE9C: .4byte gMain -_080FCEA0: .4byte gUnknown_8231CE4 +_080FCEA0: .4byte gDummyOamData _080FCEA4: .4byte 0x070003e8 thumb_func_end sub_80FCE44 @@ -9604,7 +9604,7 @@ sub_80FCF34: @ 80FCF34 bne _080FCF44 b _080FD106 _080FCF44: - ldr r2, _080FCF7C @ =gUnknown_202063C + ldr r2, _080FCF7C @ =gSprites adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -9633,7 +9633,7 @@ _080FCF5C: b _080FCFA6 .align 2, 0 _080FCF78: .4byte gUnknown_203ACE4 -_080FCF7C: .4byte gUnknown_202063C +_080FCF7C: .4byte gSprites _080FCF80: .4byte 0x00001234 _080FCF84: .4byte gUnknown_3007460 _080FCF88: diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 8389c6494..76de5c696 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -11998,7 +11998,7 @@ sub_811BB40: @ 811BB40 push {r4-r6,lr} adds r5, r0, 0 movs r4, 0 - ldr r6, _0811BB64 @ =gUnknown_202063C + ldr r6, _0811BB64 @ =gSprites _0811BB48: adds r0, r5, r4 ldrb r1, [r0] @@ -12014,7 +12014,7 @@ _0811BB48: pop {r0} bx r0 .align 2, 0 -_0811BB64: .4byte gUnknown_202063C +_0811BB64: .4byte gSprites thumb_func_end sub_811BB40 thumb_func_start sub_811BB68 diff --git a/asm/mail.s b/asm/mail.s index 86681e330..ecd5e71fd 100644 --- a/asm/mail.s +++ b/asm/mail.s @@ -528,7 +528,7 @@ _080BF064: .4byte gUnknown_20399C4 _080BF068: adds r0, r4, 0 bl sub_80970E0 - ldr r1, _080BF07C @ =nullsub_8 + ldr r1, _080BF07C @ =SpriteCallbackDummy movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -536,11 +536,11 @@ _080BF068: movs r2, 0x60 b _080BF092 .align 2, 0 -_080BF07C: .4byte nullsub_8 +_080BF07C: .4byte SpriteCallbackDummy _080BF080: adds r0, r4, 0 bl sub_80970E0 - ldr r1, _080BF0A0 @ =nullsub_8 + ldr r1, _080BF0A0 @ =SpriteCallbackDummy movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -554,7 +554,7 @@ _080BF092: strb r0, [r1] b _080BF0F4 .align 2, 0 -_080BF0A0: .4byte nullsub_8 +_080BF0A0: .4byte SpriteCallbackDummy _080BF0A4: movs r1, 0x82 lsls r1, 5 @@ -1013,7 +1013,7 @@ sub_80BF3F4: @ 80BF3F4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080BF46C @ =gUnknown_202063C + ldr r1, _080BF46C @ =gSprites adds r0, r1 bl sub_8097070 _080BF442: @@ -1034,7 +1034,7 @@ _080BF460: bx r0 .align 2, 0 _080BF468: .4byte gUnknown_20399C4 -_080BF46C: .4byte gUnknown_202063C +_080BF46C: .4byte gSprites _080BF470: .4byte 0x000020fc thumb_func_end sub_80BF3F4 diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s index abbdfb115..d1d529279 100644 --- a/asm/map_obj_80688E4.s +++ b/asm/map_obj_80688E4.s @@ -19,7 +19,7 @@ FreezeMapObject: @ 80688E4 movs r4, 0x1 orrs r0, r4 strb r0, [r5, 0x1] - ldr r3, _08068968 @ =gUnknown_202063C + ldr r3, _08068968 @ =gSprites ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -73,7 +73,7 @@ FreezeMapObject: @ 80688E4 movs r0, 0 b _0806896E .align 2, 0 -_08068968: .4byte gUnknown_202063C +_08068968: .4byte gSprites _0806896C: movs r0, 0x1 _0806896E: @@ -169,7 +169,7 @@ npc_sync_anim_pause_bits: @ 80689F4 negs r0, r0 ands r0, r1 strb r0, [r5, 0x1] - ldr r4, _08068A58 @ =gUnknown_202063C + ldr r4, _08068A58 @ =gSprites ldrb r0, [r5, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -206,7 +206,7 @@ _08068A4C: bx r0 .align 2, 0 _08068A54: .4byte 0x00000101 -_08068A58: .4byte gUnknown_202063C +_08068A58: .4byte gSprites thumb_func_end npc_sync_anim_pause_bits thumb_func_start UnfreezeMapObjects @@ -881,7 +881,7 @@ sub_8068EB4: @ 8068EB4 adds r4, 0x28 movs r0, 0 ldrsb r0, [r4, r0] - ldr r2, _08068F14 @ =gUnknown_2021BC8 + ldr r2, _08068F14 @ =gSpriteCoordOffsetX adds r0, r1 ldrh r2, [r2] adds r0, r2 @@ -894,7 +894,7 @@ sub_8068EB4: @ 8068EB4 subs r3, 0x15 movs r0, 0 ldrsb r0, [r3, r0] - ldr r2, _08068F18 @ =gUnknown_2021BCA + ldr r2, _08068F18 @ =gSpriteCoordOffsetY adds r0, r1 ldrh r2, [r2] adds r0, r2 @@ -903,8 +903,8 @@ sub_8068EB4: @ 8068EB4 adds r2, r3, 0 b _08068F4A .align 2, 0 -_08068F14: .4byte gUnknown_2021BC8 -_08068F18: .4byte gUnknown_2021BCA +_08068F14: .4byte gSpriteCoordOffsetX +_08068F18: .4byte gSpriteCoordOffsetY _08068F1C: mov r0, r12 ldrh r1, [r0, 0x24] @@ -1010,7 +1010,7 @@ sub_8068FD0: @ 8068FD0 movs r5, 0 movs r4, 0x3F _08068FD6: - ldr r0, _08069004 @ =gUnknown_202063C + ldr r0, _08069004 @ =gSprites adds r2, r5, r0 adds r0, r2, 0 adds r0, 0x3E @@ -1034,7 +1034,7 @@ _08068FF6: pop {r0} bx r0 .align 2, 0 -_08069004: .4byte gUnknown_202063C +_08069004: .4byte gSprites _08069008: .4byte sub_8068FA8 thumb_func_end sub_8068FD0 @@ -1044,7 +1044,7 @@ sub_806900C: @ 806900C lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - ldr r6, _08069040 @ =gUnknown_202063C + ldr r6, _08069040 @ =gSprites movs r4, 0 _08069018: adds r2, r4, r6 @@ -1067,7 +1067,7 @@ _08069018: adds r0, r3, 0 b _08069052 .align 2, 0 -_08069040: .4byte gUnknown_202063C +_08069040: .4byte gSprites _08069044: .4byte sub_8068FA8 _08069048: adds r4, 0x44 @@ -1096,7 +1096,7 @@ sub_8069058: @ 8069058 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _08069090 @ =gUnknown_202063C + ldr r0, _08069090 @ =gSprites adds r4, r0 adds r0, r5, 0 bl FieldObjectDirectionToImageAnimId @@ -1110,7 +1110,7 @@ _0806908A: pop {r0} bx r0 .align 2, 0 -_08069090: .4byte gUnknown_202063C +_08069090: .4byte gSprites thumb_func_end sub_8069058 thumb_func_start sub_8069094 @@ -1127,7 +1127,7 @@ sub_8069094: @ 8069094 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080690F8 @ =gUnknown_202063C + ldr r1, _080690F8 @ =gSprites adds r4, r0, r1 adds r0, r5, 0 bl GetFieldObjectGraphicsInfo @@ -1163,7 +1163,7 @@ sub_8069094: @ 8069094 strb r1, [r0] b _08069116 .align 2, 0 -_080690F8: .4byte gUnknown_202063C +_080690F8: .4byte gSprites _080690FC: .4byte 0xfffffc00 _08069100: adds r0, r4, 0 @@ -1200,7 +1200,7 @@ sub_8069124: @ 8069124 beq _08069160 cmp r4, 0 beq _08069154 - ldr r0, _08069150 @ =gUnknown_202063C + ldr r0, _08069150 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1209,9 +1209,9 @@ sub_8069124: @ 8069124 strh r0, [r1, 0x32] b _08069160 .align 2, 0 -_08069150: .4byte gUnknown_202063C +_08069150: .4byte gSprites _08069154: - ldr r1, _08069168 @ =gUnknown_202063C + ldr r1, _08069168 @ =gSprites lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -1222,7 +1222,7 @@ _08069160: pop {r0} bx r0 .align 2, 0 -_08069168: .4byte gUnknown_202063C +_08069168: .4byte gSprites thumb_func_end sub_8069124 thumb_func_start sub_806916C @@ -1239,7 +1239,7 @@ sub_806916C: @ 806916C b _0806919A _08069182: movs r3, 0 - ldr r0, _080691A0 @ =gUnknown_202063C + ldr r0, _080691A0 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1255,7 +1255,7 @@ _0806919A: pop {r1} bx r1 .align 2, 0 -_080691A0: .4byte gUnknown_202063C +_080691A0: .4byte gSprites thumb_func_end sub_806916C thumb_func_start sub_80691A4 @@ -1270,7 +1270,7 @@ sub_80691A4: @ 80691A4 lsrs r2, r0, 24 cmp r2, 0x40 beq _080691CA - ldr r0, _080691D0 @ =gUnknown_202063C + ldr r0, _080691D0 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1283,7 +1283,7 @@ _080691CA: pop {r0} bx r0 .align 2, 0 -_080691D0: .4byte gUnknown_202063C +_080691D0: .4byte gSprites thumb_func_end sub_80691A4 thumb_func_start sub_80691D4 @@ -1409,7 +1409,7 @@ sub_8069294: @ 8069294 lsrs r2, r0, 24 cmp r2, 0x40 beq _080692B8 - ldr r0, _080692BC @ =gUnknown_202063C + ldr r0, _080692BC @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -1422,7 +1422,7 @@ _080692B8: movs r0, 0 b _080692C2 .align 2, 0 -_080692BC: .4byte gUnknown_202063C +_080692BC: .4byte gSprites _080692C0: movs r0, 0x1 _080692C2: diff --git a/asm/menu_indicators.s b/asm/menu_indicators.s index 405891a33..93529959f 100644 --- a/asm/menu_indicators.s +++ b/asm/menu_indicators.s @@ -117,7 +117,7 @@ AddScrollIndicatorArrowObject: @ 8133990 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r1, _08133A18 @ =gUnknown_202063C + ldr r1, _08133A18 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -152,7 +152,7 @@ AddScrollIndicatorArrowObject: @ 8133990 bx r1 .align 2, 0 _08133A14: .4byte gUnknown_84632A4 -_08133A18: .4byte gUnknown_202063C +_08133A18: .4byte gSprites _08133A1C: .4byte gUnknown_846325C thumb_func_end AddScrollIndicatorArrowObject @@ -252,7 +252,7 @@ _08133A8E: ldr r0, _08133B38 @ =0x0000ffff cmp r1, r0 bne _08133B1C - ldr r5, _08133B3C @ =gUnknown_202063C + ldr r5, _08133B3C @ =gSprites ldrb r0, [r7, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -291,7 +291,7 @@ _08133B2C: .4byte gUnknown_8463308 _08133B30: .4byte sub_8133BA4 _08133B34: .4byte gUnknown_3005098 _08133B38: .4byte 0x0000ffff -_08133B3C: .4byte gUnknown_202063C +_08133B3C: .4byte gSprites thumb_func_end AddScrollIndicatorArrowPair thumb_func_start AddScrollIndicatorArrowPairParametrized @@ -362,7 +362,7 @@ sub_8133BA4: @ 8133BA4 ldrh r0, [r4, 0x8] cmp r5, r0 bne _08133BDC - ldr r3, _08133BD8 @ =gUnknown_202063C + ldr r3, _08133BD8 @ =gSprites ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -375,9 +375,9 @@ sub_8133BA4: @ 8133BA4 b _08133BF2 .align 2, 0 _08133BD4: .4byte gUnknown_3005098 -_08133BD8: .4byte gUnknown_202063C +_08133BD8: .4byte gSprites _08133BDC: - ldr r3, _08133C10 @ =gUnknown_202063C + ldr r3, _08133C10 @ =gSprites ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -404,7 +404,7 @@ _08133BF2: orrs r1, r2 b _08133C28 .align 2, 0 -_08133C10: .4byte gUnknown_202063C +_08133C10: .4byte gSprites _08133C14: ldrb r1, [r4, 0xD] lsls r0, r1, 4 @@ -449,7 +449,7 @@ _08133C58: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08133C8C @ =gUnknown_202063C + ldr r4, _08133C8C @ =gSprites adds r0, r4 bl DestroySprite ldrb r1, [r5, 0xD] @@ -466,7 +466,7 @@ _08133C58: .align 2, 0 _08133C84: .4byte gUnknown_3005098 _08133C88: .4byte 0x0000ffff -_08133C8C: .4byte gUnknown_202063C +_08133C8C: .4byte gSprites thumb_func_end RemoveScrollIndicatorArrowPair thumb_func_start ListMenuAddCursorObjectInternal @@ -788,7 +788,7 @@ _08133EA6: ldrh r1, [r6, 0x4] bl ListMenuSetUpRedOutlineCursorSpriteOamTable mov r1, sp - ldr r0, _08133F98 @ =gUnknown_8231D00 + ldr r0, _08133F98 @ =gDummySpriteTemplate ldm r0!, {r2,r3,r7} stm r1!, {r2,r3,r7} ldm r0!, {r2,r3,r7} @@ -810,7 +810,7 @@ _08133EA6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r7, _08133F9C @ =gUnknown_202063C + ldr r7, _08133F9C @ =gSprites adds r0, r7 adds r1, r5, 0 bl SetSubspriteTables @@ -871,8 +871,8 @@ _08133F7E: _08133F8C: .4byte gUnknown_8463308 _08133F90: .4byte nullsub_94 _08133F94: .4byte gUnknown_3005098 -_08133F98: .4byte gUnknown_8231D00 -_08133F9C: .4byte gUnknown_202063C +_08133F98: .4byte gDummySpriteTemplate +_08133F9C: .4byte gSprites _08133FA0: .4byte 0x0000ffff thumb_func_end ListMenuAddRedOutlineCursorObject @@ -890,7 +890,7 @@ ListMenuUpdateRedOutlineCursorObject: @ 8133FA4 lsls r3, 3 ldr r0, _08133FE0 @ =gUnknown_3005098 adds r3, r0 - ldr r5, _08133FE4 @ =gUnknown_202063C + ldr r5, _08133FE4 @ =gSprites ldrb r4, [r3, 0xC] lsls r0, r4, 4 adds r0, r4 @@ -910,7 +910,7 @@ ListMenuUpdateRedOutlineCursorObject: @ 8133FA4 bx r0 .align 2, 0 _08133FE0: .4byte gUnknown_3005098 -_08133FE4: .4byte gUnknown_202063C +_08133FE4: .4byte gSprites thumb_func_end ListMenuUpdateRedOutlineCursorObject thumb_func_start ListMenuRemoveRedOutlineCursorObject @@ -941,7 +941,7 @@ _08134016: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0813403C @ =gUnknown_202063C + ldr r1, _0813403C @ =gSprites adds r0, r1 bl DestroySprite adds r0, r5, 0 @@ -952,7 +952,7 @@ _08134016: .align 2, 0 _08134034: .4byte gUnknown_3005098 _08134038: .4byte 0x0000ffff -_0813403C: .4byte gUnknown_202063C +_0813403C: .4byte gSprites thumb_func_end ListMenuRemoveRedOutlineCursorObject thumb_func_start ObjectCB_RedArrowCursor @@ -1066,7 +1066,7 @@ _081340D6: movs r3, 0 bl CreateSprite strb r0, [r4] - ldr r3, _08134170 @ =gUnknown_202063C + ldr r3, _08134170 @ =gSprites ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -1107,7 +1107,7 @@ _08134160: .4byte gUnknown_8463308 _08134164: .4byte nullsub_95 _08134168: .4byte gUnknown_3005098 _0813416C: .4byte gUnknown_84632F0 -_08134170: .4byte gUnknown_202063C +_08134170: .4byte gSprites _08134174: .4byte 0x0000ffff thumb_func_end ListMenuAddRedArrowCursorObject @@ -1121,7 +1121,7 @@ ListMenuUpdateRedArrowCursorObject: @ 8134178 lsls r3, 3 ldr r0, _081341A8 @ =gUnknown_3005098 adds r3, r0 - ldr r5, _081341AC @ =gUnknown_202063C + ldr r5, _081341AC @ =gSprites ldrb r4, [r3] lsls r0, r4, 4 adds r0, r4 @@ -1139,7 +1139,7 @@ ListMenuUpdateRedArrowCursorObject: @ 8134178 bx r0 .align 2, 0 _081341A8: .4byte gUnknown_3005098 -_081341AC: .4byte gUnknown_202063C +_081341AC: .4byte gSprites thumb_func_end ListMenuUpdateRedArrowCursorObject thumb_func_start ListMenuRemoveRedArrowCursorObject @@ -1168,7 +1168,7 @@ _081341D8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081341FC @ =gUnknown_202063C + ldr r1, _081341FC @ =gSprites adds r0, r1 bl DestroySprite adds r0, r5, 0 @@ -1179,7 +1179,7 @@ _081341D8: .align 2, 0 _081341F4: .4byte gUnknown_3005098 _081341F8: .4byte 0x0000ffff -_081341FC: .4byte gUnknown_202063C +_081341FC: .4byte gSprites thumb_func_end ListMenuRemoveRedArrowCursorObject .align 2, 0 @ Don't pad with nop. diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s index d54d9ecac..0c344853a 100644 --- a/asm/mevent_8145654.s +++ b/asm/mevent_8145654.s @@ -1285,7 +1285,7 @@ sub_8146060: @ 8146060 bl sub_8096FD4 lsls r0, 16 lsrs r0, 16 - ldr r1, _081461C0 @ =nullsub_8 + ldr r1, _081461C0 @ =SpriteCallbackDummy str r7, [sp] str r7, [sp, 0x4] movs r2, 0xDC @@ -1296,7 +1296,7 @@ sub_8146060: @ 8146060 lsls r3, 1 adds r1, r3 strb r0, [r1] - ldr r2, _081461C4 @ =gUnknown_202063C + ldr r2, _081461C4 @ =gSprites ldr r0, [r4] adds r0, r3 ldrb r1, [r0] @@ -1388,7 +1388,7 @@ _0814610E: mov r2, r9 str r2, [sp] str r2, [sp, 0x4] - ldr r1, _081461C0 @ =nullsub_8 + ldr r1, _081461C0 @ =SpriteCallbackDummy adds r2, r5, 0 movs r3, 0x88 bl sub_8096ECC @@ -1405,7 +1405,7 @@ _0814610E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081461C4 @ =gUnknown_202063C + ldr r1, _081461C4 @ =gSprites adds r0, r1 ldrb r2, [r0, 0x5] movs r3, 0xD @@ -1434,8 +1434,8 @@ _081461AC: bx r0 .align 2, 0 _081461BC: .4byte gUnknown_203F3C8 -_081461C0: .4byte nullsub_8 -_081461C4: .4byte gUnknown_202063C +_081461C0: .4byte SpriteCallbackDummy +_081461C4: .4byte gSprites _081461C8: .4byte gUnknown_8467F58 _081461CC: .4byte gUnknown_8467F60 _081461D0: .4byte 0x0000017d @@ -1458,7 +1458,7 @@ sub_81461D8: @ 81461D8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08146280 @ =gUnknown_202063C + ldr r1, _08146280 @ =gSprites adds r0, r1 bl sub_8097070 _081461FC: @@ -1487,7 +1487,7 @@ _08146214: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08146280 @ =gUnknown_202063C + ldr r5, _08146280 @ =gSprites adds r0, r5 bl DestroySprite ldr r1, [r7] @@ -1527,7 +1527,7 @@ _08146274: bx r0 .align 2, 0 _0814627C: .4byte gUnknown_203F3C8 -_08146280: .4byte gUnknown_202063C +_08146280: .4byte gSprites _08146284: .4byte 0x0000017d thumb_func_end sub_81461D8 diff --git a/asm/mon_markings.s b/asm/mon_markings.s index ecc50195a..568129eff 100644 --- a/asm/mon_markings.s +++ b/asm/mon_markings.s @@ -531,7 +531,7 @@ sub_80BE7CC: @ 80BE7CC ldr r0, _080BE9D4 @ =gUnknown_83EE8C8 str r0, [r4, 0x8] str r7, [r4, 0xC] - ldr r0, _080BE9D8 @ =gUnknown_8231CFC + ldr r0, _080BE9D8 @ =gDummySpriteAffineAnimTable str r0, [r4, 0x10] ldr r0, _080BE9DC @ =nullsub_62 str r0, [r4, 0x14] @@ -578,7 +578,7 @@ _080BE8BC: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r1, _080BE9E0 @ =gUnknown_202063C + ldr r1, _080BE9E0 @ =gSprites adds r0, r1 str r0, [r2] lsls r1, r5, 24 @@ -641,7 +641,7 @@ _080BE93A: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 - ldr r7, _080BE9E0 @ =gUnknown_202063C + ldr r7, _080BE9E0 @ =gSprites adds r0, r7 str r0, [r1] strh r5, [r0, 0x2E] @@ -650,7 +650,7 @@ _080BE93A: lsrs r5, r0, 16 cmp r5, 0x3 bls _080BE914 - ldr r0, _080BE9F0 @ =nullsub_8 + ldr r0, _080BE9F0 @ =SpriteCallbackDummy str r0, [r4, 0x14] adds r0, r4, 0 movs r1, 0 @@ -705,13 +705,13 @@ _080BE9C8: .4byte gUnknown_8E9CBBC _080BE9CC: .4byte gUnknown_8E9CB9C _080BE9D0: .4byte gUnknown_83EE830 _080BE9D4: .4byte gUnknown_83EE8C8 -_080BE9D8: .4byte gUnknown_8231CFC +_080BE9D8: .4byte gDummySpriteAffineAnimTable _080BE9DC: .4byte nullsub_62 -_080BE9E0: .4byte gUnknown_202063C +_080BE9E0: .4byte gSprites _080BE9E4: .4byte gUnknown_83EE890 _080BE9E8: .4byte sub_80BEA8C _080BE9EC: .4byte gUnknown_83EE838 -_080BE9F0: .4byte nullsub_8 +_080BE9F0: .4byte SpriteCallbackDummy _080BE9F4: ldr r1, [r6] movs r0, 0 @@ -737,7 +737,7 @@ _080BE9FA: lsls r1, r3, 4 adds r1, r3 lsls r1, 2 - ldr r0, _080BEA44 @ =gUnknown_202063C + ldr r0, _080BEA44 @ =gSprites adds r1, r0 str r1, [r2, 0x24] ldr r3, [sp, 0x4C] @@ -751,7 +751,7 @@ _080BE9FA: .align 2, 0 _080BEA3C: .4byte sub_80BEAC8 _080BEA40: .4byte gUnknown_20399C0 -_080BEA44: .4byte gUnknown_202063C +_080BEA44: .4byte gSprites _080BEA48: ldr r0, _080BEA54 @ =gUnknown_20399C0 ldr r0, [r0] @@ -915,7 +915,7 @@ sub_80BEB20: @ 80BEB20 ldr r0, _080BEBA8 @ =gUnknown_83EE958 str r0, [sp, 0x8] str r2, [sp, 0xC] - ldr r0, _080BEBAC @ =gUnknown_8231CFC + ldr r0, _080BEBAC @ =gDummySpriteAffineAnimTable str r0, [sp, 0x10] ldr r0, _080BEBB0 @ =nullsub_62 str r0, [sp, 0x14] @@ -946,13 +946,13 @@ _080BEB9C: .4byte gUnknown_83EE028 _080BEBA0: .4byte 0xffff0000 _080BEBA4: .4byte gUnknown_83EE8D0 _080BEBA8: .4byte gUnknown_83EE958 -_080BEBAC: .4byte gUnknown_8231CFC +_080BEBAC: .4byte gDummySpriteAffineAnimTable _080BEBB0: .4byte nullsub_62 _080BEBB4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080BEBCC @ =gUnknown_202063C + ldr r1, _080BEBCC @ =gSprites adds r0, r1 _080BEBBE: add sp, 0x28 @@ -962,7 +962,7 @@ _080BEBBE: pop {r1} bx r1 .align 2, 0 -_080BEBCC: .4byte gUnknown_202063C +_080BEBCC: .4byte gSprites thumb_func_end sub_80BEB20 thumb_func_start sub_80BEBD0 diff --git a/asm/naming_screen.s b/asm/naming_screen.s index ed081285c..917bc047c 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -259,7 +259,7 @@ _0809DB6C: .4byte 0x00001e30 sub_809DB70: @ 809DB70 push {r4,r5,lr} movs r3, 0 - ldr r4, _0809DBAC @ =gUnknown_202063C + ldr r4, _0809DBAC @ =gSprites movs r5, 0x5 negs r5, r5 _0809DB7A: @@ -288,7 +288,7 @@ _0809DB94: pop {r0} bx r0 .align 2, 0 -_0809DBAC: .4byte gUnknown_202063C +_0809DBAC: .4byte gSprites thumb_func_end sub_809DB70 thumb_func_start choose_name_or_words_screen_init_bgs @@ -1928,7 +1928,7 @@ sub_809E8B4: @ 809E8B4 strb r0, [r1] movs r0, 0x1 bl sub_809EA0C - ldr r6, _0809E944 @ =gUnknown_202063C + ldr r6, _0809E944 @ =gSprites ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -1981,7 +1981,7 @@ sub_809E8B4: @ 809E8B4 _0809E938: .4byte gUnknown_83E25EC _0809E93C: .4byte gUnknown_203998C _0809E940: .4byte 0x00001e23 -_0809E944: .4byte gUnknown_202063C +_0809E944: .4byte gSprites thumb_func_end sub_809E8B4 thumb_func_start sub_809E948 @@ -2000,7 +2000,7 @@ sub_809E948: @ 809E948 lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r2, _0809E99C @ =gUnknown_202063C + ldr r2, _0809E99C @ =gSprites adds r5, r1, r2 lsrs r1, r0, 16 mov r8, r1 @@ -2025,7 +2025,7 @@ sub_809E948: @ 809E948 .align 2, 0 _0809E994: .4byte gUnknown_203998C _0809E998: .4byte 0x00001e23 -_0809E99C: .4byte gUnknown_202063C +_0809E99C: .4byte gSprites _0809E9A0: .4byte gUnknown_83E2330 _0809E9A4: .4byte gUnknown_83E2333 _0809E9A8: @@ -2060,7 +2060,7 @@ sub_809E9CC: @ 809E9CC lsls r2, r3, 4 adds r2, r3 lsls r2, 2 - ldr r3, _0809E9F4 @ =gUnknown_202063C + ldr r3, _0809E9F4 @ =gSprites adds r2, r3 ldrh r3, [r2, 0x2E] strh r3, [r0] @@ -2070,7 +2070,7 @@ sub_809E9CC: @ 809E9CC .align 2, 0 _0809E9EC: .4byte gUnknown_203998C _0809E9F0: .4byte 0x00001e23 -_0809E9F4: .4byte gUnknown_202063C +_0809E9F4: .4byte gSprites thumb_func_end sub_809E9CC thumb_func_start sub_809E9F8 @@ -2090,7 +2090,7 @@ sub_809EA0C: @ 809EA0C push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, _0809EA54 @ =gUnknown_202063C + ldr r5, _0809EA54 @ =gSprites ldr r1, _0809EA58 @ =gUnknown_203998C ldr r4, [r1] ldr r1, _0809EA5C @ =0x00001e23 @@ -2123,7 +2123,7 @@ sub_809EA0C: @ 809EA0C pop {r0} bx r0 .align 2, 0 -_0809EA54: .4byte gUnknown_202063C +_0809EA54: .4byte gSprites _0809EA58: .4byte gUnknown_203998C _0809EA5C: .4byte 0x00001e23 _0809EA60: .4byte 0xffffff00 @@ -2133,7 +2133,7 @@ _0809EA60: .4byte 0xffffff00 sub_809EA64: @ 809EA64 push {r4,r5,lr} lsls r0, 24 - ldr r5, _0809EA9C @ =gUnknown_202063C + ldr r5, _0809EA9C @ =gSprites ldr r1, _0809EAA0 @ =gUnknown_203998C ldr r4, [r1] ldr r1, _0809EAA4 @ =0x00001e23 @@ -2160,7 +2160,7 @@ sub_809EA64: @ 809EA64 pop {r0} bx r0 .align 2, 0 -_0809EA9C: .4byte gUnknown_202063C +_0809EA9C: .4byte gSprites _0809EAA0: .4byte gUnknown_203998C _0809EAA4: .4byte 0x00001e23 thumb_func_end sub_809EA64 @@ -2176,7 +2176,7 @@ sub_809EAA8: @ 809EAA8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809EAD0 @ =gUnknown_202063C + ldr r1, _0809EAD0 @ =gSprites adds r0, r1 movs r1, 0x1 bl StartSpriteAnim @@ -2185,12 +2185,12 @@ sub_809EAA8: @ 809EAA8 .align 2, 0 _0809EAC8: .4byte gUnknown_203998C _0809EACC: .4byte 0x00001e23 -_0809EAD0: .4byte gUnknown_202063C +_0809EAD0: .4byte gSprites thumb_func_end sub_809EAA8 thumb_func_start sub_809EAD4 sub_809EAD4: @ 809EAD4 - ldr r2, _0809EAF4 @ =gUnknown_202063C + ldr r2, _0809EAF4 @ =gSprites ldr r0, _0809EAF8 @ =gUnknown_203998C ldr r0, [r0] ldr r1, _0809EAFC @ =0x00001e23 @@ -2206,7 +2206,7 @@ sub_809EAD4: @ 809EAD4 lsrs r0, 31 bx lr .align 2, 0 -_0809EAF4: .4byte gUnknown_202063C +_0809EAF4: .4byte gSprites _0809EAF8: .4byte gUnknown_203998C _0809EAFC: .4byte 0x00001e23 thumb_func_end sub_809EAD4 @@ -2281,7 +2281,7 @@ sub_809EB5C: @ 809EB5C lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _0809EC0C @ =gUnknown_202063C + ldr r0, _0809EC0C @ =gSprites mov r8, r0 add r5, r8 ldr r1, _0809EC10 @ =gUnknown_83E2504 @@ -2343,7 +2343,7 @@ sub_809EB5C: @ 809EB5C _0809EC00: .4byte gUnknown_83E2574 _0809EC04: .4byte gUnknown_203998C _0809EC08: .4byte 0x00001e24 -_0809EC0C: .4byte gUnknown_202063C +_0809EC0C: .4byte gSprites _0809EC10: .4byte gUnknown_83E2504 _0809EC14: .4byte gUnknown_83E25A4 _0809EC18: .4byte gUnknown_83E250C @@ -2360,7 +2360,7 @@ sub_809EC20: @ 809EC20 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809EC4C @ =gUnknown_202063C + ldr r1, _0809EC4C @ =gSprites adds r0, r1 movs r1, 0x2 strh r1, [r0, 0x2E] @@ -2372,7 +2372,7 @@ sub_809EC20: @ 809EC20 .align 2, 0 _0809EC44: .4byte gUnknown_203998C _0809EC48: .4byte 0x00001e24 -_0809EC4C: .4byte gUnknown_202063C +_0809EC4C: .4byte gSprites _0809EC50: .4byte 0x00001e22 thumb_func_end sub_809EC20 @@ -2408,7 +2408,7 @@ sub_809EC7C: @ 809EC7C lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r1, _0809ECC4 @ =gUnknown_202063C + ldr r1, _0809ECC4 @ =gSprites adds r5, r1 movs r2, 0x3C ldrsh r0, [r6, r2] @@ -2435,7 +2435,7 @@ sub_809EC7C: @ 809EC7C pop {r1} bx r1 .align 2, 0 -_0809ECC4: .4byte gUnknown_202063C +_0809ECC4: .4byte gSprites _0809ECC8: .4byte gUnknown_203998C _0809ECCC: .4byte 0x00001e22 thumb_func_end sub_809EC7C @@ -2455,7 +2455,7 @@ sub_809ECD4: @ 809ECD4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r2, _0809ED40 @ =gUnknown_202063C + ldr r2, _0809ED40 @ =gSprites adds r4, r0, r2 movs r0, 0x3C ldrsh r1, [r3, r0] @@ -2501,7 +2501,7 @@ _0809ED38: pop {r1} bx r1 .align 2, 0 -_0809ED40: .4byte gUnknown_202063C +_0809ED40: .4byte gSprites _0809ED44: .4byte 0x0000fffc thumb_func_end sub_809ECD4 @@ -2514,7 +2514,7 @@ sub_809ED48: @ 809ED48 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809ED84 @ =gUnknown_202063C + ldr r1, _0809ED84 @ =gSprites adds r2, r0, r1 adds r3, r2, 0 adds r3, 0x3E @@ -2539,7 +2539,7 @@ _0809ED7C: pop {r1} bx r1 .align 2, 0 -_0809ED84: .4byte gUnknown_202063C +_0809ED84: .4byte gSprites thumb_func_end sub_809ED48 thumb_func_start sub_809ED88 @@ -2606,7 +2606,7 @@ sub_809EDE8: @ 809EDE8 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r6, _0809EE54 @ =gUnknown_202063C + ldr r6, _0809EE54 @ =gSprites adds r4, r6 ldr r0, _0809EE58 @ =gUnknown_83E2524 mov r8, r0 @@ -2643,7 +2643,7 @@ sub_809EDE8: @ 809EDE8 bx r0 .align 2, 0 _0809EE50: .4byte gUnknown_83E25BC -_0809EE54: .4byte gUnknown_202063C +_0809EE54: .4byte gSprites _0809EE58: .4byte gUnknown_83E2524 _0809EE5C: .4byte gUnknown_83E25D4 thumb_func_end sub_809EDE8 @@ -2665,7 +2665,7 @@ sub_809EE60: @ 809EE60 bl CreateSprite lsls r0, 24 lsrs r1, r0, 24 - ldr r3, _0809EF18 @ =gUnknown_202063C + ldr r3, _0809EF18 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2739,7 +2739,7 @@ _0809EF04: _0809EF0C: .4byte gUnknown_203998C _0809EF10: .4byte 0x00001e16 _0809EF14: .4byte gUnknown_83E2604 -_0809EF18: .4byte gUnknown_202063C +_0809EF18: .4byte gSprites _0809EF1C: .4byte 0x00001e28 _0809EF20: .4byte gUnknown_83E261C thumb_func_end sub_809EE60 @@ -2784,7 +2784,7 @@ sub_809EF54: @ 809EF54 bl sub_805C7C8 lsls r0, 24 lsrs r0, 24 - ldr r1, _0809EFA8 @ =nullsub_8 + ldr r1, _0809EFA8 @ =SpriteCallbackDummy movs r2, 0 str r2, [sp] movs r2, 0x38 @@ -2793,7 +2793,7 @@ sub_809EF54: @ 809EF54 adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 - ldr r2, _0809EFAC @ =gUnknown_202063C + ldr r2, _0809EFAC @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2810,8 +2810,8 @@ sub_809EF54: @ 809EF54 .align 2, 0 _0809EFA0: .4byte gUnknown_203998C _0809EFA4: .4byte 0x00001e34 -_0809EFA8: .4byte nullsub_8 -_0809EFAC: .4byte gUnknown_202063C +_0809EFA8: .4byte SpriteCallbackDummy +_0809EFAC: .4byte gSprites thumb_func_end sub_809EF54 thumb_func_start sub_809EFB0 @@ -2827,7 +2827,7 @@ sub_809EFB0: @ 809EFB0 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0809EFE8 @ =gUnknown_202063C + ldr r0, _0809EFE8 @ =gSprites adds r4, r0 ldr r1, _0809EFEC @ =gUnknown_83E252C adds r0, r4, 0 @@ -2841,7 +2841,7 @@ sub_809EFB0: @ 809EFB0 bx r0 .align 2, 0 _0809EFE4: .4byte gUnknown_83E2634 -_0809EFE8: .4byte gUnknown_202063C +_0809EFE8: .4byte gSprites _0809EFEC: .4byte gUnknown_83E252C thumb_func_end sub_809EFB0 @@ -2855,7 +2855,7 @@ sub_809EFF0: @ 809EFF0 ldr r1, _0809F03C @ =0x00001e34 adds r0, r3, r1 ldrh r0, [r0] - ldr r1, _0809F040 @ =nullsub_8 + ldr r1, _0809F040 @ =SpriteCallbackDummy movs r2, 0 str r2, [sp] ldr r2, _0809F044 @ =0x00001e38 @@ -2869,7 +2869,7 @@ sub_809EFF0: @ 809EFF0 bl sub_8096E18 lsls r0, 24 lsrs r0, 24 - ldr r2, _0809F048 @ =gUnknown_202063C + ldr r2, _0809F048 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2884,9 +2884,9 @@ sub_809EFF0: @ 809EFF0 .align 2, 0 _0809F038: .4byte gUnknown_203998C _0809F03C: .4byte 0x00001e34 -_0809F040: .4byte nullsub_8 +_0809F040: .4byte SpriteCallbackDummy _0809F044: .4byte 0x00001e38 -_0809F048: .4byte gUnknown_202063C +_0809F048: .4byte gSprites thumb_func_end sub_809EFF0 thumb_func_start sub_809F04C @@ -2903,7 +2903,7 @@ sub_809F04C: @ 809F04C ldr r0, [r0] str r0, [sp, 0x24] str r1, [sp, 0x28] - ldr r1, _0809F0C0 @ =nullsub_8 + ldr r1, _0809F0C0 @ =SpriteCallbackDummy add r3, sp, 0x18 movs r0, 0 mov r2, sp @@ -2927,7 +2927,7 @@ sub_809F04C: @ 809F04C bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r2, _0809F0C8 @ =gUnknown_202063C + ldr r2, _0809F0C8 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2943,9 +2943,9 @@ sub_809F04C: @ 809F04C .align 2, 0 _0809F0B8: .4byte gUnknown_83E23C0 _0809F0BC: .4byte gUnknown_83E23C8 -_0809F0C0: .4byte nullsub_8 +_0809F0C0: .4byte SpriteCallbackDummy _0809F0C4: .4byte gUnknown_83E23BC -_0809F0C8: .4byte gUnknown_202063C +_0809F0C8: .4byte gSprites thumb_func_end sub_809F04C thumb_func_start sub_809F0CC diff --git a/asm/oak_speech.s b/asm/oak_speech.s index ddd07be67..bceb94837 100644 --- a/asm/oak_speech.s +++ b/asm/oak_speech.s @@ -450,17 +450,17 @@ _0812EC8E: movs r1, 0 movs r2, 0 bl ChangeBgY - ldr r0, _0812ECF8 @ =gUnknown_2021BC8 + ldr r0, _0812ECF8 @ =gSpriteCoordOffsetX movs r1, 0 strh r1, [r0] - ldr r0, _0812ECFC @ =gUnknown_2021BCA + ldr r0, _0812ECFC @ =gSpriteCoordOffsetY strh r1, [r0] b _0812EE94 .align 2, 0 _0812ECF0: .4byte gUnknown_8462E58 _0812ECF4: .4byte gUnknown_203B108 -_0812ECF8: .4byte gUnknown_2021BC8 -_0812ECFC: .4byte gUnknown_2021BCA +_0812ECF8: .4byte gSpriteCoordOffsetX +_0812ECFC: .4byte gSpriteCoordOffsetY _0812ED00: ldr r2, _0812ED34 @ =gUnknown_2037AB8 ldrb r0, [r2, 0x8] @@ -1305,7 +1305,7 @@ _0812F374: lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xA] - ldr r4, _0812F4A0 @ =gUnknown_202063C + ldr r4, _0812F4A0 @ =gSprites movs r1, 0xA ldrsh r0, [r5, r1] lsls r1, r0, 4 @@ -1360,7 +1360,7 @@ _0812F490: .4byte gUnknown_8462EC0 _0812F494: .4byte gMain _0812F498: .4byte gUnknown_8462EEC _0812F49C: .4byte gUnknown_8462EF0 -_0812F4A0: .4byte gUnknown_202063C +_0812F4A0: .4byte gSprites _0812F4A4: .4byte sub_812F4A8 thumb_func_end sub_812F33C @@ -2025,7 +2025,7 @@ _0812FA1A: subs r4, 0x8 adds r4, r6, r4 ldrb r0, [r4, 0x10] - ldr r1, _0812FA6C @ =gUnknown_202063C + ldr r1, _0812FA6C @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -2061,7 +2061,7 @@ _0812FA5E: bx r0 .align 2, 0 _0812FA68: .4byte gUnknown_3005098 -_0812FA6C: .4byte gUnknown_202063C +_0812FA6C: .4byte gSprites _0812FA70: .4byte 0xffff1fff _0812FA74: .4byte sub_812FA78 thumb_func_end sub_812F9EC @@ -2266,7 +2266,7 @@ sub_812FBF0: @ 812FBF0 lsls r4, 3 adds r4, r0 ldrb r0, [r4, 0x10] - ldr r2, _0812FC5C @ =gUnknown_202063C + ldr r2, _0812FC5C @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2298,7 +2298,7 @@ _0812FC4E: bx r0 .align 2, 0 _0812FC58: .4byte gUnknown_3005090 -_0812FC5C: .4byte gUnknown_202063C +_0812FC5C: .4byte gSprites _0812FC60: .4byte 0xffff1f3f _0812FC64: .4byte sub_812FC68 thumb_func_end sub_812FBF0 @@ -2320,7 +2320,7 @@ sub_812FC68: @ 812FC68 beq _0812FCAC cmp r0, 0x17 bgt _0812FC9A - ldr r2, _0812FCA8 @ =gUnknown_202063C + ldr r2, _0812FCA8 @ =gSprites movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -2337,7 +2337,7 @@ _0812FC9A: b _0812FD62 .align 2, 0 _0812FCA4: .4byte gUnknown_3005098 -_0812FCA8: .4byte gUnknown_202063C +_0812FCA8: .4byte gSprites _0812FCAC: movs r1, 0x6 ldrsh r0, [r5, r1] @@ -2348,7 +2348,7 @@ _0812FCAC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0812FCE8 @ =gUnknown_202063C + ldr r4, _0812FCE8 @ =gSprites adds r0, r4 bl DestroySprite movs r0, 0xC @@ -2368,7 +2368,7 @@ _0812FCD6: strh r0, [r5, 0x6] b _0812FD62 .align 2, 0 -_0812FCE8: .4byte gUnknown_202063C +_0812FCE8: .4byte gSprites _0812FCEC: movs r0, 0 movs r1, 0 @@ -2984,7 +2984,7 @@ sub_81301B0: @ 81301B0 ble _08130200 subs r0, r2, 0x2 strh r0, [r4, 0x2] - ldr r1, _081301FC @ =gUnknown_2021BC8 + ldr r1, _081301FC @ =gSpriteCoordOffsetX ldrh r0, [r1] adds r0, 0x2 strh r0, [r1] @@ -2996,7 +2996,7 @@ sub_81301B0: @ 81301B0 b _08130218 .align 2, 0 _081301F8: .4byte gUnknown_3005098 -_081301FC: .4byte gUnknown_2021BC8 +_081301FC: .4byte gSpriteCoordOffsetX _08130200: strh r1, [r4, 0x2] ldr r0, _08130220 @ =gUnknown_203B108 @@ -3610,7 +3610,7 @@ sub_81306D4: @ 81306D4 adds r4, r0 movs r1, 0 strh r1, [r4, 0xA] - ldr r0, _08130714 @ =gUnknown_2021BC8 + ldr r0, _08130714 @ =gSpriteCoordOffsetX strh r1, [r0] movs r0, 0x2 bl sub_81311F4 @@ -3624,7 +3624,7 @@ sub_81306D4: @ 81306D4 bx r0 .align 2, 0 _08130710: .4byte gUnknown_3005090 -_08130714: .4byte gUnknown_2021BC8 +_08130714: .4byte gSpriteCoordOffsetX _08130718: .4byte sub_813071C thumb_func_end sub_81306D4 @@ -3764,7 +3764,7 @@ _08130820: adds r4, r0 movs r1, 0 strh r1, [r4, 0xA] - ldr r0, _08130850 @ =gUnknown_2021BC8 + ldr r0, _08130850 @ =gSpriteCoordOffsetX strh r1, [r0] movs r0, 0x2 movs r2, 0 @@ -3780,7 +3780,7 @@ _08130846: bx r0 .align 2, 0 _0813084C: .4byte gUnknown_3005090 -_08130850: .4byte gUnknown_2021BC8 +_08130850: .4byte gSpriteCoordOffsetX _08130854: .4byte sub_8130858 thumb_func_end sub_81307D0 @@ -4549,7 +4549,7 @@ _08130E7A: adds r4, r0 ldr r0, _08130EAC @ =0x0000ffc4 strh r0, [r4, 0xA] - ldr r1, _08130EB0 @ =gUnknown_2021BC8 + ldr r1, _08130EB0 @ =gSpriteCoordOffsetX ldrh r0, [r1] adds r0, 0x3C strh r0, [r1] @@ -4566,7 +4566,7 @@ _08130E7A: .align 2, 0 _08130EA8: .4byte gUnknown_3005090 _08130EAC: .4byte 0x0000ffc4 -_08130EB0: .4byte gUnknown_2021BC8 +_08130EB0: .4byte gSpriteCoordOffsetX _08130EB4: .4byte 0xffffc400 _08130EB8: movs r0, 0x1 @@ -4644,14 +4644,14 @@ sub_8130F2C: @ 8130F2C bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r4, _08130FAC @ =gUnknown_202063C + ldr r4, _08130FAC @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 adds r1, r4, 0 adds r1, 0x1C adds r1, r2, r1 - ldr r3, _08130FB0 @ =nullsub_8 + ldr r3, _08130FB0 @ =SpriteCallbackDummy str r3, [r1] adds r2, r4 ldrb r3, [r2, 0x5] @@ -4678,14 +4678,14 @@ sub_8130F2C: @ 8130F2C _08130FA0: .4byte gUnknown_8235194 _08130FA4: .4byte gUnknown_82373F4 _08130FA8: .4byte gUnknown_20244DC -_08130FAC: .4byte gUnknown_202063C -_08130FB0: .4byte nullsub_8 +_08130FAC: .4byte gSprites +_08130FB0: .4byte SpriteCallbackDummy _08130FB4: .4byte gUnknown_3005090 thumb_func_end sub_8130F2C thumb_func_start sub_8130FB8 sub_8130FB8: @ 8130FB8 - ldr r3, _08130FD0 @ =gUnknown_202063C + ldr r3, _08130FD0 @ =gSprites movs r1, 0x2E ldrsh r2, [r0, r1] lsls r1, r2, 4 @@ -4697,7 +4697,7 @@ sub_8130FB8: @ 8130FB8 strh r1, [r0, 0x26] bx lr .align 2, 0 -_08130FD0: .4byte gUnknown_202063C +_08130FD0: .4byte gSprites thumb_func_end sub_8130FB8 thumb_func_start sub_8130FD4 @@ -4738,7 +4738,7 @@ _08130FF4: bl CreateSprite lsls r0, 24 lsrs r7, r0, 24 - ldr r6, _081310BC @ =gUnknown_202063C + ldr r6, _081310BC @ =gSprites lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -4809,7 +4809,7 @@ _08130FF4: _081310B0: .4byte gUnknown_8462EFC _081310B4: .4byte gUnknown_8462F1C _081310B8: .4byte gUnknown_846302C -_081310BC: .4byte gUnknown_202063C +_081310BC: .4byte gSprites _081310C0: .4byte gUnknown_3005090 _081310C4: .4byte sub_8130FB8 _081310C8: @@ -4821,7 +4821,7 @@ _081310C8: lsls r5, r2, 2 ldr r3, _0813115C @ =gUnknown_3005098 mov r8, r3 - ldr r6, _08131160 @ =gUnknown_202063C + ldr r6, _08131160 @ =gSprites _081310DE: lsls r0, r4, 1 adds r0, r4 @@ -4886,7 +4886,7 @@ _08131146: _08131154: .4byte gUnknown_8462F14 _08131158: .4byte gUnknown_8462F24 _0813115C: .4byte gUnknown_3005098 -_08131160: .4byte gUnknown_202063C +_08131160: .4byte gSprites _08131164: .4byte gUnknown_8462F50 thumb_func_end sub_8130FD4 @@ -4912,7 +4912,7 @@ _0813117C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081311B0 @ =gUnknown_202063C + ldr r1, _081311B0 @ =gSprites adds r0, r1 bl DestroySprite adds r0, r4, 0x1 @@ -4927,7 +4927,7 @@ _0813117C: b _081311EC .align 2, 0 _081311AC: .4byte gUnknown_3005098 -_081311B0: .4byte gUnknown_202063C +_081311B0: .4byte gSprites _081311B4: ldr r0, _081311D0 @ =0x00001003 bl FreeSpriteTilesByTag @@ -5144,7 +5144,7 @@ sub_8131338: @ 8131338 strh r0, [r1, 0xC] adds r0, r6, 0 bl DestroyTask - ldr r6, _081313AC @ =gUnknown_202063C + ldr r6, _081313AC @ =gSprites adds r2, r5, 0 mov r5, r8 adds r5, 0x8 @@ -5172,7 +5172,7 @@ _08131380: b _0813143A .align 2, 0 _081313A8: .4byte gUnknown_3005090 -_081313AC: .4byte gUnknown_202063C +_081313AC: .4byte gSprites _081313B0: ldrh r1, [r2, 0x10] movs r7, 0x10 @@ -5213,7 +5213,7 @@ _081313E8: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _08131448 @ =gUnknown_202063C + ldr r0, _08131448 @ =gSprites adds r2, r0 adds r2, 0x3E ldrb r3, [r2] @@ -5254,7 +5254,7 @@ _0813143A: pop {r0} bx r0 .align 2, 0 -_08131448: .4byte gUnknown_202063C +_08131448: .4byte gSprites thumb_func_end sub_8131338 thumb_func_start sub_813144C @@ -5410,7 +5410,7 @@ _08131568: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _081315C8 @ =gUnknown_202063C + ldr r0, _081315C8 @ =gSprites adds r2, r0 adds r2, 0x3E ldrb r3, [r2] @@ -5451,7 +5451,7 @@ _081315BA: pop {r0} bx r0 .align 2, 0 -_081315C8: .4byte gUnknown_202063C +_081315C8: .4byte gSprites thumb_func_end sub_81314DC thumb_func_start sub_81315CC diff --git a/asm/overworld.s b/asm/overworld.s index 7d984529f..b9af2bf77 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -7331,7 +7331,7 @@ sub_80584B8: @ 80584B8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08058500 @ =gUnknown_202063C + ldr r1, _08058500 @ =gSprites adds r0, r1 bl DestroySprite _080584E4: @@ -7347,7 +7347,7 @@ _080584E4: .align 2, 0 _080584F8: .4byte gUnknown_2031DEC _080584FC: .4byte gUnknown_2036E38 -_08058500: .4byte gUnknown_202063C +_08058500: .4byte gSprites thumb_func_end sub_80584B8 thumb_func_start sub_8058504 @@ -7894,7 +7894,7 @@ _080588C6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08058908 @ =gUnknown_202063C + ldr r1, _08058908 @ =gSprites adds r0, r1 adds r3, r0, 0 adds r3, 0x3E @@ -7915,7 +7915,7 @@ _080588FC: bx r0 .align 2, 0 _08058904: .4byte SpriteCB_LinkPlayer -_08058908: .4byte gUnknown_202063C +_08058908: .4byte gSprites thumb_func_end sub_8058878 thumb_func_start SpriteCB_LinkPlayer diff --git a/asm/party_menu.s b/asm/party_menu.s index 83df6029f..93aa6a6e9 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -7218,7 +7218,7 @@ party_menu_link_mon_icon_anim: @ 812224C adds r0, r5, 0 bl sub_8096E18 strb r0, [r4, 0x9] - ldr r2, _081222A8 @ =gUnknown_202063C + ldr r2, _081222A8 @ =gSprites ldrb r0, [r4, 0x9] lsls r1, r0, 4 adds r1, r0 @@ -7241,7 +7241,7 @@ _0812229A: bx r0 .align 2, 0 _081222A4: .4byte sub_809718C -_081222A8: .4byte gUnknown_202063C +_081222A8: .4byte gSprites thumb_func_end party_menu_link_mon_icon_anim thumb_func_start sub_81222AC @@ -7273,51 +7273,51 @@ _081222D4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _081222F0 @ =gUnknown_202063C + ldr r1, _081222F0 @ =gSprites adds r0, r1 movs r1, 0 bl sub_8097414 b _0812234C .align 2, 0 -_081222F0: .4byte gUnknown_202063C +_081222F0: .4byte gSprites _081222F4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _08122308 @ =gUnknown_202063C + ldr r1, _08122308 @ =gSprites adds r0, r1 movs r1, 0x1 bl sub_8097414 b _0812234C .align 2, 0 -_08122308: .4byte gUnknown_202063C +_08122308: .4byte gSprites _0812230C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _08122320 @ =gUnknown_202063C + ldr r1, _08122320 @ =gSprites adds r0, r1 movs r1, 0x2 bl sub_8097414 b _0812234C .align 2, 0 -_08122320: .4byte gUnknown_202063C +_08122320: .4byte gSprites _08122324: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _08122338 @ =gUnknown_202063C + ldr r1, _08122338 @ =gSprites adds r0, r1 movs r1, 0x3 bl sub_8097414 b _0812234C .align 2, 0 -_08122338: .4byte gUnknown_202063C +_08122338: .4byte gSprites _0812233C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _08122354 @ =gUnknown_202063C + ldr r1, _08122354 @ =gSprites adds r0, r1 movs r1, 0x4 bl sub_8097414 @@ -7326,7 +7326,7 @@ _0812234C: pop {r0} bx r0 .align 2, 0 -_08122354: .4byte gUnknown_202063C +_08122354: .4byte gSprites thumb_func_end sub_81222AC thumb_func_start sub_8122358 @@ -7362,7 +7362,7 @@ sub_812238C: @ 812238C lsls r0, 24 lsrs r4, r0, 24 lsls r1, 24 - ldr r5, _081223BC @ =gUnknown_202063C + ldr r5, _081223BC @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r6, r0, 2 @@ -7382,7 +7382,7 @@ sub_812238C: @ 812238C strh r0, [r2, 0x26] b _081223CA .align 2, 0 -_081223BC: .4byte gUnknown_202063C +_081223BC: .4byte gSprites _081223C0: .4byte 0x0000fffc _081223C4: ldr r0, _081223DC @ =0x0000fffc @@ -7493,7 +7493,7 @@ party_menu_link_mon_held_item_object: @ 8122468 movs r3, 0 bl CreateSprite strb r0, [r4, 0xA] - ldr r2, _081224B0 @ =gUnknown_202063C + ldr r2, _081224B0 @ =gSprites ldrb r0, [r4, 0xA] lsls r1, r0, 4 adds r1, r0 @@ -7513,7 +7513,7 @@ _081224A4: bx r0 .align 2, 0 _081224AC: .4byte gUnknown_845A43C -_081224B0: .4byte gUnknown_202063C +_081224B0: .4byte gSprites thumb_func_end party_menu_link_mon_held_item_object thumb_func_start sub_81224B4 @@ -7539,7 +7539,7 @@ sub_81224D0: @ 81224D0 lsrs r0, 16 cmp r0, 0 bne _081224F8 - ldr r2, _081224F4 @ =gUnknown_202063C + ldr r2, _081224F4 @ =gSprites ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -7551,7 +7551,7 @@ sub_81224D0: @ 81224D0 orrs r1, r2 b _08122544 .align 2, 0 -_081224F4: .4byte gUnknown_202063C +_081224F4: .4byte gSprites _081224F8: bl itemid_is_mail lsls r0, 24 @@ -7561,24 +7561,24 @@ _081224F8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08122518 @ =gUnknown_202063C + ldr r1, _08122518 @ =gSprites adds r0, r1 movs r1, 0x1 bl StartSpriteAnim b _0812252E .align 2, 0 -_08122518: .4byte gUnknown_202063C +_08122518: .4byte gSprites _0812251C: ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0812254C @ =gUnknown_202063C + ldr r1, _0812254C @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAnim _0812252E: - ldr r2, _0812254C @ =gUnknown_202063C + ldr r2, _0812254C @ =gSprites ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -7595,7 +7595,7 @@ _08122544: pop {r0} bx r0 .align 2, 0 -_0812254C: .4byte gUnknown_202063C +_0812254C: .4byte gSprites thumb_func_end sub_81224D0 thumb_func_start sub_8122550 @@ -7712,7 +7712,7 @@ sub_8122610: @ 8122610 lsls r0, 24 lsrs r0, 24 mov r9, r0 - ldr r0, _08122688 @ =gUnknown_202063C + ldr r0, _08122688 @ =gSprites mov r8, r0 lsls r0, r6, 4 adds r0, r6 @@ -7757,7 +7757,7 @@ sub_8122610: @ 8122610 pop {r0} bx r0 .align 2, 0 -_08122688: .4byte gUnknown_202063C +_08122688: .4byte gSprites _0812268C: .4byte gUnknown_845A43C _08122690: .4byte sub_8122694 thumb_func_end sub_8122610 @@ -7769,7 +7769,7 @@ sub_8122694: @ 8122694 ldrh r1, [r4, 0x3C] lsls r1, 24 lsrs r1, 24 - ldr r2, _081226C4 @ =gUnknown_202063C + ldr r2, _081226C4 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -7788,7 +7788,7 @@ sub_8122694: @ 8122694 strb r1, [r0] b _081226E6 .align 2, 0 -_081226C4: .4byte gUnknown_202063C +_081226C4: .4byte gSprites _081226C8: adds r3, r4, 0 adds r3, 0x3E @@ -7848,7 +7848,7 @@ party_menu_link_mon_pokeball_object: @ 8122714 movs r3, 0x8 bl CreateSprite strb r0, [r4, 0xB] - ldr r2, _08122750 @ =gUnknown_202063C + ldr r2, _08122750 @ =gSprites ldrb r0, [r4, 0xB] lsls r1, r0, 4 adds r1, r0 @@ -7865,7 +7865,7 @@ _08122744: bx r0 .align 2, 0 _0812274C: .4byte gUnknown_845A484 -_08122750: .4byte gUnknown_202063C +_08122750: .4byte gSprites thumb_func_end party_menu_link_mon_pokeball_object thumb_func_start sub_8122754 @@ -7883,7 +7883,7 @@ sub_8122754: @ 8122754 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r2, _08122790 @ =gUnknown_202063C + ldr r2, _08122790 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -7899,7 +7899,7 @@ sub_8122754: @ 8122754 bx r1 .align 2, 0 _0812278C: .4byte gUnknown_845A484 -_08122790: .4byte gUnknown_202063C +_08122790: .4byte gSprites thumb_func_end sub_8122754 thumb_func_start sub_8122794 @@ -7934,13 +7934,13 @@ sub_81227B8: @ 81227B8 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _081227D8 @ =gUnknown_202063C + ldr r2, _081227D8 @ =gSprites adds r0, r2 bl StartSpriteAnim pop {r0} bx r0 .align 2, 0 -_081227D8: .4byte gUnknown_202063C +_081227D8: .4byte gSprites thumb_func_end sub_81227B8 thumb_func_start sub_81227DC @@ -7959,7 +7959,7 @@ sub_81227DC: @ 81227DC lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0812281C @ =gUnknown_202063C + ldr r0, _0812281C @ =gSprites mov r8, r0 add r4, r8 adds r0, r4, 0 @@ -7976,12 +7976,12 @@ sub_81227DC: @ 81227DC strh r6, [r5, 0x26] b _0812284C .align 2, 0 -_0812281C: .4byte gUnknown_202063C +_0812281C: .4byte gSprites _08122820: lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _08122858 @ =gUnknown_202063C + ldr r0, _08122858 @ =gSprites mov r8, r0 add r5, r8 adds r0, r5, 0 @@ -8005,7 +8005,7 @@ _0812284C: pop {r0} bx r0 .align 2, 0 -_08122858: .4byte gUnknown_202063C +_08122858: .4byte gSprites _0812285C: .4byte 0x0000fffc thumb_func_end sub_81227DC @@ -8072,7 +8072,7 @@ party_menu_link_mon_status_condition_object: @ 81228B8 adds r0, r5, 0 adds r1, r4, 0 bl party_menu_update_status_condition_object - ldr r2, _08122900 @ =gUnknown_202063C + ldr r2, _08122900 @ =gSprites ldrb r0, [r4, 0xC] lsls r1, r0, 4 adds r1, r0 @@ -8089,7 +8089,7 @@ _081228F4: bx r0 .align 2, 0 _081228FC: .4byte gUnknown_845A584 -_08122900: .4byte gUnknown_202063C +_08122900: .4byte gSprites thumb_func_end party_menu_link_mon_status_condition_object thumb_func_start party_menu_get_status_condition_and_update_object @@ -8117,7 +8117,7 @@ party_menu_update_status_condition_object: @ 812291C cmp r2, 0x6 bne _08122948 _0812292C: - ldr r2, _08122944 @ =gUnknown_202063C + ldr r2, _08122944 @ =gSprites ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -8129,13 +8129,13 @@ _0812292C: orrs r1, r2 b _08122972 .align 2, 0 -_08122944: .4byte gUnknown_202063C +_08122944: .4byte gSprites _08122948: ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0812297C @ =gUnknown_202063C + ldr r4, _0812297C @ =gSprites adds r0, r4 subs r1, r2, 0x1 lsls r1, 24 @@ -8157,7 +8157,7 @@ _08122972: pop {r0} bx r0 .align 2, 0 -_0812297C: .4byte gUnknown_202063C +_0812297C: .4byte gSprites thumb_func_end party_menu_update_status_condition_object thumb_func_start sub_8122980 @@ -9127,7 +9127,7 @@ _08123122: thumb_func_start sub_8123134 sub_8123134: @ 8123134 push {r4,lr} - ldr r4, _08123184 @ =gUnknown_202063C + ldr r4, _08123184 @ =gSprites ldrb r2, [r0, 0xB] lsls r3, r2, 4 adds r3, r2 @@ -9166,7 +9166,7 @@ sub_8123134: @ 8123134 pop {r0} bx r0 .align 2, 0 -_08123184: .4byte gUnknown_202063C +_08123184: .4byte gSprites thumb_func_end sub_8123134 thumb_func_start sub_8123188 @@ -9499,7 +9499,7 @@ oamt_swap_pos: @ 8123420 ldrb r2, [r1] strb r2, [r0] strb r3, [r1] - ldr r5, _081234E8 @ =gUnknown_202063C + ldr r5, _081234E8 @ =gSprites ldrb r2, [r0] lsls r3, r2, 4 adds r3, r2 @@ -9590,7 +9590,7 @@ oamt_swap_pos: @ 8123420 pop {r0} bx r0 .align 2, 0 -_081234E8: .4byte gUnknown_202063C +_081234E8: .4byte gSprites thumb_func_end oamt_swap_pos thumb_func_start swap_pokemon_and_oams @@ -13435,7 +13435,7 @@ _0812547E: adds r1, r0 adds r0, r5, 0 bl party_menu_get_status_condition_and_update_object - ldr r2, _08125504 @ =gUnknown_202063C + ldr r2, _08125504 @ =gSprites movs r0, 0x9 ldrsb r0, [r7, r0] ldr r1, [r4] @@ -13488,7 +13488,7 @@ _081254D0: .align 2, 0 _081254FC: .4byte gUnknown_203B0B4 _08125500: .4byte gUnknown_203B0A0 -_08125504: .4byte gUnknown_202063C +_08125504: .4byte gSprites _08125508: .4byte sub_8125554 _0812550C: ldr r1, _08125548 @ =gStringVar1 @@ -15340,7 +15340,7 @@ sub_8126440: @ 8126440 adds r1, r4 adds r0, r5, 0 bl party_menu_get_status_condition_and_update_object - ldr r2, _081264C4 @ =gUnknown_202063C + ldr r2, _081264C4 @ =gSprites ldr r0, [r6] adds r3, r4, r0 ldrb r1, [r3, 0xC] @@ -15387,7 +15387,7 @@ _0812647C: bx r0 .align 2, 0 _081264C0: .4byte gUnknown_203B0B4 -_081264C4: .4byte gUnknown_202063C +_081264C4: .4byte gSprites thumb_func_end sub_8126440 thumb_func_start sub_81264C8 @@ -15964,7 +15964,7 @@ _08126960: adds r1, r0 adds r0, r5, 0 bl party_menu_get_status_condition_and_update_object - ldr r2, _08126A10 @ =gUnknown_202063C + ldr r2, _08126A10 @ =gSprites movs r0, 0x9 ldrsb r0, [r6, r0] ldr r1, [r4] @@ -16035,7 +16035,7 @@ _08126A00: .4byte gUnknown_203B09C _08126A04: .4byte 0x0000021a _08126A08: .4byte gUnknown_203B0D0 _08126A0C: .4byte gUnknown_203B0B4 -_08126A10: .4byte gUnknown_202063C +_08126A10: .4byte gSprites _08126A14: .4byte sub_8126AFC thumb_func_end sub_81268D4 @@ -19211,7 +19211,7 @@ sub_81282B8: @ 81282B8 lsrs r3, r1, 16 cmp r1, 0 blt _081282D2 - ldr r1, _081282D8 @ =gUnknown_202063C + ldr r1, _081282D8 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -19221,7 +19221,7 @@ _081282D2: pop {r0} bx r0 .align 2, 0 -_081282D8: .4byte gUnknown_202063C +_081282D8: .4byte gSprites thumb_func_end sub_81282B8 thumb_func_start sub_81282DC diff --git a/asm/pokeball.s b/asm/pokeball.s index d9af96f92..a16edcd66 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -166,7 +166,7 @@ _0804AA68: adds r0, r5, r7 lsls r0, 2 mov r8, r0 - ldr r4, _0804AAC0 @ =gUnknown_202063C + ldr r4, _0804AAC0 @ =gSprites add r4, r8 movs r0, 0x80 strh r0, [r4, 0x2E] @@ -192,7 +192,7 @@ _0804AA68: .align 2, 0 _0804AAB8: .4byte gSaveBlock2Ptr _0804AABC: .4byte gUnknown_82606F4 -_0804AAC0: .4byte gUnknown_202063C +_0804AAC0: .4byte gSprites _0804AAC4: .4byte gUnknown_2022B4C _0804AAC8: mov r0, r10 @@ -201,7 +201,7 @@ _0804AAC8: _0804AACE: ldr r0, _0804AAEC @ =gUnknown_2023D6C strb r6, [r0] - ldr r2, _0804AAF0 @ =gUnknown_202063C + ldr r2, _0804AAF0 @ =gSprites lsls r3, r7, 4 adds r1, r3, r7 lsls r1, 2 @@ -215,7 +215,7 @@ _0804AACE: b _0804AB48 .align 2, 0 _0804AAEC: .4byte gUnknown_2023D6C -_0804AAF0: .4byte gUnknown_202063C +_0804AAF0: .4byte gSprites _0804AAF4: .4byte SpriteCB_PlayerMonSendOut_1 _0804AAF8: adds r0, r6, 0 @@ -235,7 +235,7 @@ _0804AAF8: strb r6, [r0] movs r1, 0 strh r1, [r4, 0x2E] - ldr r0, _0804AB30 @ =gUnknown_202063C + ldr r0, _0804AB30 @ =gSprites adds r0, 0x1C add r0, r8 ldr r1, _0804AB34 @ =SpriteCB_OpponentMonSendOut @@ -243,7 +243,7 @@ _0804AAF8: b _0804AB46 .align 2, 0 _0804AB2C: .4byte gUnknown_2023D6C -_0804AB30: .4byte gUnknown_202063C +_0804AB30: .4byte gSprites _0804AB34: .4byte SpriteCB_OpponentMonSendOut _0804AB38: movs r0, 0x1 @@ -255,7 +255,7 @@ _0804AB38: _0804AB46: adds r3, r5, 0 _0804AB48: - ldr r0, _0804AB68 @ =gUnknown_202063C + ldr r0, _0804AB68 @ =gSprites adds r1, r3, r7 lsls r1, 2 adds r4, r1, r0 @@ -270,7 +270,7 @@ _0804AB48: b _0804ABB8 .align 2, 0 _0804AB64: .4byte gUnknown_2023D6C -_0804AB68: .4byte gUnknown_202063C +_0804AB68: .4byte gSprites _0804AB6C: movs r0, 0x22 strh r0, [r4, 0x2E] @@ -440,7 +440,7 @@ sub_804AC94: @ 804AC94 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0804ACFC @ =gUnknown_202063C + ldr r4, _0804ACFC @ =gSprites adds r0, r4 movs r1, 0x2 bl StartSpriteAffineAnim @@ -469,7 +469,7 @@ _0804ACEE: .align 2, 0 _0804ACF4: .4byte sub_804AD00 _0804ACF8: .4byte gUnknown_2023D44 -_0804ACFC: .4byte gUnknown_202063C +_0804ACFC: .4byte gSprites thumb_func_end sub_804AC94 thumb_func_start sub_804AD00 @@ -486,7 +486,7 @@ sub_804AD00: @ 804AD00 movs r0, 0x35 bl PlaySE _0804AD18: - ldr r6, _0804AD64 @ =gUnknown_202063C + ldr r6, _0804AD64 @ =gSprites ldr r5, _0804AD68 @ =gUnknown_2023D44 movs r1, 0x3A ldrsh r0, [r4, r1] @@ -524,7 +524,7 @@ _0804AD18: str r0, [r4, 0x1C] b _0804AD90 .align 2, 0 -_0804AD64: .4byte gUnknown_202063C +_0804AD64: .4byte gSprites _0804AD68: .4byte gUnknown_2023D44 _0804AD6C: .4byte sub_804AD98 _0804AD70: @@ -1371,7 +1371,7 @@ _0804B420: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0804B480 @ =gUnknown_202063C + ldr r4, _0804B480 @ =gSprites adds r0, r4 movs r1, 0x1 bl StartSpriteAffineAnim @@ -1406,7 +1406,7 @@ _0804B420: _0804B474: .4byte Task_PlayCryWhenReleasedFromBall _0804B478: .4byte gUnknown_3005090 _0804B47C: .4byte gUnknown_2023D44 -_0804B480: .4byte gUnknown_202063C +_0804B480: .4byte gSprites thumb_func_end sub_804B268 thumb_func_start sub_804B484 @@ -1436,7 +1436,7 @@ HandleBallAnimEnd: @ 804B4A4 ldrh r0, [r5, 0x3A] lsls r0, 24 lsrs r6, r0, 24 - ldr r4, _0804B508 @ =gUnknown_202063C + ldr r4, _0804B508 @ =gSprites ldr r0, _0804B50C @ =gUnknown_2023D44 adds r3, r6, r0 ldrb r1, [r3] @@ -1481,7 +1481,7 @@ _0804B4E6: movs r7, 0x1 b _0804B52C .align 2, 0 -_0804B508: .4byte gUnknown_202063C +_0804B508: .4byte gSprites _0804B50C: .4byte gUnknown_2023D44 _0804B510: ldr r2, _0804B5B4 @ =0xfffffee0 @@ -1508,7 +1508,7 @@ _0804B52C: beq _0804B5AE cmp r7, 0 beq _0804B5AE - ldr r2, _0804B5B8 @ =gUnknown_202063C + ldr r2, _0804B5B8 @ =gSprites ldr r0, _0804B5BC @ =gUnknown_2023D44 adds r0, r6, r0 ldrb r1, [r0] @@ -1570,7 +1570,7 @@ _0804B5AE: bx r0 .align 2, 0 _0804B5B4: .4byte 0xfffffee0 -_0804B5B8: .4byte gUnknown_202063C +_0804B5B8: .4byte gSprites _0804B5BC: .4byte gUnknown_2023D44 _0804B5C0: .4byte gUnknown_2024005 _0804B5C4: .4byte gUnknown_2024018 @@ -1606,7 +1606,7 @@ _0804B600: ldr r0, _0804B66C @ =0x0000013b cmp r1, r0 bne _0804B666 - ldr r5, _0804B670 @ =gUnknown_202063C + ldr r5, _0804B670 @ =gSprites ldr r4, _0804B674 @ =gUnknown_2023D44 movs r1, 0x3A ldrsh r0, [r6, r1] @@ -1657,7 +1657,7 @@ _0804B666: bx r0 .align 2, 0 _0804B66C: .4byte 0x0000013b -_0804B670: .4byte gUnknown_202063C +_0804B670: .4byte gSprites _0804B674: .4byte gUnknown_2023D44 _0804B678: .4byte gMain _0804B67C: .4byte 0x00000439 @@ -2039,7 +2039,7 @@ CreatePokeballSpriteToReleaseMon: @ 804B908 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r3, _0804B9E0 @ =gUnknown_202063C + ldr r3, _0804B9E0 @ =gSprites mov r8, r3 lsls r4, r0, 4 adds r4, r0 @@ -2099,7 +2099,7 @@ CreatePokeballSpriteToReleaseMon: @ 804B908 _0804B9D4: .4byte gUnknown_826056C _0804B9D8: .4byte gUnknown_82605CC _0804B9DC: .4byte gUnknown_82606F4 -_0804B9E0: .4byte gUnknown_202063C +_0804B9E0: .4byte gSprites _0804B9E4: .4byte sub_804B9E8 thumb_func_end CreatePokeballSpriteToReleaseMon @@ -2162,7 +2162,7 @@ _0804BA24: strh r0, [r6, 0x30] ldr r0, _0804BA8C @ =sub_804BAA4 str r0, [r6, 0x1C] - ldr r0, _0804BA90 @ =gUnknown_202063C + ldr r0, _0804BA90 @ =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -2186,7 +2186,7 @@ _0804BA24: b _0804BA98 .align 2, 0 _0804BA8C: .4byte sub_804BAA4 -_0804BA90: .4byte gUnknown_202063C +_0804BA90: .4byte gSprites _0804BA94: subs r0, r1, 0x1 strh r0, [r6, 0x30] @@ -2222,7 +2222,7 @@ sub_804BAA4: @ 804BAA4 orrs r0, r1 strb r0, [r2] _0804BACE: - ldr r0, _0804BB5C @ =gUnknown_202063C + ldr r0, _0804BB5C @ =gSprites lsls r1, r3, 4 adds r1, r3 lsls r1, 2 @@ -2296,7 +2296,7 @@ _0804BB48: strh r0, [r5, 0x26] b _0804BB72 .align 2, 0 -_0804BB5C: .4byte gUnknown_202063C +_0804BB5C: .4byte gSprites _0804BB60: .4byte gUnknown_825E074 _0804BB64: ldrh r0, [r4, 0x38] @@ -2372,7 +2372,7 @@ sub_804BB98: @ 804BB98 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r6, _0804BC48 @ =gUnknown_202063C + ldr r6, _0804BC48 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -2412,7 +2412,7 @@ sub_804BB98: @ 804BB98 _0804BC3C: .4byte gUnknown_826056C _0804BC40: .4byte gUnknown_82605CC _0804BC44: .4byte gUnknown_82606F4 -_0804BC48: .4byte gUnknown_202063C +_0804BC48: .4byte gSprites _0804BC4C: .4byte sub_804BC50 thumb_func_end sub_804BB98 @@ -2478,7 +2478,7 @@ _0804BC8C: lsls r4, r7, 4 adds r4, r7 lsls r4, 2 - ldr r0, _0804BCE4 @ =gUnknown_202063C + ldr r0, _0804BCE4 @ =gSprites adds r4, r0 adds r0, r4, 0 movs r1, 0x2 @@ -2489,7 +2489,7 @@ _0804BC8C: b _0804BCEC .align 2, 0 _0804BCE0: .4byte sub_804BCF8 -_0804BCE4: .4byte gUnknown_202063C +_0804BCE4: .4byte gSprites _0804BCE8: subs r0, r1, 0x1 strh r0, [r4, 0x30] @@ -2518,7 +2518,7 @@ _0804BD10: ldrh r1, [r5, 0x2E] lsls r1, 24 lsrs r1, 24 - ldr r2, _0804BD4C @ =gUnknown_202063C + ldr r2, _0804BD4C @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2544,7 +2544,7 @@ _0804BD10: str r0, [r5, 0x1C] b _0804BD64 .align 2, 0 -_0804BD4C: .4byte gUnknown_202063C +_0804BD4C: .4byte gSprites _0804BD50: .4byte sub_804BD6C _0804BD54: ldrh r0, [r4, 0x30] @@ -2571,13 +2571,13 @@ sub_804BD6C: @ 804BD6C ands r0, r1 cmp r0, 0 beq _0804BD80 - ldr r0, _0804BD84 @ =nullsub_8 + ldr r0, _0804BD84 @ =SpriteCallbackDummy str r0, [r2, 0x1C] _0804BD80: pop {r0} bx r0 .align 2, 0 -_0804BD84: .4byte nullsub_8 +_0804BD84: .4byte SpriteCallbackDummy thumb_func_end sub_804BD6C thumb_func_start DestroySpriteAndFreeResources_ @@ -2600,7 +2600,7 @@ sub_804BD94: @ 804BD94 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r6, _0804BE18 @ =gUnknown_202063C + ldr r6, _0804BE18 @ =gSprites adds r4, r0, r6 movs r1, 0 movs r0, 0x5 @@ -2654,7 +2654,7 @@ _0804BE0C: bx r0 .align 2, 0 _0804BE14: .4byte gUnknown_3004FF0 -_0804BE18: .4byte gUnknown_202063C +_0804BE18: .4byte gSprites _0804BE1C: .4byte sub_804BE48 _0804BE20: .4byte sub_804BE24 thumb_func_end sub_804BD94 @@ -2696,13 +2696,13 @@ sub_804BE48: @ 804BE48 ldr r0, [r2, 0x24] cmp r0, 0 bne _0804BE66 - ldr r0, _0804BE6C @ =nullsub_8 + ldr r0, _0804BE6C @ =SpriteCallbackDummy str r0, [r2, 0x1C] _0804BE66: pop {r0} bx r0 .align 2, 0 -_0804BE6C: .4byte nullsub_8 +_0804BE6C: .4byte SpriteCallbackDummy thumb_func_end sub_804BE48 thumb_func_start DoHitAnimHealthboxEffect @@ -2716,7 +2716,7 @@ DoHitAnimHealthboxEffect: @ 804BE70 bl CreateInvisibleSpriteWithCallback lsls r0, 24 lsrs r0, 24 - ldr r2, _0804BEAC @ =gUnknown_202063C + ldr r2, _0804BEAC @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -2735,7 +2735,7 @@ DoHitAnimHealthboxEffect: @ 804BE70 bx r0 .align 2, 0 _0804BEA8: .4byte SpriteCB_HitAnimHealthoxEffect -_0804BEAC: .4byte gUnknown_202063C +_0804BEAC: .4byte gSprites _0804BEB0: .4byte gUnknown_3004FF0 thumb_func_end DoHitAnimHealthboxEffect @@ -2746,7 +2746,7 @@ SpriteCB_HitAnimHealthoxEffect: @ 804BEB4 ldrh r1, [r3, 0x30] lsls r1, 24 lsrs r1, 24 - ldr r2, _0804BEF0 @ =gUnknown_202063C + ldr r2, _0804BEF0 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2772,7 +2772,7 @@ _0804BEEC: pop {r0} bx r0 .align 2, 0 -_0804BEF0: .4byte gUnknown_202063C +_0804BEF0: .4byte gSprites thumb_func_end SpriteCB_HitAnimHealthoxEffect thumb_func_start LoadBallGfx diff --git a/asm/pokedex_area_markers.s b/asm/pokedex_area_markers.s index 77fa41b78..5f156c18b 100644 --- a/asm/pokedex_area_markers.s +++ b/asm/pokedex_area_markers.s @@ -14,7 +14,7 @@ sub_8134200: @ 8134200 lsls r1, 3 ldr r0, _08134228 @ =gUnknown_3005098 adds r1, r0 - ldr r2, _0813422C @ =gUnknown_202063C + ldr r2, _0813422C @ =gSprites ldrb r1, [r1, 0xD] lsls r0, r1, 4 adds r0, r1 @@ -29,7 +29,7 @@ sub_8134200: @ 8134200 bx lr .align 2, 0 _08134228: .4byte gUnknown_3005098 -_0813422C: .4byte gUnknown_202063C +_0813422C: .4byte gSprites thumb_func_end sub_8134200 thumb_func_start sub_8134230 @@ -124,7 +124,7 @@ sub_8134230: @ 8134230 movs r0, 0x4A bl SetGpuReg add r1, sp, 0x8 - ldr r0, _081343EC @ =gUnknown_8231D00 + ldr r0, _081343EC @ =gDummySpriteTemplate ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -141,7 +141,7 @@ sub_8134230: @ 8134230 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _081343F0 @ =gUnknown_202063C + ldr r5, _081343F0 @ =gSprites adds r0, r5 adds r1, r4, 0 bl SetSubspriteTables @@ -228,8 +228,8 @@ _081343DC: .4byte 0x00002f42 _081343E0: .4byte 0x0000080c _081343E4: .4byte 0x00001f1f _081343E8: .4byte 0x00002f3d -_081343EC: .4byte gUnknown_8231D00 -_081343F0: .4byte gUnknown_202063C +_081343EC: .4byte gDummySpriteTemplate +_081343F0: .4byte gSprites thumb_func_end sub_8134230 thumb_func_start sub_81343F4 @@ -250,7 +250,7 @@ sub_81343F4: @ 81343F4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0813449C @ =gUnknown_202063C + ldr r1, _0813449C @ =gSprites adds r0, r1 bl DestroySprite ldr r0, [r4, 0x8] @@ -302,7 +302,7 @@ sub_81343F4: @ 81343F4 bx r0 .align 2, 0 _08134498: .4byte gUnknown_3005098 -_0813449C: .4byte gUnknown_202063C +_0813449C: .4byte gSprites _081344A0: .4byte 0x00001f1f thumb_func_end sub_81343F4 diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s index 12e43f222..b63437702 100644 --- a/asm/pokedex_screen.s +++ b/asm/pokedex_screen.s @@ -7806,7 +7806,7 @@ _08106534: ldr r1, [r7] adds r1, 0x58 strb r0, [r1] - ldr r2, _081066C4 @ =gUnknown_202063C + ldr r2, _081066C4 @ =gSprites mov r10, r2 ldr r0, [r7] adds r0, 0x58 @@ -7978,7 +7978,7 @@ _081066B4: .4byte gUnknown_8254784 _081066B8: .4byte gUnknown_203ACF0 _081066BC: .4byte gUnknown_8452368 _081066C0: .4byte 0x0000ffff -_081066C4: .4byte gUnknown_202063C +_081066C4: .4byte gSprites _081066C8: .4byte gUnknown_844E850 _081066CC: .4byte gSaveBlock2Ptr _081066D0: diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s index 1a5724e90..c269ce8a4 100644 --- a/asm/pokemon_icon.s +++ b/asm/pokemon_icon.s @@ -71,7 +71,7 @@ _08096E7E: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _08096EC8 @ =gUnknown_202063C + ldr r1, _08096EC8 @ =gSprites adds r0, r1 bl UpdateMonIconFrame adds r0, r4, 0 @@ -88,7 +88,7 @@ _08096EB8: .4byte gUnknown_83D40AC _08096EBC: .4byte gUnknown_83D40E0 _08096EC0: .4byte gUnknown_83D3E80 _08096EC4: .4byte 0x0000dac0 -_08096EC8: .4byte gUnknown_202063C +_08096EC8: .4byte gSprites thumb_func_end sub_8096E18 thumb_func_start sub_8096ECC @@ -141,7 +141,7 @@ sub_8096ECC: @ 8096ECC lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _08096F58 @ =gUnknown_202063C + ldr r1, _08096F58 @ =gSprites adds r0, r1 bl UpdateMonIconFrame adds r0, r4, 0 @@ -155,7 +155,7 @@ _08096F48: .4byte gUnknown_83D40AC _08096F4C: .4byte gUnknown_83D40E0 _08096F50: .4byte gUnknown_83D3E80 _08096F54: .4byte 0x0000dac0 -_08096F58: .4byte gUnknown_202063C +_08096F58: .4byte gSprites thumb_func_end sub_8096ECC thumb_func_start mon_icon_convert_unown_species_id @@ -758,7 +758,7 @@ CreateMonIconSprite: @ 8097300 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r6, _080973D4 @ =gUnknown_202063C + ldr r6, _080973D4 @ =gSprites lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -791,7 +791,7 @@ CreateMonIconSprite: @ 8097300 _080973C8: .4byte gUnknown_83D40E8 _080973CC: .4byte 0xffff0000 _080973D0: .4byte 0x0000ffff -_080973D4: .4byte gUnknown_202063C +_080973D4: .4byte gSprites thumb_func_end CreateMonIconSprite thumb_func_start sub_80973D8 diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index bb68ad871..e7b41b23e 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -2467,7 +2467,7 @@ _0811D884: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0811D908 @ =gUnknown_202063C + ldr r1, _0811D908 @ =gSprites adds r0, r1 str r0, [r5, 0xC] ldr r1, [sp] @@ -2476,7 +2476,7 @@ _0811D884: .align 2, 0 _0811D900: .4byte gUnknown_82350AC _0811D904: .4byte gUnknown_8459A30 -_0811D908: .4byte gUnknown_202063C +_0811D908: .4byte gSprites _0811D90C: movs r0, 0 str r0, [r5, 0xC] @@ -2700,14 +2700,14 @@ sub_811DA9C: @ 811DA9C thumb_func_start sub_811DAAC sub_811DAAC: @ 811DAAC ldr r1, [r0, 0x1C] - ldr r0, _0811DABC @ =nullsub_8 + ldr r0, _0811DABC @ =SpriteCallbackDummy eors r1, r0 negs r0, r1 orrs r0, r1 lsrs r0, 31 bx lr .align 2, 0 -_0811DABC: .4byte nullsub_8 +_0811DABC: .4byte SpriteCallbackDummy thumb_func_end sub_811DAAC thumb_func_start sub_811DAC0 @@ -2843,11 +2843,11 @@ sub_811DBA8: @ 811DBA8 movs r1, 0 strh r1, [r2, 0x24] ldr r1, [r0, 0xC] - ldr r0, _0811DBB8 @ =nullsub_8 + ldr r0, _0811DBB8 @ =SpriteCallbackDummy str r0, [r1, 0x1C] bx lr .align 2, 0 -_0811DBB8: .4byte nullsub_8 +_0811DBB8: .4byte SpriteCallbackDummy thumb_func_end sub_811DBA8 thumb_func_start sub_811DBBC @@ -2877,11 +2877,11 @@ sub_811DBBC: @ 811DBBC cmp r0, r1 blt _0811DBF8 strh r3, [r2, 0x24] - ldr r0, _0811DBF4 @ =nullsub_8 + ldr r0, _0811DBF4 @ =SpriteCallbackDummy str r0, [r2, 0x1C] b _0811DC0C .align 2, 0 -_0811DBF4: .4byte nullsub_8 +_0811DBF4: .4byte SpriteCallbackDummy _0811DBF8: ldrh r1, [r2, 0x3A] movs r0, 0x1 @@ -3048,7 +3048,7 @@ sub_811DD20: @ 811DD20 lsrs r0, 24 cmp r0, 0x40 beq _0811DD88 - ldr r3, _0811DD7C @ =gUnknown_202063C + ldr r3, _0811DD7C @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -3075,16 +3075,16 @@ sub_811DD20: @ 811DD20 str r1, [r0] adds r3, 0x1C adds r2, r3 - ldr r0, _0811DD84 @ =nullsub_8 + ldr r0, _0811DD84 @ =SpriteCallbackDummy str r0, [r2] adds r0, r4, 0 bl InitSpriteAffineAnim adds r0, r4, 0 b _0811DD8A .align 2, 0 -_0811DD7C: .4byte gUnknown_202063C +_0811DD7C: .4byte gSprites _0811DD80: .4byte gUnknown_8459A20 -_0811DD84: .4byte nullsub_8 +_0811DD84: .4byte SpriteCallbackDummy _0811DD88: movs r0, 0 _0811DD8A: @@ -3326,7 +3326,7 @@ sub_811DF14: @ 811DF14 movs r1, 0x10 bl BlendPalettes movs r6, 0 - ldr r2, _0811DFB4 @ =gUnknown_202063C + ldr r2, _0811DFB4 @ =gSprites mov r8, r2 movs r0, 0x1C add r0, r8 @@ -3372,7 +3372,7 @@ _0811DFA0: pop {r0} bx r0 .align 2, 0 -_0811DFB4: .4byte gUnknown_202063C +_0811DFB4: .4byte gSprites _0811DFB8: .4byte gUnknown_8459B30 _0811DFBC: .4byte sub_811DFC0 thumb_func_end sub_811DF14 @@ -3584,7 +3584,7 @@ sub_811E138: @ 811E138 bl sub_811D0A8 ldr r0, [r0, 0xC] ldr r1, [r0, 0x1C] - ldr r0, _0811E150 @ =nullsub_8 + ldr r0, _0811E150 @ =SpriteCallbackDummy eors r1, r0 negs r0, r1 orrs r0, r1 @@ -3592,7 +3592,7 @@ sub_811E138: @ 811E138 pop {r1} bx r1 .align 2, 0 -_0811E150: .4byte nullsub_8 +_0811E150: .4byte SpriteCallbackDummy thumb_func_end sub_811E138 thumb_func_start sub_811E154 @@ -3625,13 +3625,13 @@ _0811E174: ldrh r0, [r1, 0x20] subs r0, 0x3 strh r0, [r1, 0x20] - ldr r0, _0811E190 @ =nullsub_8 + ldr r0, _0811E190 @ =SpriteCallbackDummy str r0, [r1, 0x1C] _0811E18C: pop {r0} bx r0 .align 2, 0 -_0811E190: .4byte nullsub_8 +_0811E190: .4byte SpriteCallbackDummy thumb_func_end sub_811E154 thumb_func_start sub_811E194 @@ -3740,7 +3740,7 @@ _0811E22C: lsrs r5, 16 bl sub_811D120 adds r6, r0, 0 - ldr r0, _0811E2F0 @ =gUnknown_202063C + ldr r0, _0811E2F0 @ =gSprites lsls r4, r7, 4 adds r4, r7 lsls r4, 2 @@ -3799,7 +3799,7 @@ _0811E2E0: .4byte gUnknown_84599B8 _0811E2E4: .4byte gUnknown_84599C0 _0811E2E8: .4byte gUnknown_84599B2 _0811E2EC: .4byte gUnknown_8459AEC -_0811E2F0: .4byte gUnknown_202063C +_0811E2F0: .4byte gSprites thumb_func_end sub_811E204 thumb_func_start sub_811E2F4 @@ -3997,7 +3997,7 @@ _0811E3E0: lsrs r1, r0, 24 cmp r1, 0x40 beq _0811E4A4 - ldr r0, _0811E4C4 @ =gUnknown_202063C + ldr r0, _0811E4C4 @ =gSprites lsls r4, r1, 4 adds r4, r1 lsls r4, 2 @@ -4037,7 +4037,7 @@ _0811E4A4: .align 2, 0 _0811E4BC: .4byte gUnknown_825E074 _0811E4C0: .4byte gUnknown_8459B30 -_0811E4C4: .4byte gUnknown_202063C +_0811E4C4: .4byte gSprites _0811E4C8: subs r0, 0x1 strh r0, [r5, 0x2] @@ -4381,7 +4381,7 @@ sub_811E710: @ 811E710 lsrs r1, r0, 24 cmp r1, 0x40 beq _0811E79A - ldr r0, _0811E7A8 @ =gUnknown_202063C + ldr r0, _0811E7A8 @ =gSprites lsls r2, r1, 4 adds r2, r1 lsls r2, 2 @@ -4418,7 +4418,7 @@ _0811E79A: bx r0 .align 2, 0 _0811E7A4: .4byte gUnknown_8459ACC -_0811E7A8: .4byte gUnknown_202063C +_0811E7A8: .4byte gSprites _0811E7AC: .4byte 0x41c64e6d _0811E7B0: .4byte 0x00006073 thumb_func_end sub_811E710 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 8af5c5faa..9cd38991c 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -2181,12 +2181,12 @@ sub_808C9C4: @ 808C9C4 adds r0, 0x1E strh r1, [r0] str r4, [sp, 0x20] - ldr r0, _0808CB7C @ =gUnknown_8231CF0 + ldr r0, _0808CB7C @ =gDummySpriteAnimTable str r0, [sp, 0x24] str r1, [sp, 0x28] - ldr r0, _0808CB80 @ =gUnknown_8231CFC + ldr r0, _0808CB80 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x2C] - ldr r0, _0808CB84 @ =nullsub_8 + ldr r0, _0808CB84 @ =SpriteCallbackDummy str r0, [sp, 0x30] add r0, sp, 0x4 mov r1, r8 @@ -2224,7 +2224,7 @@ sub_808C9C4: @ 808C9C4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808CB94 @ =gUnknown_202063C + ldr r1, _0808CB94 @ =gSprites adds r0, r1 str r0, [r3] ldrb r2, [r4, 0x1] @@ -2266,7 +2266,7 @@ _0808CA90: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808CB94 @ =gUnknown_202063C + ldr r1, _0808CB94 @ =gSprites adds r1, r0, r1 str r1, [r2] movs r5, 0 @@ -2367,13 +2367,13 @@ _0808CB54: bx r0 .align 2, 0 _0808CB78: .4byte 0xffff0fff -_0808CB7C: .4byte gUnknown_8231CF0 -_0808CB80: .4byte gUnknown_8231CFC -_0808CB84: .4byte nullsub_8 +_0808CB7C: .4byte gDummySpriteAnimTable +_0808CB80: .4byte gDummySpriteAffineAnimTable +_0808CB84: .4byte SpriteCallbackDummy _0808CB88: .4byte gUnknown_83CDA94 _0808CB8C: .4byte gUnknown_20397AC _0808CB90: .4byte 0x00000242 -_0808CB94: .4byte gUnknown_202063C +_0808CB94: .4byte gSprites _0808CB98: .4byte gUnknown_83CDA70 _0808CB9C: .4byte 0x00000246 _0808CBA0: .4byte sub_808CD64 @@ -2820,7 +2820,7 @@ sub_808CF10: @ 808CF10 bl FreeSpriteTileRanges bl FreeAllSpritePalettes bl ClearDma3Requests - ldr r1, _0808CF80 @ =gUnknown_2021B46 + ldr r1, _0808CF80 @ =gReservedSpriteTileCount movs r2, 0xA0 lsls r2, 2 adds r0, r2, 0 @@ -2859,7 +2859,7 @@ sub_808CF10: @ 808CF10 pop {r0} bx r0 .align 2, 0 -_0808CF80: .4byte gUnknown_2021B46 +_0808CF80: .4byte gReservedSpriteTileCount _0808CF84: .4byte gUnknown_20397B0 _0808CF88: .4byte gKeyRepeatStartDelay _0808CF8C: .4byte gUnknown_83CE6F8 @@ -6920,7 +6920,7 @@ _0808F17A: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0808F1CC @ =gUnknown_202063C + ldr r0, _0808F1CC @ =gSprites adds r1, r0 str r1, [r2] adds r0, r4, 0x1 @@ -6937,7 +6937,7 @@ _0808F1BC: .4byte gUnknown_83CEA68 _0808F1C0: .4byte gUnknown_83CEBD8 _0808F1C4: .4byte gUnknown_20397B0 _0808F1C8: .4byte 0x00000d94 -_0808F1CC: .4byte gUnknown_202063C +_0808F1CC: .4byte gSprites thumb_func_end sub_808F164 thumb_func_start sub_808F1D0 @@ -7055,14 +7055,14 @@ _0808F28A: negs r1, r1 ands r1, r0 strb r1, [r4, 0x1] - ldr r0, _0808F2B8 @ =nullsub_8 + ldr r0, _0808F2B8 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _0808F2B2: pop {r4} pop {r0} bx r0 .align 2, 0 -_0808F2B8: .4byte nullsub_8 +_0808F2B8: .4byte SpriteCallbackDummy thumb_func_end BoxSetMosaic2 thumb_func_start sub_808F2BC @@ -7156,7 +7156,7 @@ _0808F36C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0808F3A4 @ =gUnknown_202063C + ldr r1, _0808F3A4 @ =gSprites adds r0, r1 str r0, [r3] lsls r0, r4, 4 @@ -7176,7 +7176,7 @@ _0808F36C: .align 2, 0 _0808F39C: .4byte gUnknown_20397B0 _0808F3A0: .4byte 0x00002238 -_0808F3A4: .4byte gUnknown_202063C +_0808F3A4: .4byte gSprites _0808F3A8: .4byte 0x00002232 _0808F3AC: .4byte 0x00002234 _0808F3B0: .4byte 0x06010000 @@ -9126,7 +9126,7 @@ _080902FC: strh r0, [r1] ldrh r0, [r2, 0x34] strh r0, [r2, 0x20] - ldr r0, _08090320 @ =nullsub_8 + ldr r0, _08090320 @ =SpriteCallbackDummy str r0, [r2, 0x1C] _08090312: pop {r0} @@ -9134,7 +9134,7 @@ _08090312: .align 2, 0 _08090318: .4byte gUnknown_20397B0 _0809031C: .4byte 0x00000c62 -_08090320: .4byte nullsub_8 +_08090320: .4byte SpriteCallbackDummy thumb_func_end sub_80902E0 thumb_func_start sub_8090324 @@ -9162,13 +9162,13 @@ _08090338: lsrs r0, 16 cmp r0, 0xB6 bls _08090354 - ldr r0, _08090358 @ =nullsub_8 + ldr r0, _08090358 @ =SpriteCallbackDummy str r0, [r2, 0x1C] _08090354: pop {r0} bx r0 .align 2, 0 -_08090358: .4byte nullsub_8 +_08090358: .4byte SpriteCallbackDummy thumb_func_end sub_8090324 thumb_func_start sub_809035C @@ -10204,7 +10204,7 @@ _08090B20: adds r0, 0x10 _08090B32: strh r0, [r3, 0x22] - ldr r0, _08090B5C @ =nullsub_8 + ldr r0, _08090B5C @ =SpriteCallbackDummy str r0, [r3, 0x1C] ldr r0, _08090B60 @ =gUnknown_20397B0 ldr r2, [r0] @@ -10225,7 +10225,7 @@ _08090B54: pop {r0} bx r0 .align 2, 0 -_08090B5C: .4byte nullsub_8 +_08090B5C: .4byte SpriteCallbackDummy _08090B60: .4byte gUnknown_20397B0 _08090B64: .4byte 0x00000a6c _08090B68: .4byte 0x00000c5a @@ -10569,7 +10569,7 @@ _08090DE0: ldr r0, _08090E00 @ =0x00000a68 adds r1, r0 ldr r2, [r1] - ldr r0, _08090E04 @ =nullsub_8 + ldr r0, _08090E04 @ =SpriteCallbackDummy str r0, [r2, 0x1C] movs r0, 0 str r0, [r1] @@ -10580,7 +10580,7 @@ _08090DE0: _08090DF8: .4byte gUnknown_20397B0 _08090DFC: .4byte 0x00000a84 _08090E00: .4byte 0x00000a68 -_08090E04: .4byte nullsub_8 +_08090E04: .4byte SpriteCallbackDummy thumb_func_end sub_8090D58 thumb_func_start sub_8090E08 @@ -10618,7 +10618,7 @@ _08090E3C: ldr r2, _08090E68 @ =0x00000a68 adds r0, r1, r2 ldr r2, [r0] - ldr r0, _08090E6C @ =nullsub_8 + ldr r0, _08090E6C @ =SpriteCallbackDummy str r0, [r2, 0x1C] ldr r4, _08090E70 @ =0x00000c59 adds r1, r4 @@ -10632,7 +10632,7 @@ _08090E5C: .4byte gUnknown_20397B0 _08090E60: .4byte 0x00000afc _08090E64: .4byte 0x00000a84 _08090E68: .4byte 0x00000a68 -_08090E6C: .4byte nullsub_8 +_08090E6C: .4byte SpriteCallbackDummy _08090E70: .4byte 0x00000c59 thumb_func_end sub_8090E08 @@ -10788,7 +10788,7 @@ _08090F6A: adds r1, r7 ldr r0, [r1] ldr r1, [r0] - ldr r0, _08090FC0 @ =nullsub_8 + ldr r0, _08090FC0 @ =SpriteCallbackDummy str r0, [r1, 0x1C] _08090F9E: movs r0, 0x1 @@ -10805,7 +10805,7 @@ _08090FB0: .4byte 0x00000afc _08090FB4: .4byte 0x00000a68 _08090FB8: .4byte gUnknown_825E074 _08090FBC: .4byte sub_80911B0 -_08090FC0: .4byte nullsub_8 +_08090FC0: .4byte SpriteCallbackDummy thumb_func_end sub_8090E74 thumb_func_start sub_8090FC4 @@ -11303,7 +11303,7 @@ sub_80912E0: @ 80912E0 lsrs r2, r0, 24 cmp r2, 0x40 beq _080913AC - ldr r1, _080913A0 @ =gUnknown_202063C + ldr r1, _080913A0 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -11332,7 +11332,7 @@ _08091390: .4byte gUnknown_83CEBF0 _08091394: .4byte gUnknown_83D3E80 _08091398: .4byte 0x0000dac0 _0809139C: .4byte 0x0000ffff -_080913A0: .4byte gUnknown_202063C +_080913A0: .4byte gSprites _080913A4: .4byte 0x000003ff _080913A8: .4byte 0xfffffc00 _080913AC: @@ -12384,7 +12384,7 @@ _08091BBC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08091C44 @ =gUnknown_202063C + ldr r1, _08091C44 @ =gSprites adds r0, r1 str r0, [r2] lsls r1, r4, 24 @@ -12420,7 +12420,7 @@ _08091C34: .4byte 0x0000071c _08091C38: .4byte 0x0000071e _08091C3C: .4byte 0x000021a8 _08091C40: .4byte gUnknown_83D2B7C -_08091C44: .4byte gUnknown_202063C +_08091C44: .4byte gSprites thumb_func_end sub_8091A94 thumb_func_start sub_8091C48 @@ -12596,7 +12596,7 @@ _08091D82: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08091E28 @ =gUnknown_202063C + ldr r0, _08091E28 @ =gSprites adds r1, r0 str r1, [r2] mov r0, r8 @@ -12651,7 +12651,7 @@ _08091E18: .4byte 0x0000071c _08091E1C: .4byte 0x0000dac9 _08091E20: .4byte 0x000021a8 _08091E24: .4byte gUnknown_83D29D0 -_08091E28: .4byte gUnknown_202063C +_08091E28: .4byte gSprites _08091E2C: .4byte sub_8091E84 _08091E30: .4byte sub_8091EB8 thumb_func_end sub_8091C48 @@ -12721,13 +12721,13 @@ _08091E98: ldrsh r1, [r2, r3] cmp r0, r1 bne _08091EB0 - ldr r0, _08091EB4 @ =nullsub_8 + ldr r0, _08091EB4 @ =SpriteCallbackDummy str r0, [r2, 0x1C] _08091EB0: pop {r0} bx r0 .align 2, 0 -_08091EB4: .4byte nullsub_8 +_08091EB4: .4byte SpriteCallbackDummy thumb_func_end sub_8091E84 thumb_func_start sub_8091EB8 @@ -12860,7 +12860,7 @@ _08091F8A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08092004 @ =gUnknown_202063C + ldr r1, _08092004 @ =gSprites adds r4, r0, r1 lsls r1, r5, 24 lsrs r1, 24 @@ -12901,7 +12901,7 @@ _08091FF6: .align 2, 0 _08091FFC: .4byte gUnknown_83D2B54 _08092000: .4byte gUnknown_83D2BB4 -_08092004: .4byte gUnknown_202063C +_08092004: .4byte gSprites _08092008: .4byte gUnknown_20397B0 thumb_func_end sub_8091F80 @@ -13239,7 +13239,7 @@ sub_809223C: @ 809223C lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r5, _080922AC @ =gUnknown_202063C + ldr r5, _080922AC @ =gSprites adds r6, r4, r5 adds r0, r6, 0 bl StartSpriteAnim @@ -13255,14 +13255,14 @@ sub_809223C: @ 809223C strb r0, [r6, 0x5] adds r5, 0x1C adds r4, r5 - ldr r0, _080922B0 @ =nullsub_8 + ldr r0, _080922B0 @ =SpriteCallbackDummy str r0, [r4] adds r0, r6, 0 b _080922B6 .align 2, 0 _080922A8: .4byte gUnknown_83D2BB4 -_080922AC: .4byte gUnknown_202063C -_080922B0: .4byte nullsub_8 +_080922AC: .4byte gSprites +_080922B0: .4byte SpriteCallbackDummy _080922B4: movs r0, 0 _080922B6: @@ -18446,7 +18446,7 @@ sub_8094AD8: @ 8094AD8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08094BCC @ =gUnknown_202063C + ldr r0, _08094BCC @ =gSprites adds r1, r0 str r1, [r3] ldr r0, _08094BD0 @ =gUnknown_2039825 @@ -18492,7 +18492,7 @@ _08094BBC: .4byte 0x00000cd5 _08094BC0: .4byte gUnknown_2039820 _08094BC4: .4byte gUnknown_2039821 _08094BC8: .4byte gUnknown_83D350C -_08094BCC: .4byte gUnknown_202063C +_08094BCC: .4byte gSprites _08094BD0: .4byte gUnknown_2039825 _08094BD4: .4byte gUnknown_2039822 _08094BD8: @@ -18533,7 +18533,7 @@ _08094C00: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08094C60 @ =gUnknown_202063C + ldr r0, _08094C60 @ =gSprites adds r1, r0 str r1, [r2] lsls r3, r4, 2 @@ -18563,7 +18563,7 @@ _08094C00: _08094C54: .4byte gUnknown_83D3524 _08094C58: .4byte gUnknown_20397B0 _08094C5C: .4byte 0x00000cb4 -_08094C60: .4byte gUnknown_202063C +_08094C60: .4byte gSprites _08094C64: .4byte gUnknown_2039820 _08094C68: ldr r0, _08094C7C @ =gUnknown_20397B0 @@ -20660,7 +20660,7 @@ _08095B9C: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08095C7C @ =gUnknown_202063C + ldr r0, _08095C7C @ =gSprites adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -20703,7 +20703,7 @@ _08095C6C: .4byte 0x06010000 _08095C70: .4byte 0xffffdacb _08095C74: .4byte 0x000021fc _08095C78: .4byte 0x000021f4 -_08095C7C: .4byte gUnknown_202063C +_08095C7C: .4byte gSprites _08095C80: .4byte 0x00002224 thumb_func_end sub_8095B5C @@ -21294,7 +21294,7 @@ _0809611A: cmp r0, 0x8 beq _08096144 ldr r1, [r2, 0x1C] - ldr r0, _08096150 @ =nullsub_8 + ldr r0, _08096150 @ =SpriteCallbackDummy cmp r1, r0 beq _08096158 ldr r0, _08096154 @ =sub_80969BC @@ -21306,7 +21306,7 @@ _08096144: .align 2, 0 _08096148: .4byte gUnknown_20397B0 _0809614C: .4byte 0x000021f4 -_08096150: .4byte nullsub_8 +_08096150: .4byte SpriteCallbackDummy _08096154: .4byte sub_80969BC _08096158: adds r4, 0x10 @@ -22360,14 +22360,14 @@ sub_809692C: @ 809692C lsrs r0, 24 movs r1, 0 bl sub_8096624 - ldr r0, _08096954 @ =nullsub_8 + ldr r0, _08096954 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _0809694C: pop {r4} pop {r0} bx r0 .align 2, 0 -_08096954: .4byte nullsub_8 +_08096954: .4byte SpriteCallbackDummy thumb_func_end sub_809692C thumb_func_start sub_8096958 @@ -22518,14 +22518,14 @@ _08096A22: lsls r2, 24 lsrs r2, 24 bl sub_80962F0 - ldr r0, _08096A70 @ =nullsub_8 + ldr r0, _08096A70 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _08096A6A: pop {r4} pop {r0} bx r0 .align 2, 0 -_08096A70: .4byte nullsub_8 +_08096A70: .4byte SpriteCallbackDummy thumb_func_end sub_80969F4 thumb_func_start sub_8096A74 @@ -22678,7 +22678,7 @@ _08096B3E: lsls r2, 24 lsrs r2, 24 bl sub_80962F0 - ldr r0, _08096BA8 @ =nullsub_8 + ldr r0, _08096BA8 @ =SpriteCallbackDummy str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] @@ -22688,7 +22688,7 @@ _08096B9E: bx r0 .align 2, 0 _08096BA4: .4byte gUnknown_825E074 -_08096BA8: .4byte nullsub_8 +_08096BA8: .4byte SpriteCallbackDummy thumb_func_end sub_8096B10 thumb_func_start sub_8096BAC @@ -22707,7 +22707,7 @@ sub_8096BAC: @ 8096BAC negs r1, r1 cmp r0, r1 bge _08096BDC - ldr r0, _08096BE0 @ =nullsub_8 + ldr r0, _08096BE0 @ =SpriteCallbackDummy str r0, [r2, 0x1C] adds r0, r2, 0 bl sub_80962A8 @@ -22719,7 +22719,7 @@ _08096BDC: pop {r0} bx r0 .align 2, 0 -_08096BE0: .4byte nullsub_8 +_08096BE0: .4byte SpriteCallbackDummy thumb_func_end sub_8096BAC thumb_func_start sub_8096BE4 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index c4ac6757e..cb450cd94 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -10315,7 +10315,7 @@ _08139A40: lsls r0, r5, 4 adds r0, r5 lsls r0, 2 - ldr r1, _08139A74 @ =gUnknown_202063C + ldr r1, _08139A74 @ =gSprites adds r4, r0, r1 adds r0, r4, 0 bl FreeSpriteOamMatrix @@ -10333,7 +10333,7 @@ _08139A40: b _08139A86 .align 2, 0 _08139A70: .4byte 0x0000ffff -_08139A74: .4byte gUnknown_202063C +_08139A74: .4byte gSprites _08139A78: adds r2, r4, 0 adds r2, 0x3F @@ -10419,7 +10419,7 @@ _08139B14: ldr r0, [r0] strb r6, [r0, 0x8] _08139B1E: - ldr r0, _08139B34 @ =gUnknown_202063C + ldr r0, _08139B34 @ =gSprites mov r2, r8 lsls r1, r2, 4 add r1, r8 @@ -10430,7 +10430,7 @@ _08139B1E: b _08139C28 .align 2, 0 _08139B30: .4byte gUnknown_203B170 -_08139B34: .4byte gUnknown_202063C +_08139B34: .4byte gSprites _08139B38: .4byte sub_8139868 _08139B3C: ldr r3, _08139B60 @ =0x0000326c @@ -10442,7 +10442,7 @@ _08139B3C: beq _08139B6C cmp r0, 0x7 beq _08139C2A - ldr r0, _08139B64 @ =gUnknown_202063C + ldr r0, _08139B64 @ =gSprites mov r2, r8 lsls r1, r2, 4 add r1, r8 @@ -10453,7 +10453,7 @@ _08139B3C: b _08139C28 .align 2, 0 _08139B60: .4byte 0x0000326c -_08139B64: .4byte gUnknown_202063C +_08139B64: .4byte gSprites _08139B68: .4byte nullsub_96 _08139B6C: ldr r0, [r7] @@ -10531,7 +10531,7 @@ _08139C10: movs r0, 0 _08139C16: strb r0, [r1, 0x8] - ldr r0, _08139C3C @ =gUnknown_202063C + ldr r0, _08139C3C @ =gSprites mov r3, r8 lsls r1, r3, 4 add r1, r8 @@ -10550,7 +10550,7 @@ _08139C2A: bx r0 .align 2, 0 _08139C38: .4byte gUnknown_203B170 -_08139C3C: .4byte gUnknown_202063C +_08139C3C: .4byte gSprites _08139C40: .4byte sub_8139768 thumb_func_end sub_8139AAC @@ -10558,7 +10558,7 @@ _08139C40: .4byte sub_8139768 sub_8139C44: @ 8139C44 lsls r0, 24 lsrs r0, 24 - ldr r3, _08139C74 @ =gUnknown_202063C + ldr r3, _08139C74 @ =gSprites ldr r1, _08139C78 @ =gUnknown_203B140 ldr r1, [r1] ldr r2, _08139C7C @ =0x00003010 @@ -10580,7 +10580,7 @@ sub_8139C44: @ 8139C44 strb r1, [r2] bx lr .align 2, 0 -_08139C74: .4byte gUnknown_202063C +_08139C74: .4byte gSprites _08139C78: .4byte gUnknown_203B140 _08139C7C: .4byte 0x00003010 thumb_func_end sub_8139C44 @@ -10651,7 +10651,7 @@ _08139CDA: ldr r3, _08139D48 @ =0x0000300c adds r1, r3 strb r0, [r1] - ldr r4, _08139D4C @ =gUnknown_202063C + ldr r4, _08139D4C @ =gSprites ldr r2, [r2] adds r2, r3 ldrb r1, [r2] @@ -10661,7 +10661,7 @@ _08139CDA: adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08139D50 @ =nullsub_8 + ldr r1, _08139D50 @ =SpriteCallbackDummy str r1, [r0] ldrb r0, [r2] lsls r1, r0, 4 @@ -10682,15 +10682,15 @@ _08139CDA: _08139D40: .4byte gUnknown_82606F4 _08139D44: .4byte gUnknown_203B140 _08139D48: .4byte 0x0000300c -_08139D4C: .4byte gUnknown_202063C -_08139D50: .4byte nullsub_8 +_08139D4C: .4byte gSprites +_08139D50: .4byte SpriteCallbackDummy thumb_func_end sub_8139CB0 thumb_func_start sub_8139D54 sub_8139D54: @ 8139D54 lsls r0, 24 lsrs r0, 24 - ldr r3, _08139D84 @ =gUnknown_202063C + ldr r3, _08139D84 @ =gSprites ldr r1, _08139D88 @ =gUnknown_203B140 ldr r1, [r1] ldr r2, _08139D8C @ =0x0000300c @@ -10712,7 +10712,7 @@ sub_8139D54: @ 8139D54 strb r1, [r2] bx lr .align 2, 0 -_08139D84: .4byte gUnknown_202063C +_08139D84: .4byte gSprites _08139D88: .4byte gUnknown_203B140 _08139D8C: .4byte 0x0000300c thumb_func_end sub_8139D54 @@ -10728,7 +10728,7 @@ sub_8139D90: @ 8139D90 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08139DB8 @ =gUnknown_202063C + ldr r1, _08139DB8 @ =gSprites adds r0, r1 bl DestroySpriteAndFreeResources_ pop {r0} @@ -10736,7 +10736,7 @@ sub_8139D90: @ 8139D90 .align 2, 0 _08139DB0: .4byte gUnknown_203B140 _08139DB4: .4byte 0x0000300c -_08139DB8: .4byte gUnknown_202063C +_08139DB8: .4byte gSprites thumb_func_end sub_8139D90 thumb_func_start sub_8139DBC @@ -10770,7 +10770,7 @@ sub_8139DBC: @ 8139DBC ldr r0, [r0] cmp r0, 0x1 bne _08139E20 - ldr r1, _08139E1C @ =nullsub_8 + ldr r1, _08139E1C @ =SpriteCallbackDummy movs r0, 0 str r0, [sp] str r4, [sp, 0x4] @@ -10781,13 +10781,13 @@ _08139E0C: .4byte 0x00003290 _08139E10: .4byte 0x000032f8 _08139E14: .4byte sub_804CF14 _08139E18: .4byte 0x00003024 -_08139E1C: .4byte nullsub_8 +_08139E1C: .4byte SpriteCallbackDummy _08139E20: - ldr r1, _08139E28 @ =nullsub_8 + ldr r1, _08139E28 @ =SpriteCallbackDummy movs r0, 0 b _08139E52 .align 2, 0 -_08139E28: .4byte nullsub_8 +_08139E28: .4byte SpriteCallbackDummy _08139E2C: ldr r0, _08139E48 @ =gUnknown_203B16C ldrb r1, [r0] @@ -10797,16 +10797,16 @@ _08139E2C: lsrs r0, 24 cmp r0, 0 beq _08139E50 - ldr r1, _08139E4C @ =nullsub_8 + ldr r1, _08139E4C @ =SpriteCallbackDummy movs r0, 0 str r0, [sp] str r4, [sp, 0x4] b _08139E58 .align 2, 0 _08139E48: .4byte gUnknown_203B16C -_08139E4C: .4byte nullsub_8 +_08139E4C: .4byte SpriteCallbackDummy _08139E50: - ldr r1, _08139E98 @ =nullsub_8 + ldr r1, _08139E98 @ =SpriteCallbackDummy _08139E52: str r0, [sp] str r4, [sp, 0x4] @@ -10826,7 +10826,7 @@ _08139E58: lsls r0, 24 cmp r0, 0 bne _08139EA8 - ldr r2, _08139EA0 @ =gUnknown_202063C + ldr r2, _08139EA0 @ =gSprites ldr r0, _08139EA4 @ =gUnknown_203B140 ldr r0, [r0] ldr r1, _08139E9C @ =0x00003014 @@ -10842,12 +10842,12 @@ _08139E58: orrs r1, r2 b _08139EC6 .align 2, 0 -_08139E98: .4byte nullsub_8 +_08139E98: .4byte SpriteCallbackDummy _08139E9C: .4byte 0x00003014 -_08139EA0: .4byte gUnknown_202063C +_08139EA0: .4byte gSprites _08139EA4: .4byte gUnknown_203B140 _08139EA8: - ldr r2, _08139ED8 @ =gUnknown_202063C + ldr r2, _08139ED8 @ =gSprites ldr r0, _08139EDC @ =gUnknown_203B140 ldr r0, [r0] ldr r1, _08139EE0 @ =0x00003014 @@ -10871,7 +10871,7 @@ _08139EC6: pop {r0} bx r0 .align 2, 0 -_08139ED8: .4byte gUnknown_202063C +_08139ED8: .4byte gSprites _08139EDC: .4byte gUnknown_203B140 _08139EE0: .4byte 0x00003014 thumb_func_end sub_8139DBC @@ -10880,7 +10880,7 @@ _08139EE0: .4byte 0x00003014 sub_8139EE4: @ 8139EE4 lsls r0, 24 lsrs r0, 24 - ldr r3, _08139F14 @ =gUnknown_202063C + ldr r3, _08139F14 @ =gSprites ldr r1, _08139F18 @ =gUnknown_203B140 ldr r1, [r1] ldr r2, _08139F1C @ =0x00003014 @@ -10902,7 +10902,7 @@ sub_8139EE4: @ 8139EE4 strb r1, [r2] bx lr .align 2, 0 -_08139F14: .4byte gUnknown_202063C +_08139F14: .4byte gSprites _08139F18: .4byte gUnknown_203B140 _08139F1C: .4byte 0x00003014 thumb_func_end sub_8139EE4 @@ -10926,7 +10926,7 @@ sub_8139F20: @ 8139F20 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08139F60 @ =gUnknown_202063C + ldr r1, _08139F60 @ =gSprites adds r0, r1 bl sub_8097070 pop {r4} @@ -10936,7 +10936,7 @@ sub_8139F20: @ 8139F20 _08139F54: .4byte gUnknown_203B140 _08139F58: .4byte 0x00003290 _08139F5C: .4byte 0x00003014 -_08139F60: .4byte gUnknown_202063C +_08139F60: .4byte gSprites thumb_func_end sub_8139F20 thumb_func_start sub_8139F64 @@ -11021,7 +11021,7 @@ _08139FCC: str r0, [sp, 0x8] mov r0, r10 str r0, [sp, 0xC] - ldr r0, _0813A0D8 @ =gUnknown_8231CFC + ldr r0, _0813A0D8 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x10] ldr r0, _0813A0DC @ =sub_813A124 str r0, [sp, 0x14] @@ -11052,7 +11052,7 @@ _08139FCC: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0813A0E4 @ =gUnknown_202063C + ldr r0, _0813A0E4 @ =gSprites adds r1, r0 str r1, [r2] strh r7, [r2, 0x4] @@ -11109,10 +11109,10 @@ _0813A0C8: .4byte gUnknown_8463720 _0813A0CC: .4byte 0xffff0000 _0813A0D0: .4byte gUnknown_846398C _0813A0D4: .4byte gUnknown_84639A4 -_0813A0D8: .4byte gUnknown_8231CFC +_0813A0D8: .4byte gDummySpriteAffineAnimTable _0813A0DC: .4byte sub_813A124 _0813A0E0: .4byte gUnknown_203B16D -_0813A0E4: .4byte gUnknown_202063C +_0813A0E4: .4byte gSprites thumb_func_end sub_8139F64 thumb_func_start sub_813A0E8 @@ -11364,9 +11364,9 @@ sub_813A254: @ 813A254 ldr r1, _0813A324 @ =gUnknown_84639F4 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _0813A328 @ =gUnknown_8231CFC + ldr r1, _0813A328 @ =gDummySpriteAffineAnimTable str r1, [sp, 0x10] - ldr r1, _0813A32C @ =nullsub_8 + ldr r1, _0813A32C @ =SpriteCallbackDummy str r1, [sp, 0x14] bl LoadSpriteSheet adds r0, r4, 0 @@ -11383,7 +11383,7 @@ sub_813A254: @ 813A254 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0813A330 @ =gUnknown_202063C + ldr r0, _0813A330 @ =gSprites adds r1, r0 str r1, [r2] strh r7, [r2, 0x4] @@ -11410,9 +11410,9 @@ _0813A318: .4byte gUnknown_8E9BF28 _0813A31C: .4byte 0xffff0000 _0813A320: .4byte gUnknown_84639AC _0813A324: .4byte gUnknown_84639F4 -_0813A328: .4byte gUnknown_8231CFC -_0813A32C: .4byte nullsub_8 -_0813A330: .4byte gUnknown_202063C +_0813A328: .4byte gDummySpriteAffineAnimTable +_0813A32C: .4byte SpriteCallbackDummy +_0813A330: .4byte gSprites thumb_func_end sub_813A254 thumb_func_start sub_813A334 @@ -11696,9 +11696,9 @@ _0813A54C: str r0, [sp, 0x8] mov r2, r8 str r2, [sp, 0xC] - ldr r0, _0813A614 @ =gUnknown_8231CFC + ldr r0, _0813A614 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x10] - ldr r0, _0813A618 @ =nullsub_8 + ldr r0, _0813A618 @ =SpriteCallbackDummy str r0, [sp, 0x14] ldr r1, [r5] lsls r0, r4, 1 @@ -11721,7 +11721,7 @@ _0813A54C: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0813A61C @ =gUnknown_202063C + ldr r0, _0813A61C @ =gSprites adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -11777,9 +11777,9 @@ _0813A604: .4byte 0xffff0000 _0813A608: .4byte gUnknown_203B15C _0813A60C: .4byte gUnknown_8463A14 _0813A610: .4byte gUnknown_8463A7C -_0813A614: .4byte gUnknown_8231CFC -_0813A618: .4byte nullsub_8 -_0813A61C: .4byte gUnknown_202063C +_0813A614: .4byte gDummySpriteAffineAnimTable +_0813A618: .4byte SpriteCallbackDummy +_0813A61C: .4byte gSprites thumb_func_end sub_813A45C thumb_func_start sub_813A620 @@ -12153,9 +12153,9 @@ _0813A8D4: str r0, [sp, 0x8] mov r3, r9 str r3, [sp, 0xC] - ldr r0, _0813A988 @ =gUnknown_8231CFC + ldr r0, _0813A988 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x10] - ldr r0, _0813A98C @ =nullsub_8 + ldr r0, _0813A98C @ =SpriteCallbackDummy str r0, [sp, 0x14] mov r0, r8 ldr r1, [r0] @@ -12180,7 +12180,7 @@ _0813A8D4: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0813A990 @ =gUnknown_202063C + ldr r0, _0813A990 @ =gSprites adds r1, r0 str r1, [r2] ldrb r2, [r1, 0x5] @@ -12225,9 +12225,9 @@ _0813A978: .4byte gUnknown_8E9B578 _0813A97C: .4byte 0xffff0000 _0813A980: .4byte gUnknown_8463A14 _0813A984: .4byte gUnknown_8463A7C -_0813A988: .4byte gUnknown_8231CFC -_0813A98C: .4byte nullsub_8 -_0813A990: .4byte gUnknown_202063C +_0813A988: .4byte gDummySpriteAffineAnimTable +_0813A98C: .4byte SpriteCallbackDummy +_0813A990: .4byte gSprites thumb_func_end sub_813A874 thumb_func_start sub_813A994 @@ -12557,9 +12557,9 @@ sub_813ABAC: @ 813ABAC ldr r1, _0813AC7C @ =gUnknown_8463AFC str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _0813AC80 @ =gUnknown_8231CFC + ldr r1, _0813AC80 @ =gDummySpriteAffineAnimTable str r1, [sp, 0x10] - ldr r1, _0813AC84 @ =nullsub_8 + ldr r1, _0813AC84 @ =SpriteCallbackDummy str r1, [sp, 0x14] bl LoadSpriteSheet adds r0, r4, 0 @@ -12576,7 +12576,7 @@ sub_813ABAC: @ 813ABAC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0813AC88 @ =gUnknown_202063C + ldr r0, _0813AC88 @ =gSprites adds r1, r0 str r1, [r2] strh r7, [r2, 0x4] @@ -12603,9 +12603,9 @@ _0813AC70: .4byte gUnknown_8463B00 _0813AC74: .4byte 0xffff0000 _0813AC78: .4byte gUnknown_8463AEC _0813AC7C: .4byte gUnknown_8463AFC -_0813AC80: .4byte gUnknown_8231CFC -_0813AC84: .4byte nullsub_8 -_0813AC88: .4byte gUnknown_202063C +_0813AC80: .4byte gDummySpriteAffineAnimTable +_0813AC84: .4byte SpriteCallbackDummy +_0813AC88: .4byte gSprites thumb_func_end sub_813ABAC thumb_func_start sub_813AC8C @@ -12805,9 +12805,9 @@ sub_813ADA8: @ 813ADA8 ldr r1, _0813AE78 @ =gUnknown_8463B40 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _0813AE7C @ =gUnknown_8231CFC + ldr r1, _0813AE7C @ =gDummySpriteAffineAnimTable str r1, [sp, 0x10] - ldr r1, _0813AE80 @ =nullsub_8 + ldr r1, _0813AE80 @ =SpriteCallbackDummy str r1, [sp, 0x14] bl LoadSpriteSheet adds r0, r4, 0 @@ -12824,7 +12824,7 @@ sub_813ADA8: @ 813ADA8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0813AE84 @ =gUnknown_202063C + ldr r0, _0813AE84 @ =gSprites adds r1, r0 str r1, [r2] strh r7, [r2, 0x4] @@ -12851,9 +12851,9 @@ _0813AE6C: .4byte gUnknown_8463B44 _0813AE70: .4byte 0xffff0000 _0813AE74: .4byte gUnknown_8463B30 _0813AE78: .4byte gUnknown_8463B40 -_0813AE7C: .4byte gUnknown_8231CFC -_0813AE80: .4byte nullsub_8 -_0813AE84: .4byte gUnknown_202063C +_0813AE7C: .4byte gDummySpriteAffineAnimTable +_0813AE80: .4byte SpriteCallbackDummy +_0813AE84: .4byte gSprites thumb_func_end sub_813ADA8 thumb_func_start sub_813AE88 diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s index c2d271f97..85e29c548 100644 --- a/asm/quest_log_8150454.s +++ b/asm/quest_log_8150454.s @@ -135,7 +135,7 @@ sub_8150530: @ 8150530 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08150584 @ =gUnknown_202063C + ldr r1, _08150584 @ =gSprites adds r5, r0, r1 ldr r0, _08150588 @ =gUnknown_3005E88 ldrb r0, [r0] @@ -163,7 +163,7 @@ _08150558: .align 2, 0 _0815057C: .4byte gUnknown_2037078 _08150580: .4byte gUnknown_2036E38 -_08150584: .4byte gUnknown_202063C +_08150584: .4byte gSprites _08150588: .4byte gUnknown_3005E88 _0815058C: .4byte sub_81505C4 _08150590: .4byte gUnknown_3005090 @@ -211,7 +211,7 @@ sub_81505C4: @ 81505C4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08150614 @ =gUnknown_202063C + ldr r1, _08150614 @ =gSprites adds r7, r0, r1 ldr r1, _08150618 @ =gUnknown_3005090 mov r2, r8 @@ -231,7 +231,7 @@ sub_81505C4: @ 81505C4 .align 2, 0 _0815060C: .4byte gUnknown_2037078 _08150610: .4byte gUnknown_2036E38 -_08150614: .4byte gUnknown_202063C +_08150614: .4byte gSprites _08150618: .4byte gUnknown_3005090 _0815061C: cmp r6, 0x2 diff --git a/asm/region_map.s b/asm/region_map.s index f21b27bbe..6af9eec81 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -3120,7 +3120,7 @@ sub_80C176C: @ 80C176C ldr r1, _080C185C @ =gUnknown_83F1B38 str r1, [sp, 0x8] str r4, [sp, 0xC] - ldr r1, _080C1860 @ =gUnknown_8231CFC + ldr r1, _080C1860 @ =gDummySpriteAffineAnimTable str r1, [sp, 0x10] ldr r1, _080C1864 @ =sub_80C16B8 str r1, [sp, 0x14] @@ -3164,7 +3164,7 @@ sub_80C176C: @ 80C176C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C187C @ =gUnknown_202063C + ldr r0, _080C187C @ =gSprites adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -3187,14 +3187,14 @@ _080C1850: .4byte gUnknown_83EF384 _080C1854: .4byte 0xffff0000 _080C1858: .4byte gUnknown_83F1B24 _080C185C: .4byte gUnknown_83F1B38 -_080C1860: .4byte gUnknown_8231CFC +_080C1860: .4byte gDummySpriteAffineAnimTable _080C1864: .4byte sub_80C16B8 _080C1868: .4byte 0x000018b4 _080C186C: .4byte 0x000018b6 _080C1870: .4byte 0x00001cce _080C1874: .4byte 0x00001cca _080C1878: .4byte 0x000018b0 -_080C187C: .4byte gUnknown_202063C +_080C187C: .4byte gSprites thumb_func_end sub_80C176C thumb_func_start sub_80C1880 @@ -4291,7 +4291,7 @@ sub_80C210C: @ 80C210C ldr r3, _080C21F0 @ =gUnknown_83F1C30 str r3, [sp, 0x8] str r4, [sp, 0xC] - ldr r3, _080C21F4 @ =gUnknown_8231CFC + ldr r3, _080C21F4 @ =gDummySpriteAffineAnimTable str r3, [sp, 0x10] ldr r3, _080C21F8 @ =nullsub_63 str r3, [sp, 0x14] @@ -4332,7 +4332,7 @@ sub_80C210C: @ 80C210C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C2204 @ =gUnknown_202063C + ldr r0, _080C2204 @ =gSprites adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -4354,11 +4354,11 @@ _080C21E4: .4byte gUnknown_83EF3A4 _080C21E8: .4byte 0xffff0000 _080C21EC: .4byte gUnknown_83F1C20 _080C21F0: .4byte gUnknown_83F1C30 -_080C21F4: .4byte gUnknown_8231CFC +_080C21F4: .4byte gDummySpriteAffineAnimTable _080C21F8: .4byte nullsub_63 _080C21FC: .4byte 0x0000040a _080C2200: .4byte 0x00000404 -_080C2204: .4byte gUnknown_202063C +_080C2204: .4byte gSprites thumb_func_end sub_80C210C thumb_func_start sub_80C2208 @@ -6180,7 +6180,7 @@ sub_80C309C: @ 80C309C ldr r0, _080C3144 @ =gUnknown_83F1C50 str r0, [sp, 0x20] str r3, [sp, 0x24] - ldr r0, _080C3148 @ =gUnknown_8231CFC + ldr r0, _080C3148 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x28] ldr r0, _080C314C @ =sub_80C2FC0 str r0, [sp, 0x2C] @@ -6205,7 +6205,7 @@ sub_80C309C: @ 80C309C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C3150 @ =gUnknown_202063C + ldr r0, _080C3150 @ =gSprites adds r1, r0 str r1, [r2, 0x1C] movs r0, 0x1 @@ -6220,9 +6220,9 @@ _080C3138: .4byte gUnknown_83EF25C _080C313C: .4byte 0xffff0000 _080C3140: .4byte gUnknown_83F1C3C _080C3144: .4byte gUnknown_83F1C50 -_080C3148: .4byte gUnknown_8231CFC +_080C3148: .4byte gDummySpriteAffineAnimTable _080C314C: .4byte sub_80C2FC0 -_080C3150: .4byte gUnknown_202063C +_080C3150: .4byte gSprites thumb_func_end sub_80C309C thumb_func_start sub_80C3154 @@ -8274,9 +8274,9 @@ sub_80C4244: @ 80C4244 ldr r0, _080C430C @ =gUnknown_83F1C64 str r0, [sp, 0x20] str r3, [sp, 0x24] - ldr r0, _080C4310 @ =gUnknown_8231CFC + ldr r0, _080C4310 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x28] - ldr r0, _080C4314 @ =nullsub_8 + ldr r0, _080C4314 @ =SpriteCallbackDummy str r0, [sp, 0x2C] mov r0, sp movs r2, 0x18 @@ -8317,7 +8317,7 @@ _080C42AA: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C4320 @ =gUnknown_202063C + ldr r0, _080C4320 @ =gSprites adds r1, r0 str r1, [r2, 0x4] movs r0, 0x1 @@ -8332,11 +8332,11 @@ _080C4300: .4byte gUnknown_83EF27C _080C4304: .4byte 0xffff0000 _080C4308: .4byte gUnknown_83F1C54 _080C430C: .4byte gUnknown_83F1C64 -_080C4310: .4byte gUnknown_8231CFC -_080C4314: .4byte nullsub_8 +_080C4310: .4byte gDummySpriteAffineAnimTable +_080C4314: .4byte SpriteCallbackDummy _080C4318: .4byte gSaveBlock2Ptr _080C431C: .4byte gUnknown_83EF29C -_080C4320: .4byte gUnknown_202063C +_080C4320: .4byte gSprites thumb_func_end sub_80C4244 thumb_func_start sub_80C4324 @@ -8646,9 +8646,9 @@ sub_80C450C: @ 80C450C ldr r1, _080C4604 @ =gUnknown_83F1C94 str r1, [sp, 0x8] str r2, [sp, 0xC] - ldr r1, _080C4608 @ =gUnknown_8231CFC + ldr r1, _080C4608 @ =gDummySpriteAffineAnimTable str r1, [sp, 0x10] - ldr r1, _080C460C @ =nullsub_8 + ldr r1, _080C460C @ =SpriteCallbackDummy str r1, [sp, 0x14] bl LoadSpriteSheet mov r0, r8 @@ -8680,7 +8680,7 @@ sub_80C450C: @ 80C450C lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C4610 @ =gUnknown_202063C + ldr r0, _080C4610 @ =gSprites adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -8709,9 +8709,9 @@ _080C45F8: .4byte gUnknown_83EF2BC _080C45FC: .4byte 0xffff0000 _080C4600: .4byte gUnknown_83F1C68 _080C4604: .4byte gUnknown_83F1C94 -_080C4608: .4byte gUnknown_8231CFC -_080C460C: .4byte nullsub_8 -_080C4610: .4byte gUnknown_202063C +_080C4608: .4byte gDummySpriteAffineAnimTable +_080C460C: .4byte SpriteCallbackDummy +_080C4610: .4byte gSprites thumb_func_end sub_80C450C thumb_func_start sub_80C4614 @@ -8765,9 +8765,9 @@ sub_80C4614: @ 80C4614 ldr r1, _080C4740 @ =gUnknown_83F1C98 str r1, [sp, 0x8] str r7, [sp, 0xC] - ldr r1, _080C4744 @ =gUnknown_8231CFC + ldr r1, _080C4744 @ =gDummySpriteAffineAnimTable str r1, [sp, 0x10] - ldr r1, _080C4748 @ =nullsub_8 + ldr r1, _080C4748 @ =SpriteCallbackDummy str r1, [sp, 0x14] bl LoadSpriteSheet adds r0, r6, 0 @@ -8830,7 +8830,7 @@ _080C46C4: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _080C474C @ =gUnknown_202063C + ldr r0, _080C474C @ =gSprites adds r1, r0 str r1, [r2] adds r1, 0x3E @@ -8859,9 +8859,9 @@ _080C4734: .4byte gUnknown_83EF2BC _080C4738: .4byte 0xffff0000 _080C473C: .4byte gUnknown_83F1C70 _080C4740: .4byte gUnknown_83F1C98 -_080C4744: .4byte gUnknown_8231CFC -_080C4748: .4byte nullsub_8 -_080C474C: .4byte gUnknown_202063C +_080C4744: .4byte gDummySpriteAffineAnimTable +_080C4748: .4byte SpriteCallbackDummy +_080C474C: .4byte gSprites thumb_func_end sub_80C4614 thumb_func_start sub_80C4750 diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s index 5244f3cb0..ac2b2a64a 100644 --- a/asm/reshow_battle_screen.s +++ b/asm/reshow_battle_screen.s @@ -185,12 +185,12 @@ _08077900: b _08077A8A _08077906: bl FreeAllSpritePalettes - ldr r1, _08077914 @ =gUnknown_3003E58 + ldr r1, _08077914 @ =gReservedSpritePaletteCount movs r0, 0x4 strb r0, [r1] b _08077A8A .align 2, 0 -_08077914: .4byte gUnknown_3003E58 +_08077914: .4byte gReservedSpritePaletteCount _08077918: bl ClearSpritesHealthboxAnimData b _08077A8A @@ -681,7 +681,7 @@ _08077CD2: ldr r4, _08077D9C @ =gUnknown_2023D44 adds r4, r7, r4 strb r0, [r4] - ldr r5, _08077DA0 @ =gUnknown_202063C + ldr r5, _08077DA0 @ =gSprites ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -700,7 +700,7 @@ _08077CD2: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08077DA4 @ =nullsub_8 + ldr r1, _08077DA4 @ =SpriteCallbackDummy str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -736,8 +736,8 @@ _08077D90: .4byte gUnknown_2023BCE _08077D94: .4byte gUnknown_202402C _08077D98: .4byte gUnknown_20244DC _08077D9C: .4byte gUnknown_2023D44 -_08077DA0: .4byte gUnknown_202063C -_08077DA4: .4byte nullsub_8 +_08077DA0: .4byte gSprites +_08077DA4: .4byte SpriteCallbackDummy _08077DA8: .4byte gUnknown_2024024 _08077DAC: ldr r0, _08077E00 @ =gUnknown_2022B4C @@ -822,7 +822,7 @@ _08077E54: bl CreateSprite ldr r3, _08077E9C @ =gUnknown_2023D44 strb r0, [r3] - ldr r4, _08077EA0 @ =gUnknown_202063C + ldr r4, _08077EA0 @ =gSprites ldrb r0, [r3] lsls r1, r0, 4 adds r1, r0 @@ -839,7 +839,7 @@ _08077E54: adds r1, r4, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08077EA4 @ =nullsub_8 + ldr r1, _08077EA4 @ =SpriteCallbackDummy str r1, [r0] ldrb r1, [r3] lsls r0, r1, 4 @@ -852,8 +852,8 @@ _08077E54: _08077E94: .4byte gUnknown_20244DC _08077E98: .4byte gUnknown_8239F8C _08077E9C: .4byte gUnknown_2023D44 -_08077EA0: .4byte gUnknown_202063C -_08077EA4: .4byte nullsub_8 +_08077EA0: .4byte gSprites +_08077EA4: .4byte SpriteCallbackDummy _08077EA8: ldr r1, _08077FC4 @ =gUnknown_2023BCE lsls r0, r7, 1 @@ -907,7 +907,7 @@ _08077EA8: ldr r4, _08077FD0 @ =gUnknown_2023D44 adds r4, r7, r4 strb r0, [r4] - ldr r5, _08077FD4 @ =gUnknown_202063C + ldr r5, _08077FD4 @ =gSprites ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -926,7 +926,7 @@ _08077EA8: adds r1, r5, 0 adds r1, 0x1C adds r0, r1 - ldr r1, _08077FD8 @ =nullsub_8 + ldr r1, _08077FD8 @ =SpriteCallbackDummy str r1, [r0] ldrb r1, [r4] lsls r0, r1, 4 @@ -957,7 +957,7 @@ _08077EA8: ldrb r1, [r1] bl StartSpriteAnim _08077F84: - ldr r1, _08077FD4 @ =gUnknown_202063C + ldr r1, _08077FD4 @ =gSprites ldr r0, _08077FD0 @ =gUnknown_2023D44 adds r0, r7, r0 ldrb r0, [r0] @@ -994,8 +994,8 @@ _08077FC4: .4byte gUnknown_2023BCE _08077FC8: .4byte gUnknown_2024284 _08077FCC: .4byte gUnknown_20244DC _08077FD0: .4byte gUnknown_2023D44 -_08077FD4: .4byte gUnknown_202063C -_08077FD8: .4byte nullsub_8 +_08077FD4: .4byte gSprites +_08077FD8: .4byte SpriteCallbackDummy _08077FDC: .4byte gUnknown_2024024 _08077FE0: .4byte gUnknown_2024018 thumb_func_end sub_8077C38 diff --git a/asm/rom6.s b/asm/rom6.s index 1b0582ade..18eb03946 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -224,7 +224,7 @@ _080C993C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080C9994 @ =gUnknown_202063C + ldr r1, _080C9994 @ =gSprites adds r0, r1 ldrb r1, [r6, 0x8] bl StartSpriteAnim @@ -245,7 +245,7 @@ _080C9980: _080C9988: .4byte gUnknown_20386E0 _080C998C: .4byte gUnknown_2037078 _080C9990: .4byte gUnknown_2036E38 -_080C9994: .4byte gUnknown_202063C +_080C9994: .4byte gSprites _080C9998: .4byte gUnknown_3005090 _080C999C: .4byte sub_80C99A0 thumb_func_end sub_80C98FC diff --git a/asm/script_menu.s b/asm/script_menu.s index 531dff840..f0396389b 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -1219,7 +1219,7 @@ _0809D2BA: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809D2D8 @ =gUnknown_202063C + ldr r1, _0809D2D8 @ =gSprites adds r0, r1 ldrb r1, [r4, 0xC] bl sub_8083A5C @@ -1229,7 +1229,7 @@ _0809D2CE: strh r0, [r4, 0x8] b _0809D2E8 .align 2, 0 -_0809D2D8: .4byte gUnknown_202063C +_0809D2D8: .4byte gSprites _0809D2DC: ldrb r0, [r4, 0x12] bl sub_809D6B0 @@ -1309,14 +1309,14 @@ _0809D31C: mov r0, r8 strh r0, [r3, 0xA] strh r5, [r3, 0xC] - ldr r4, _0809D3B8 @ =gUnknown_202063C + ldr r4, _0809D3B8 @ =gSprites lsls r1, r5, 4 adds r1, r5 lsls r1, 2 adds r0, r4, 0 adds r0, 0x1C adds r0, r1, r0 - ldr r2, _0809D3BC @ =nullsub_8 + ldr r2, _0809D3BC @ =SpriteCallbackDummy str r2, [r0] adds r1, r4 ldrb r2, [r1, 0x5] @@ -1334,8 +1334,8 @@ _0809D31C: .align 2, 0 _0809D3B0: .4byte sub_809D288 _0809D3B4: .4byte gUnknown_3005090 -_0809D3B8: .4byte gUnknown_202063C -_0809D3BC: .4byte nullsub_8 +_0809D3B8: .4byte gSprites +_0809D3BC: .4byte SpriteCallbackDummy _0809D3C0: movs r0, 0 _0809D3C2: @@ -1428,7 +1428,7 @@ _0809D458: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809D47C @ =gUnknown_202063C + ldr r1, _0809D47C @ =gSprites adds r0, r1 ldrb r1, [r4, 0xC] bl sub_8083A5C @@ -1438,7 +1438,7 @@ _0809D458: bl DestroyTask b _0809D48C .align 2, 0 -_0809D47C: .4byte gUnknown_202063C +_0809D47C: .4byte gSprites _0809D480: ldrb r0, [r4, 0x12] bl sub_809D6B0 @@ -1483,7 +1483,7 @@ _0809D4C6: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809D4E8 @ =gUnknown_202063C + ldr r1, _0809D4E8 @ =gSprites adds r0, r1 bl DestroySprite ldr r0, _0809D4EC @ =0x00001b58 @@ -1494,7 +1494,7 @@ _0809D4DE: strh r0, [r4, 0x8] b _0809D4FC .align 2, 0 -_0809D4E8: .4byte gUnknown_202063C +_0809D4E8: .4byte gSprites _0809D4EC: .4byte 0x00001b58 _0809D4F0: ldrb r0, [r4, 0x12] @@ -1578,7 +1578,7 @@ _0809D572: adds r5, r0, 0 lsls r5, 24 lsrs r5, 24 - ldr r1, _0809D614 @ =gUnknown_202063C + ldr r1, _0809D614 @ =gSprites lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -1630,7 +1630,7 @@ _0809D604: .4byte gUnknown_83E0F80 _0809D608: .4byte gUnknown_83E0768 _0809D60C: .4byte gUnknown_20370C2 _0809D610: .4byte gUnknown_20370C4 -_0809D614: .4byte gUnknown_202063C +_0809D614: .4byte gSprites _0809D618: .4byte sub_809D494 _0809D61C: .4byte gUnknown_3005090 thumb_func_end sub_809D504 @@ -1754,7 +1754,7 @@ sub_809D6D4: @ 809D6D4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809D758 @ =gUnknown_202063C + ldr r1, _0809D758 @ =gSprites adds r0, r1 ldrb r1, [r2, 0x4] bl sub_8083A5C @@ -1779,7 +1779,7 @@ _0809D710: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0809D758 @ =gUnknown_202063C + ldr r1, _0809D758 @ =gSprites adds r0, r1 bl DestroySprite ldr r0, _0809D760 @ =0x00001b58 @@ -1791,7 +1791,7 @@ _0809D748: _0809D74C: .4byte gUnknown_81A7AE0 _0809D750: .4byte sub_809D288 _0809D754: .4byte gUnknown_3005098 -_0809D758: .4byte gUnknown_202063C +_0809D758: .4byte gSprites _0809D75C: .4byte sub_809D494 _0809D760: .4byte 0x00001b58 thumb_func_end sub_809D6D4 diff --git a/asm/seagallop.s b/asm/seagallop.s index 660f732d4..17ed641b8 100644 --- a/asm/seagallop.s +++ b/asm/seagallop.s @@ -635,7 +635,7 @@ sub_81473C4: @ 81473C4 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r2, _08147400 @ =gUnknown_202063C + ldr r2, _08147400 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -653,7 +653,7 @@ sub_81473C4: @ 81473C4 b _08147410 .align 2, 0 _081473FC: .4byte gUnknown_846AF60 -_08147400: .4byte gUnknown_202063C +_08147400: .4byte gSprites _08147404: movs r0, 0xF0 strh r0, [r4, 0x20] @@ -734,7 +734,7 @@ sub_814746C: @ 814746C lsls r0, r4, 4 adds r0, r4 lsls r0, 2 - ldr r1, _081474AC @ =gUnknown_202063C + ldr r1, _081474AC @ =gSprites adds r0, r1 movs r1, 0x1 bl StartSpriteAnim @@ -744,7 +744,7 @@ _081474A2: bx r0 .align 2, 0 _081474A8: .4byte gUnknown_846AFD0 -_081474AC: .4byte gUnknown_202063C +_081474AC: .4byte gSprites thumb_func_end sub_814746C thumb_func_start sub_81474B0 diff --git a/asm/shop.s b/asm/shop.s index 2b9738c94..d21b9bcbd 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -2016,14 +2016,14 @@ _0809BA56: movs r0, 0x2 str r0, [sp] adds r0, r4, 0 - ldr r1, _0809BAF4 @ =nullsub_8 + ldr r1, _0809BAF4 @ =SpriteCallbackDummy bl AddPseudoFieldObject lsls r0, 24 lsrs r0, 24 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 - ldr r0, _0809BAF8 @ =gUnknown_202063C + ldr r0, _0809BAF8 @ =gSprites adds r2, r0 mov r1, r9 adds r0, r5, r1 @@ -2047,8 +2047,8 @@ _0809BACE: _0809BAE8: .4byte gUnknown_20398B4 _0809BAEC: .4byte gUnknown_2036E38 _0809BAF0: .4byte 0xfff80000 -_0809BAF4: .4byte nullsub_8 -_0809BAF8: .4byte gUnknown_202063C +_0809BAF4: .4byte SpriteCallbackDummy +_0809BAF8: .4byte gSprites thumb_func_end sub_809BA40 thumb_func_start sub_809BAFC diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 30ee2d428..f0572862d 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -2812,7 +2812,7 @@ _08140CC6: lsls r5, r0, 4 adds r5, r0 lsls r5, 2 - ldr r0, _08140D6C @ =gUnknown_202063C + ldr r0, _08140D6C @ =gSprites adds r5, r0 adds r0, r5, 0 adds r1, r4, 0 @@ -2869,7 +2869,7 @@ _08140CC6: .align 2, 0 _08140D64: .4byte gUnknown_84657E4 _08140D68: .4byte gUnknown_8464926 -_08140D6C: .4byte gUnknown_202063C +_08140D6C: .4byte gSprites _08140D70: .4byte gUnknown_8465608 _08140D74: .4byte gUnknown_203F3A4 _08140D78: .4byte 0x07000006 @@ -3033,7 +3033,7 @@ sub_8140E9C: @ 8140E9C mov r10, r0 ldr r0, _08140F24 @ =gUnknown_203F3A4 mov r9, r0 - ldr r0, _08140F28 @ =gUnknown_202063C + ldr r0, _08140F28 @ =gSprites mov r8, r0 movs r7, 0x85 lsls r7, 16 @@ -3090,7 +3090,7 @@ _08140EBC: .align 2, 0 _08140F20: .4byte gUnknown_846587C _08140F24: .4byte gUnknown_203F3A4 -_08140F28: .4byte gUnknown_202063C +_08140F28: .4byte gSprites thumb_func_end sub_8140E9C thumb_func_start sub_8140F2C @@ -3183,7 +3183,7 @@ sub_8140FC4: @ 8140FC4 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r4, _0814101C @ =gUnknown_202063C + ldr r4, _0814101C @ =gSprites adds r0, r4 str r0, [r1, 0x68] adds r0, r6, 0 @@ -3210,7 +3210,7 @@ sub_8140FC4: @ 8140FC4 .align 2, 0 _08141014: .4byte gUnknown_84658D8 _08141018: .4byte gUnknown_203F3A4 -_0814101C: .4byte gUnknown_202063C +_0814101C: .4byte gSprites thumb_func_end sub_8140FC4 thumb_func_start sub_8141020 diff --git a/asm/smokescreen.s b/asm/smokescreen.s index 883dffa18..1768a5ea4 100644 --- a/asm/smokescreen.s +++ b/asm/smokescreen.s @@ -40,7 +40,7 @@ _0804A79E: lsls r5, r0, 4 add r5, r8 lsls r5, 2 - ldr r0, _0804A8B4 @ =gUnknown_202063C + ldr r0, _0804A8B4 @ =gSprites adds r5, r0 strh r4, [r5, 0x30] ldr r0, _0804A8B8 @ =gUnknown_82509F4 @@ -65,7 +65,7 @@ _0804A79E: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0804A8B4 @ =gUnknown_202063C + ldr r0, _0804A8B4 @ =gSprites adds r1, r0 mov r0, r8 strh r0, [r1, 0x2E] @@ -84,7 +84,7 @@ _0804A79E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0804A8B4 @ =gUnknown_202063C + ldr r0, _0804A8B4 @ =gSprites adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -106,7 +106,7 @@ _0804A79E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0804A8B4 @ =gUnknown_202063C + ldr r0, _0804A8B4 @ =gSprites adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -128,7 +128,7 @@ _0804A79E: lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0804A8B4 @ =gUnknown_202063C + ldr r0, _0804A8B4 @ =gSprites adds r4, r0 mov r0, r8 strh r0, [r4, 0x2E] @@ -153,7 +153,7 @@ _0804A8A4: .4byte gUnknown_825098C _0804A8A8: .4byte 0xffff0000 _0804A8AC: .4byte gUnknown_8250994 _0804A8B0: .4byte sub_804A8C0 -_0804A8B4: .4byte gUnknown_202063C +_0804A8B4: .4byte gSprites _0804A8B8: .4byte gUnknown_82509F4 _0804A8BC: .4byte 0xfff00000 thumb_func_end sub_804A76C @@ -183,14 +183,14 @@ sub_804A8C0: @ 804A8C0 _0804A8EC: .4byte gUnknown_825098C _0804A8F0: .4byte gUnknown_8250994 _0804A8F4: - ldr r0, _0804A900 @ =nullsub_8 + ldr r0, _0804A900 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _0804A8F8: pop {r4} pop {r0} bx r0 .align 2, 0 -_0804A900: .4byte nullsub_8 +_0804A900: .4byte SpriteCallbackDummy thumb_func_end sub_804A8C0 thumb_func_start sub_804A904 @@ -203,7 +203,7 @@ sub_804A904: @ 804A904 ands r0, r1 cmp r0, 0 beq _0804A92E - ldr r2, _0804A934 @ =gUnknown_202063C + ldr r2, _0804A934 @ =gSprites movs r0, 0x2E ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -219,7 +219,7 @@ _0804A92E: pop {r0} bx r0 .align 2, 0 -_0804A934: .4byte gUnknown_202063C +_0804A934: .4byte gSprites thumb_func_end sub_804A904 .align 2, 0 @ Don't pad with nop. diff --git a/asm/sprite.s b/asm/sprite.s deleted file mode 100644 index bfc58820c..000000000 --- a/asm/sprite.s +++ /dev/null @@ -1,4672 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start ResetSpriteData -ResetSpriteData: @ 8006B10 - push {r4,lr} - movs r0, 0 - movs r1, 0x80 - bl ResetOamRange - bl ResetAllSprites - bl ClearSpriteCopyRequests - bl ResetAffineAnimData - bl FreeSpriteTileRanges - ldr r1, _08006B4C @ =gUnknown_2021B44 - movs r0, 0x40 - strb r0, [r1] - ldr r0, _08006B50 @ =gUnknown_2021B46 - movs r4, 0 - strh r4, [r0] - movs r0, 0 - bl AllocSpriteTiles - ldr r0, _08006B54 @ =gUnknown_2021BC8 - strh r4, [r0] - ldr r0, _08006B58 @ =gUnknown_2021BCA - strh r4, [r0] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08006B4C: .4byte gUnknown_2021B44 -_08006B50: .4byte gUnknown_2021B46 -_08006B54: .4byte gUnknown_2021BC8 -_08006B58: .4byte gUnknown_2021BCA - thumb_func_end ResetSpriteData - - thumb_func_start AnimateSprites -AnimateSprites: @ 8006B5C - push {r4-r7,lr} - movs r6, 0 - movs r7, 0x1 -_08006B62: - lsls r0, r6, 4 - adds r0, r6 - lsls r0, 2 - ldr r1, _08006BA4 @ =gUnknown_202063C - adds r4, r0, r1 - adds r5, r4, 0 - adds r5, 0x3E - ldrb r1, [r5] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _08006B92 - ldr r1, [r4, 0x1C] - adds r0, r4, 0 - bl _call_via_r1 - ldrb r1, [r5] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _08006B92 - adds r0, r4, 0 - bl AnimateSprite -_08006B92: - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - cmp r6, 0x3F - bls _08006B62 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08006BA4: .4byte gUnknown_202063C - thumb_func_end AnimateSprites - - thumb_func_start BuildOamBuffer -BuildOamBuffer: @ 8006BA8 - push {r4,r5,lr} - bl UpdateOamCoords - bl BuildSpritePriorities - bl SortSprites - ldr r5, _08006BE8 @ =gMain - ldr r0, _08006BEC @ =0x00000439 - adds r5, r0 - ldrb r0, [r5] - lsls r4, r0, 31 - lsrs r4, 31 - movs r1, 0x1 - orrs r0, r1 - strb r0, [r5] - bl AddSpritesToOamBuffer - bl CopyMatricesToOamBuffer - movs r2, 0x1 - ldrb r1, [r5] - movs r0, 0x2 - negs r0, r0 - ands r0, r1 - orrs r4, r0 - strb r4, [r5] - ldr r0, _08006BF0 @ =gUnknown_2021840 - strb r2, [r0] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08006BE8: .4byte gMain -_08006BEC: .4byte 0x00000439 -_08006BF0: .4byte gUnknown_2021840 - thumb_func_end BuildOamBuffer - - thumb_func_start UpdateOamCoords -UpdateOamCoords: @ 8006BF4 - push {r4-r7,lr} - movs r4, 0 - ldr r7, _08006C60 @ =gUnknown_202063C - ldr r0, _08006C64 @ =0x000001ff - adds r5, r0, 0 - ldr r6, _08006C68 @ =0xfffffe00 -_08006C00: - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r3, r0, r7 - adds r0, r3, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x5 - ands r0, r1 - cmp r0, 0x1 - bne _08006CA6 - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08006C74 - movs r2, 0x20 - ldrsh r1, [r3, r2] - movs r2, 0x24 - ldrsh r0, [r3, r2] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r0 - ldr r0, _08006C6C @ =gUnknown_2021BC8 - movs r2, 0 - ldrsh r0, [r0, r2] - adds r1, r0 - ands r1, r5 - ldrh r2, [r3, 0x2] - adds r0, r6, 0 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x2] - ldrh r1, [r3, 0x26] - ldrh r0, [r3, 0x22] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x29 - ldrb r0, [r0] - ldr r2, _08006C70 @ =gUnknown_2021BCA - adds r0, r1 - ldrb r2, [r2] - adds r0, r2 - b _08006CA4 - .align 2, 0 -_08006C60: .4byte gUnknown_202063C -_08006C64: .4byte 0x000001ff -_08006C68: .4byte 0xfffffe00 -_08006C6C: .4byte gUnknown_2021BC8 -_08006C70: .4byte gUnknown_2021BCA -_08006C74: - movs r2, 0x20 - ldrsh r1, [r3, r2] - movs r2, 0x24 - ldrsh r0, [r3, r2] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x28 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - adds r1, r0 - ands r1, r5 - ldrh r2, [r3, 0x2] - adds r0, r6, 0 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x2] - ldrh r1, [r3, 0x26] - ldrh r0, [r3, 0x22] - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x29 - ldrb r0, [r0] - adds r0, r1 -_08006CA4: - strb r0, [r3] -_08006CA6: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3F - bls _08006C00 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end UpdateOamCoords - - thumb_func_start BuildSpritePriorities -BuildSpritePriorities: @ 8006CB8 - push {r4,lr} - movs r2, 0 - ldr r4, _08006CF0 @ =gUnknown_202063C - ldr r3, _08006CF4 @ =gUnknown_2021780 -_08006CC0: - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - adds r0, r4 - adds r1, r0, 0 - adds r1, 0x43 - ldrb r1, [r1] - ldrb r0, [r0, 0x5] - lsls r0, 28 - lsrs r0, 30 - lsls r0, 8 - orrs r1, r0 - lsls r0, r2, 1 - adds r0, r3 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x3F - bls _08006CC0 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08006CF0: .4byte gUnknown_202063C -_08006CF4: .4byte gUnknown_2021780 - thumb_func_end BuildSpritePriorities - - thumb_func_start SortSprites -SortSprites: @ 8006CF8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - movs r0, 0x1 - mov r12, r0 - ldr r1, _08006DC0 @ =gUnknown_2021800 - mov r10, r1 - ldr r3, _08006DC4 @ =0xffffff00 - mov r9, r3 - ldr r6, _08006DC8 @ =0xc0000300 - mov r8, r6 -_08006D14: - mov r5, r12 - mov r0, r12 - subs r0, 0x1 - add r0, r10 - ldrb r2, [r0] - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - ldr r7, _08006DCC @ =gUnknown_202063C - adds r3, r0, r7 - mov r0, r12 - add r0, r10 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r4, r0, r7 - lsls r2, 1 - ldr r0, _08006DD0 @ =gUnknown_2021780 - adds r2, r0 - ldrh r2, [r2] - str r2, [sp] - lsls r1, 1 - adds r1, r0 - ldrh r6, [r1] - ldrb r1, [r3] - ldrb r2, [r4] - adds r0, r1, 0 - cmp r0, 0x9F - ble _08006D56 - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_08006D56: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x9F - ble _08006D64 - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_08006D64: - ldr r0, [r3] - mov r7, r8 - ands r0, r7 - cmp r0, r8 - bne _08006D88 - ldrb r0, [r3, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _08006D7A - cmp r0, 0x2 - bne _08006D88 -_08006D7A: - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _08006D88 - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_08006D88: - ldr r0, [r4] - mov r3, r8 - ands r0, r3 - cmp r0, r8 - bne _08006DAC - ldrb r0, [r4, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _08006D9E - cmp r0, 0x2 - bne _08006DAC -_08006D9E: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _08006DAC - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_08006DAC: - movs r7, 0x1 - add r12, r7 - cmp r5, 0 - beq _08006E92 - ldr r0, [sp] - cmp r0, r6 - bhi _08006DD4 - cmp r0, r6 - bne _08006E92 - b _08006E8A - .align 2, 0 -_08006DC0: .4byte gUnknown_2021800 -_08006DC4: .4byte 0xffffff00 -_08006DC8: .4byte 0xc0000300 -_08006DCC: .4byte gUnknown_202063C -_08006DD0: .4byte gUnknown_2021780 -_08006DD4: - mov r1, r10 - adds r3, r5, r1 - ldrb r4, [r3] - subs r2, r5, 0x1 - adds r1, r2, r1 - ldrb r0, [r1] - strb r0, [r3] - strb r4, [r1] - lsls r2, 24 - lsrs r5, r2, 24 - subs r0, r5, 0x1 - add r0, r10 - ldrb r2, [r0] - lsls r0, r2, 4 - adds r0, r2 - lsls r0, 2 - ldr r6, _08006EB0 @ =gUnknown_202063C - adds r3, r0, r6 - mov r7, r10 - adds r0, r5, r7 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r4, r0, r6 - lsls r2, 1 - ldr r0, _08006EB4 @ =gUnknown_2021780 - adds r2, r0 - ldrh r2, [r2] - str r2, [sp] - lsls r1, 1 - adds r1, r0 - ldrh r6, [r1] - ldrb r1, [r3] - ldrb r2, [r4] - adds r0, r1, 0 - cmp r0, 0x9F - ble _08006E26 - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_08006E26: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x9F - ble _08006E34 - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_08006E34: - ldr r0, [r3] - mov r7, r8 - ands r0, r7 - cmp r0, r8 - bne _08006E58 - ldrb r0, [r3, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _08006E4A - cmp r0, 0x2 - bne _08006E58 -_08006E4A: - lsls r0, r1, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _08006E58 - add r0, r9 - lsls r0, 16 - lsrs r1, r0, 16 -_08006E58: - ldr r0, [r4] - mov r3, r8 - ands r0, r3 - cmp r0, r8 - bne _08006E7C - ldrb r0, [r4, 0x1] - lsrs r0, 6 - cmp r0, 0 - beq _08006E6E - cmp r0, 0x2 - bne _08006E7C -_08006E6E: - lsls r0, r2, 16 - asrs r0, 16 - cmp r0, 0x80 - ble _08006E7C - add r0, r9 - lsls r0, 16 - lsrs r2, r0, 16 -_08006E7C: - cmp r5, 0 - beq _08006E92 - ldr r7, [sp] - cmp r7, r6 - bhi _08006DD4 - cmp r7, r6 - bne _08006E92 -_08006E8A: - lsls r1, 16 - lsls r0, r2, 16 - cmp r1, r0 - blt _08006DD4 -_08006E92: - mov r1, r12 - lsls r0, r1, 24 - lsrs r0, 24 - mov r12, r0 - cmp r0, 0x3F - bhi _08006EA0 - b _08006D14 -_08006EA0: - 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 -_08006EB0: .4byte gUnknown_202063C -_08006EB4: .4byte gUnknown_2021780 - thumb_func_end SortSprites - - thumb_func_start CopyMatricesToOamBuffer -CopyMatricesToOamBuffer: @ 8006EB8 - push {r4-r6,lr} - movs r4, 0 - ldr r5, _08006EFC @ =gMain - ldr r6, _08006F00 @ =gUnknown_2021BCC -_08006EC0: - lsls r2, r4, 2 - lsls r1, r4, 5 - adds r1, r5 - lsls r3, r4, 3 - adds r3, r6 - ldrh r0, [r3] - strh r0, [r1, 0x3E] - adds r0, r2, 0x1 - lsls r0, 3 - adds r0, r5 - ldrh r1, [r3, 0x2] - strh r1, [r0, 0x3E] - adds r0, r2, 0x2 - lsls r0, 3 - adds r0, r5 - ldrh r1, [r3, 0x4] - strh r1, [r0, 0x3E] - adds r2, 0x3 - lsls r2, 3 - adds r2, r5 - ldrh r0, [r3, 0x6] - strh r0, [r2, 0x3E] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1F - bls _08006EC0 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08006EFC: .4byte gMain -_08006F00: .4byte gUnknown_2021BCC - thumb_func_end CopyMatricesToOamBuffer - - thumb_func_start AddSpritesToOamBuffer -AddSpritesToOamBuffer: @ 8006F04 - push {r4-r6,lr} - sub sp, 0x4 - movs r4, 0 - mov r0, sp - strb r4, [r0] -_08006F0E: - ldr r0, _08006F78 @ =gUnknown_2021800 - adds r0, r4, r0 - ldrb r1, [r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _08006F7C @ =gUnknown_202063C - adds r2, r0, r1 - adds r0, r2, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x5 - ands r0, r1 - cmp r0, 0x1 - bne _08006F3A - adds r0, r2, 0 - mov r1, sp - bl AddSpriteToOamBuffer - lsls r0, 24 - cmp r0, 0 - bne _08006F70 -_08006F3A: - adds r4, 0x1 - cmp r4, 0x3F - ble _08006F0E - mov r0, sp - ldr r4, _08006F80 @ =gUnknown_2021B44 - ldrb r0, [r0] - ldrb r1, [r4] - cmp r0, r1 - bcs _08006F70 - mov r1, sp - ldr r5, _08006F84 @ =gMain + 0x38 - ldr r0, _08006F88 @ =gUnknown_8231CE4 - ldr r2, [r0] - ldr r3, [r0, 0x4] -_08006F56: - ldrb r0, [r1] - lsls r0, 3 - adds r0, r5 - str r2, [r0] - str r3, [r0, 0x4] - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - ldrb r6, [r4] - cmp r0, r6 - bcc _08006F56 -_08006F70: - add sp, 0x4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08006F78: .4byte gUnknown_2021800 -_08006F7C: .4byte gUnknown_202063C -_08006F80: .4byte gUnknown_2021B44 -_08006F84: .4byte gMain + 0x38 -_08006F88: .4byte gUnknown_8231CE4 - thumb_func_end AddSpritesToOamBuffer - - thumb_func_start CreateSprite -CreateSprite: @ 8006F8C - push {r4-r7,lr} - sub sp, 0x4 - adds r7, r0, 0 - lsls r3, 24 - lsrs r4, r3, 24 - movs r3, 0 - ldr r0, _08006FC8 @ =gUnknown_202063C - mov r12, r0 - lsls r5, r1, 16 - lsls r6, r2, 16 -_08006FA0: - lsls r0, r3, 4 - adds r0, r3 - lsls r0, 2 - add r0, r12 - adds r0, 0x3E - ldrb r0, [r0] - lsls r0, 31 - cmp r0, 0 - bne _08006FCC - str r4, [sp] - adds r0, r3, 0 - adds r1, r7, 0 - asrs r2, r5, 16 - asrs r3, r6, 16 - bl CreateSpriteAt - lsls r0, 24 - lsrs r0, 24 - b _08006FD8 - .align 2, 0 -_08006FC8: .4byte gUnknown_202063C -_08006FCC: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3F - bls _08006FA0 - movs r0, 0x40 -_08006FD8: - add sp, 0x4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end CreateSprite - - thumb_func_start CreateSpriteAtEnd -CreateSpriteAtEnd: @ 8006FE0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - adds r7, r0, 0 - lsls r3, 24 - lsrs r6, r3, 24 - movs r3, 0x3F - ldr r0, _0800702C @ =gUnknown_202063C - mov r8, r0 - movs r0, 0x1 - negs r0, r0 - mov r12, r0 - lsls r4, r1, 16 - lsls r5, r2, 16 -_08006FFE: - lsls r0, r3, 16 - asrs r1, r0, 16 - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - adds r0, 0x3E - ldrb r0, [r0] - lsls r0, 31 - cmp r0, 0 - bne _08007030 - lsls r0, r3, 24 - lsrs r0, 24 - str r6, [sp] - adds r1, r7, 0 - asrs r2, r4, 16 - asrs r3, r5, 16 - bl CreateSpriteAt - lsls r0, 24 - lsrs r0, 24 - b _0800703E - .align 2, 0 -_0800702C: .4byte gUnknown_202063C -_08007030: - subs r0, r1, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - asrs r0, 16 - cmp r0, r12 - bgt _08006FFE - movs r0, 0x40 -_0800703E: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end CreateSpriteAtEnd - - thumb_func_start CreateInvisibleSprite -CreateInvisibleSprite: @ 800704C - push {r4-r6,lr} - adds r6, r0, 0 - ldr r0, _08007084 @ =gUnknown_8231D00 - movs r1, 0 - movs r2, 0 - movs r3, 0x1F - bl CreateSprite - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x40 - beq _0800708C - ldr r4, _08007088 @ =gUnknown_202063C - lsls r1, r5, 4 - adds r1, r5 - lsls r1, 2 - adds r2, r1, r4 - adds r2, 0x3E - ldrb r0, [r2] - movs r3, 0x4 - orrs r0, r3 - strb r0, [r2] - adds r4, 0x1C - adds r1, r4 - str r6, [r1] - adds r0, r5, 0 - b _0800708E - .align 2, 0 -_08007084: .4byte gUnknown_8231D00 -_08007088: .4byte gUnknown_202063C -_0800708C: - movs r0, 0x40 -_0800708E: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end CreateInvisibleSprite - - thumb_func_start CreateSpriteAt -CreateSpriteAt: @ 8007094 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - mov r8, r1 - adds r5, r2, 0 - adds r6, r3, 0 - ldr r4, [sp, 0x20] - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - lsls r5, 16 - lsrs r5, 16 - lsls r6, 16 - lsrs r6, 16 - lsls r4, 24 - lsrs r4, 24 - lsls r0, 4 - add r0, r10 - lsls r0, 2 - ldr r1, _08007158 @ =gUnknown_202063C - adds r7, r0, r1 - adds r0, r7, 0 - bl ResetSprite - adds r2, r7, 0 - adds r2, 0x3E - ldrb r0, [r2] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r2] - movs r0, 0x3F - adds r0, r7 - mov r9, r0 - ldrb r0, [r0] - movs r1, 0x4 - orrs r0, r1 - movs r1, 0x8 - orrs r0, r1 - movs r1, 0x40 - orrs r0, r1 - mov r1, r9 - strb r0, [r1] - adds r0, r7, 0 - adds r0, 0x43 - strb r4, [r0] - mov r1, r8 - ldr r0, [r1, 0x4] - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [r7] - str r1, [r7, 0x4] - mov r1, r8 - ldr r0, [r1, 0x8] - str r0, [r7, 0x8] - ldr r0, [r1, 0x10] - str r0, [r7, 0x10] - str r1, [r7, 0x14] - ldr r0, [r1, 0x14] - str r0, [r7, 0x1C] - strh r5, [r7, 0x20] - strh r6, [r7, 0x22] - ldrb r3, [r7, 0x1] - lsrs r1, r3, 6 - ldrb r2, [r7, 0x3] - lsrs r2, 6 - lsls r3, 30 - lsrs r3, 30 - adds r0, r7, 0 - bl CalcCenterToCornerVec - mov r0, r8 - ldrh r1, [r0] - ldr r4, _0800715C @ =0xffff0000 - lsrs r0, r4, 16 - cmp r1, r0 - bne _08007190 - mov r1, r8 - ldr r0, [r1, 0xC] - str r0, [r7, 0xC] - ldrh r0, [r0, 0x4] - lsrs r0, 5 - lsls r0, 24 - lsrs r0, 24 - bl AllocSpriteTiles - lsls r0, 16 - lsrs r2, r0, 16 - asrs r0, 16 - asrs r1, r4, 16 - cmp r0, r1 - bne _08007160 - adds r0, r7, 0 - bl ResetSprite - movs r0, 0x40 - b _080071D8 - .align 2, 0 -_08007158: .4byte gUnknown_202063C -_0800715C: .4byte 0xffff0000 -_08007160: - ldr r1, _08007188 @ =0x000003ff - adds r0, r1, 0 - ands r2, r0 - ldrh r1, [r7, 0x4] - ldr r0, _0800718C @ =0xfffffc00 - ands r0, r1 - orrs r0, r2 - strh r0, [r7, 0x4] - mov r0, r9 - ldrb r1, [r0] - movs r0, 0x41 - negs r0, r0 - ands r0, r1 - mov r1, r9 - strb r0, [r1] - adds r1, r7, 0 - adds r1, 0x40 - movs r0, 0 - strh r0, [r1] - b _080071A4 - .align 2, 0 -_08007188: .4byte 0x000003ff -_0800718C: .4byte 0xfffffc00 -_08007190: - mov r1, r8 - ldrh r0, [r1] - bl GetSpriteTileStartByTag - adds r1, r7, 0 - adds r1, 0x40 - strh r0, [r1] - adds r0, r7, 0 - bl SetSpriteSheetFrameTileNum -_080071A4: - ldrb r0, [r7, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080071B8 - adds r0, r7, 0 - bl InitSpriteAffineAnim -_080071B8: - mov r0, r8 - ldrh r1, [r0, 0x2] - ldr r0, _080071E8 @ =0x0000ffff - cmp r1, r0 - beq _080071D6 - mov r1, r8 - ldrh r0, [r1, 0x2] - bl IndexOfSpritePaletteTag - lsls r0, 4 - ldrb r2, [r7, 0x5] - movs r1, 0xF - ands r1, r2 - orrs r1, r0 - strb r1, [r7, 0x5] -_080071D6: - mov r0, r10 -_080071D8: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080071E8: .4byte 0x0000ffff - thumb_func_end CreateSpriteAt - - thumb_func_start CreateSpriteAndAnimate -CreateSpriteAndAnimate: @ 80071EC - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r10, r0 - lsls r3, 24 - lsrs r3, 24 - mov r9, r3 - movs r3, 0 - ldr r5, _0800725C @ =gUnknown_202063C - lsls r1, 16 - mov r12, r1 - lsls r2, 16 - mov r8, r2 -_0800720C: - lsls r0, r3, 4 - adds r0, r3 - lsls r6, r0, 2 - adds r4, r6, r5 - adds r7, r4, 0 - adds r7, 0x3E - ldrb r0, [r7] - lsls r0, 31 - cmp r0, 0 - bne _08007264 - mov r0, r9 - str r0, [sp] - adds r0, r3, 0 - mov r1, r10 - mov r3, r12 - asrs r2, r3, 16 - mov r5, r8 - asrs r3, r5, 16 - bl CreateSpriteAt - lsls r0, 24 - lsrs r0, 24 - adds r5, r0, 0 - cmp r5, 0x40 - beq _0800726E - ldr r1, _08007260 @ =gUnknown_2020658 - adds r0, r6, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - ldrb r0, [r7] - lsls r0, 31 - cmp r0, 0 - beq _08007258 - adds r0, r4, 0 - bl AnimateSprite -_08007258: - adds r0, r5, 0 - b _08007270 - .align 2, 0 -_0800725C: .4byte gUnknown_202063C -_08007260: .4byte gUnknown_2020658 -_08007264: - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, 0x3F - bls _0800720C -_0800726E: - movs r0, 0x40 -_08007270: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end CreateSpriteAndAnimate - - thumb_func_start DestroySprite -DestroySprite: @ 8007280 - push {r4-r7,lr} - adds r5, r0, 0 - adds r0, 0x3E - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080072DC - adds r0, r5, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _080072D6 - ldr r0, [r5, 0xC] - ldrh r2, [r0, 0x4] - lsrs r2, 5 - ldrh r0, [r5, 0x4] - lsls r0, 22 - lsrs r1, r0, 22 - adds r4, r1, r2 - adds r3, r1, 0 - cmp r3, r4 - bcs _080072D6 - ldr r0, _080072E4 @ =gUnknown_2021B48 - mov r12, r0 - movs r6, 0x7 - movs r7, 0x1 -_080072BA: - lsrs r2, r3, 3 - add r2, r12 - adds r0, r3, 0 - ands r0, r6 - adds r1, r7, 0 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - bcc _080072BA -_080072D6: - adds r0, r5, 0 - bl ResetSprite -_080072DC: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080072E4: .4byte gUnknown_2021B48 - thumb_func_end DestroySprite - - thumb_func_start ResetOamRange -ResetOamRange: @ 80072E8 - push {r4-r6,lr} - lsls r0, 24 - lsls r1, 24 - lsrs r4, r1, 24 - lsrs r3, r0, 24 - cmp r3, r4 - bcs _08007310 - ldr r6, _08007318 @ =gMain + 0x38 - ldr r5, _0800731C @ =gUnknown_8231CE4 -_080072FA: - lsls r0, r3, 3 - adds r0, r6 - ldr r1, [r5] - ldr r2, [r5, 0x4] - str r1, [r0] - str r2, [r0, 0x4] - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r4 - bcc _080072FA -_08007310: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08007318: .4byte gMain + 0x38 -_0800731C: .4byte gUnknown_8231CE4 - thumb_func_end ResetOamRange - - thumb_func_start LoadOam -LoadOam: @ 8007320 - push {lr} - ldr r2, _08007344 @ =gMain - ldr r1, _08007348 @ =0x00000439 - adds r0, r2, r1 - ldrb r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08007340 - adds r0, r2, 0 - adds r0, 0x38 - movs r1, 0xE0 - lsls r1, 19 - ldr r2, _0800734C @ =0x04000100 - bl CpuSet -_08007340: - pop {r0} - bx r0 - .align 2, 0 -_08007344: .4byte gMain -_08007348: .4byte 0x00000439 -_0800734C: .4byte 0x04000100 - thumb_func_end LoadOam - - thumb_func_start ClearSpriteCopyRequests -ClearSpriteCopyRequests: @ 8007350 - push {r4,r5,lr} - ldr r0, _08007384 @ =gUnknown_2021840 - movs r1, 0 - strb r1, [r0] - ldr r0, _08007388 @ =gUnknown_2021841 - strb r1, [r0] - movs r2, 0 - ldr r4, _0800738C @ =gUnknown_2021844 - movs r3, 0 - adds r5, r4, 0x4 -_08007364: - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r1, r0, r4 - str r3, [r1] - adds r0, r5 - str r3, [r0] - strh r3, [r1, 0x8] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _08007364 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08007384: .4byte gUnknown_2021840 -_08007388: .4byte gUnknown_2021841 -_0800738C: .4byte gUnknown_2021844 - thumb_func_end ClearSpriteCopyRequests - - thumb_func_start ResetOamMatrices -ResetOamMatrices: @ 8007390 - push {r4,lr} - movs r1, 0 - ldr r4, _080073B8 @ =gUnknown_2021BCC - movs r3, 0 - movs r2, 0x80 - lsls r2, 1 -_0800739C: - lsls r0, r1, 3 - adds r0, r4 - strh r2, [r0] - strh r3, [r0, 0x2] - strh r3, [r0, 0x4] - strh r2, [r0, 0x6] - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x1F - bls _0800739C - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080073B8: .4byte gUnknown_2021BCC - thumb_func_end ResetOamMatrices - - thumb_func_start SetOamMatrix -SetOamMatrix: @ 80073BC - push {r4,r5,lr} - ldr r5, [sp, 0xC] - lsls r0, 24 - ldr r4, _080073D8 @ =gUnknown_2021BCC - lsrs r0, 21 - adds r0, r4 - strh r1, [r0] - strh r2, [r0, 0x2] - strh r3, [r0, 0x4] - strh r5, [r0, 0x6] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080073D8: .4byte gUnknown_2021BCC - thumb_func_end SetOamMatrix - - thumb_func_start ResetSprite -ResetSprite: @ 80073DC - push {lr} - ldr r1, _080073EC @ =gUnknown_8231CA0 - movs r2, 0x44 - bl memcpy - pop {r0} - bx r0 - .align 2, 0 -_080073EC: .4byte gUnknown_8231CA0 - thumb_func_end ResetSprite - - thumb_func_start CalcCenterToCornerVec -CalcCenterToCornerVec: @ 80073F0 - push {r4-r6,lr} - adds r6, r0, 0 - lsls r1, 24 - lsls r2, 24 - lsls r3, 24 - lsrs r3, 24 - ldr r4, _08007430 @ =gUnknown_8231C85 - lsrs r2, 23 - lsrs r1, 21 - adds r2, r1 - adds r0, r2, r4 - ldrb r5, [r0] - adds r4, 0x1 - adds r2, r4 - ldrb r1, [r2] - movs r0, 0x2 - ands r3, r0 - cmp r3, 0 - beq _0800741E - lsls r0, r5, 25 - lsrs r5, r0, 24 - lsls r0, r1, 25 - lsrs r1, r0, 24 -_0800741E: - adds r0, r6, 0 - adds r0, 0x28 - strb r5, [r0] - adds r0, 0x1 - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08007430: .4byte gUnknown_8231C85 - thumb_func_end CalcCenterToCornerVec - - thumb_func_start AllocSpriteTiles -AllocSpriteTiles: @ 8007434 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - bne _0800748A - ldr r0, _08007478 @ =gUnknown_2021B46 - ldrh r3, [r0] - ldr r0, _0800747C @ =0x000003ff - cmp r3, r0 - bhi _08007472 - ldr r7, _08007480 @ =gUnknown_2021B48 - movs r6, 0x7 - adds r4, r0, 0 - movs r5, 0x1 -_08007456: - lsrs r2, r3, 3 - adds r2, r7 - adds r0, r3, 0 - ands r0, r6 - adds r1, r5, 0 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - bls _08007456 -_08007472: - movs r0, 0 - b _0800753C - .align 2, 0 -_08007478: .4byte gUnknown_2021B46 -_0800747C: .4byte 0x000003ff -_08007480: .4byte gUnknown_2021B48 -_08007484: - movs r0, 0x1 - negs r0, r0 - b _0800753C -_0800748A: - ldr r0, _08007548 @ =gUnknown_2021B46 - ldrh r3, [r0] - ldr r0, _0800754C @ =gUnknown_2021B48 - mov r9, r0 - movs r7, 0x7 - movs r6, 0x1 -_08007496: - lsrs r0, r3, 3 - add r0, r9 - ldrb r1, [r0] - adds r0, r3, 0 - ands r0, r7 - asrs r1, r0 - ands r1, r6 - cmp r1, 0 - beq _080074CA - movs r5, 0x80 - lsls r5, 3 - ldr r2, _0800754C @ =gUnknown_2021B48 -_080074AE: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r5 - beq _08007484 - lsrs r0, 19 - adds r0, r2 - ldrb r1, [r0] - adds r0, r3, 0 - ands r0, r7 - asrs r1, r0 - ands r1, r6 - cmp r1, 0 - bne _080074AE -_080074CA: - mov r8, r3 - movs r2, 0x1 - cmp r2, r4 - beq _08007504 - movs r1, 0x80 - lsls r1, 3 - mov r12, r1 - ldr r5, _0800754C @ =gUnknown_2021B48 -_080074DA: - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r12 - beq _08007484 - lsrs r0, 19 - adds r0, r5 - ldrb r1, [r0] - adds r0, r3, 0 - ands r0, r7 - asrs r1, r0 - ands r1, r6 - cmp r1, 0 - bne _08007500 - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, r4 - bne _080074DA -_08007500: - cmp r2, r4 - bne _08007496 -_08007504: - mov r1, r8 - lsls r0, r1, 16 - lsrs r3, r0, 16 - asrs r1, r0, 16 - adds r1, r4, r1 - adds r6, r0, 0 - cmp r3, r1 - bge _0800753A - ldr r0, _0800754C @ =gUnknown_2021B48 - mov r8, r0 - movs r7, 0x7 - adds r4, r1, 0 - movs r5, 0x1 -_0800751E: - lsrs r2, r3, 3 - add r2, r8 - adds r1, r3, 0 - ands r1, r7 - adds r0, r5, 0 - lsls r0, r1 - ldrb r1, [r2] - orrs r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - blt _0800751E -_0800753A: - asrs r0, r6, 16 -_0800753C: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08007548: .4byte gUnknown_2021B46 -_0800754C: .4byte gUnknown_2021B48 - thumb_func_end AllocSpriteTiles - - thumb_func_start SpriteTileAllocBitmapOp -SpriteTileAllocBitmapOp: @ 8007550 - push {r4-r6,lr} - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 24 - lsrs r1, 24 - lsrs r0, 19 - lsls r0, 24 - lsrs r3, r0, 24 - adds r6, r3, 0 - movs r0, 0x7 - ands r2, r0 - adds r4, r2, 0 - movs r5, 0 - cmp r1, 0 - bne _08007588 - movs r0, 0x1 - lsls r0, r2 - mvns r0, r0 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _08007584 @ =gUnknown_2021B48 - adds r0, r3, r0 - ldrb r1, [r0] - ands r2, r1 - strb r2, [r0] - b _080075B4 - .align 2, 0 -_08007584: .4byte gUnknown_2021B48 -_08007588: - cmp r1, 0x1 - bne _080075A4 - lsls r1, r2 - lsls r0, r1, 24 - lsrs r2, r0, 24 - ldr r0, _080075A0 @ =gUnknown_2021B48 - adds r0, r3, r0 - ldrb r1, [r0] - orrs r2, r1 - strb r2, [r0] - b _080075B4 - .align 2, 0 -_080075A0: .4byte gUnknown_2021B48 -_080075A4: - movs r0, 0x80 - lsls r0, 17 - lsls r0, r4 - lsrs r5, r0, 24 - ldr r0, _080075BC @ =gUnknown_2021B48 - adds r0, r6, r0 - ldrb r0, [r0] - ands r5, r0 -_080075B4: - adds r0, r5, 0 - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_080075BC: .4byte gUnknown_2021B48 - thumb_func_end SpriteTileAllocBitmapOp - - thumb_func_start sub_80075C0 -sub_80075C0: @ 80075C0 - push {r4-r7,lr} - adds r3, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _08007602 - ldr r0, [r3, 0xC] - ldrh r2, [r0, 0x4] - lsrs r2, 5 - ldrh r0, [r3, 0x4] - lsls r0, 22 - lsrs r1, r0, 22 - adds r4, r2, r1 - adds r3, r1, 0 - cmp r3, r4 - bge _08007602 - ldr r7, _08007608 @ =gUnknown_2021B48 - movs r5, 0x7 - movs r6, 0x1 -_080075EA: - asrs r2, r3, 3 - adds r2, r7 - adds r0, r3, 0 - ands r0, r5 - adds r1, r6, 0 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - adds r3, 0x1 - cmp r3, r4 - blt _080075EA -_08007602: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08007608: .4byte gUnknown_2021B48 - thumb_func_end sub_80075C0 - - thumb_func_start nullsub_8 -nullsub_8: @ 800760C - bx lr - thumb_func_end nullsub_8 - - thumb_func_start ProcessSpriteCopyRequests -ProcessSpriteCopyRequests: @ 8007610 - push {r4-r7,lr} - ldr r0, _08007660 @ =gUnknown_2021840 - ldrb r0, [r0] - cmp r0, 0 - beq _08007658 - movs r4, 0 - ldr r1, _08007664 @ =gUnknown_2021841 - ldrb r0, [r1] - cmp r0, 0 - beq _08007652 - ldr r6, _08007668 @ =gUnknown_2021844 - adds r7, r6, 0x4 - adds r5, r1, 0 -_0800762A: - lsls r1, r4, 1 - adds r1, r4 - lsls r1, 2 - adds r2, r1, r6 - ldr r0, [r2] - adds r1, r7 - ldr r1, [r1] - ldrh r2, [r2, 0x8] - lsrs r2, 1 - bl CpuSet - ldrb r1, [r5] - subs r1, 0x1 - strb r1, [r5] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r1, 24 - cmp r1, 0 - bne _0800762A -_08007652: - ldr r1, _08007660 @ =gUnknown_2021840 - movs r0, 0 - strb r0, [r1] -_08007658: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08007660: .4byte gUnknown_2021840 -_08007664: .4byte gUnknown_2021841 -_08007668: .4byte gUnknown_2021844 - thumb_func_end ProcessSpriteCopyRequests - - thumb_func_start RequestSpriteFrameImageCopy -RequestSpriteFrameImageCopy: @ 800766C - push {r4-r6,lr} - adds r5, r2, 0 - lsls r0, 16 - lsrs r2, r0, 16 - lsls r1, 16 - lsrs r6, r1, 16 - ldr r4, _080076C4 @ =gUnknown_2021841 - ldrb r0, [r4] - cmp r0, 0x3F - bhi _080076BC - ldr r3, _080076C8 @ =gUnknown_2021844 - adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - lsls r2, 3 - adds r2, r5 - ldr r1, [r2] - str r1, [r0] - ldrb r0, [r4] - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r0, r3, 0x4 - adds r1, r0 - lsls r0, r6, 5 - ldr r5, _080076CC @ =0x06010000 - adds r0, r5 - str r0, [r1] - ldrb r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrh r1, [r2, 0x4] - strh r1, [r0, 0x8] - ldrb r0, [r4] - adds r0, 0x1 - strb r0, [r4] -_080076BC: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080076C4: .4byte gUnknown_2021841 -_080076C8: .4byte gUnknown_2021844 -_080076CC: .4byte 0x06010000 - thumb_func_end RequestSpriteFrameImageCopy - - thumb_func_start RequestSpriteCopy -RequestSpriteCopy: @ 80076D0 - push {r4-r6,lr} - adds r4, r0, 0 - adds r5, r1, 0 - lsls r2, 16 - lsrs r6, r2, 16 - ldr r3, _08007718 @ =gUnknown_2021841 - ldrb r0, [r3] - cmp r0, 0x3F - bhi _08007710 - ldr r2, _0800771C @ =gUnknown_2021844 - adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - str r4, [r0] - ldrb r1, [r3] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r1, r2, 0x4 - adds r0, r1 - str r5, [r0] - ldrb r1, [r3] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - strh r6, [r0, 0x8] - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] -_08007710: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08007718: .4byte gUnknown_2021841 -_0800771C: .4byte gUnknown_2021844 - thumb_func_end RequestSpriteCopy - - thumb_func_start CopyFromSprites -CopyFromSprites: @ 8007720 - push {r4,lr} - adds r1, r0, 0 - ldr r3, _08007740 @ =gUnknown_202063C - movs r2, 0 - ldr r4, _08007744 @ =0x000010ff -_0800772A: - ldrb r0, [r3] - strb r0, [r1] - adds r1, 0x1 - adds r3, 0x1 - adds r2, 0x1 - cmp r2, r4 - bls _0800772A - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08007740: .4byte gUnknown_202063C -_08007744: .4byte 0x000010ff - thumb_func_end CopyFromSprites - - thumb_func_start CopyToSprites -CopyToSprites: @ 8007748 - push {r4,lr} - adds r1, r0, 0 - ldr r3, _08007768 @ =gUnknown_202063C - movs r2, 0 - ldr r4, _0800776C @ =0x000010ff -_08007752: - ldrb r0, [r1] - strb r0, [r3] - adds r1, 0x1 - adds r3, 0x1 - adds r2, 0x1 - cmp r2, r4 - bls _08007752 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08007768: .4byte gUnknown_202063C -_0800776C: .4byte 0x000010ff - thumb_func_end CopyToSprites - - thumb_func_start ResetAllSprites -ResetAllSprites: @ 8007770 - push {r4,r5,lr} - movs r4, 0 -_08007774: - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - ldr r5, _080077A4 @ =gUnknown_202063C - adds r0, r5 - bl ResetSprite - ldr r0, _080077A8 @ =gUnknown_2021800 - adds r0, r4, r0 - strb r4, [r0] - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x3F - bls _08007774 - lsls r0, r4, 4 - adds r0, r4 - lsls r0, 2 - adds r0, r5 - bl ResetSprite - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080077A4: .4byte gUnknown_202063C -_080077A8: .4byte gUnknown_2021800 - thumb_func_end ResetAllSprites - - thumb_func_start FreeSpriteTiles -FreeSpriteTiles: @ 80077AC - push {lr} - ldr r2, [r0, 0x14] - ldrh r1, [r2] - ldr r0, _080077C4 @ =0x0000ffff - cmp r1, r0 - beq _080077BE - adds r0, r1, 0 - bl FreeSpriteTilesByTag -_080077BE: - pop {r0} - bx r0 - .align 2, 0 -_080077C4: .4byte 0x0000ffff - thumb_func_end FreeSpriteTiles - - thumb_func_start FreeSpritePalette -FreeSpritePalette: @ 80077C8 - push {lr} - ldr r0, [r0, 0x14] - ldrh r0, [r0, 0x2] - bl FreeSpritePaletteByTag - pop {r0} - bx r0 - thumb_func_end FreeSpritePalette - - thumb_func_start FreeSpriteOamMatrix -FreeSpriteOamMatrix: @ 80077D8 - push {r4,lr} - adds r4, r0, 0 - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080077FE - ldrb r0, [r4, 0x3] - lsls r0, 26 - lsrs r0, 27 - bl FreeOamMatrix - ldrb r1, [r4, 0x1] - movs r0, 0x4 - negs r0, r0 - ands r0, r1 - strb r0, [r4, 0x1] -_080077FE: - pop {r4} - pop {r0} - bx r0 - thumb_func_end FreeSpriteOamMatrix - - thumb_func_start DestroySpriteAndFreeResources -DestroySpriteAndFreeResources: @ 8007804 - push {r4,lr} - adds r4, r0, 0 - bl FreeSpriteTiles - adds r0, r4, 0 - bl FreeSpritePalette - adds r0, r4, 0 - bl FreeSpriteOamMatrix - adds r0, r4, 0 - bl DestroySprite - pop {r4} - pop {r0} - bx r0 - thumb_func_end DestroySpriteAndFreeResources - - thumb_func_start AnimateSprite -AnimateSprite: @ 8007824 - push {r4,r5,lr} - adds r4, r0, 0 - ldr r2, _08007860 @ =gUnknown_8231D18 - adds r5, r4, 0 - adds r5, 0x3F - ldrb r1, [r5] - movs r0, 0x4 - ands r0, r1 - adds r0, r2 - ldr r1, [r0] - adds r0, r4, 0 - bl _call_via_r1 - ldr r0, _08007864 @ =gUnknown_2021CCC - ldrb r0, [r0] - cmp r0, 0 - bne _0800785A - ldr r0, _08007868 @ =gUnknown_8231D20 - ldrb r1, [r5] - lsls r1, 28 - lsrs r1, 31 - lsls r1, 2 - adds r1, r0 - ldr r1, [r1] - adds r0, r4, 0 - bl _call_via_r1 -_0800785A: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08007860: .4byte gUnknown_8231D18 -_08007864: .4byte gUnknown_2021CCC -_08007868: .4byte gUnknown_8231D20 - thumb_func_end AnimateSprite - - thumb_func_start BeginAnim -BeginAnim: @ 800786C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r4, r0, 0 - adds r3, r4, 0 - adds r3, 0x2B - movs r2, 0 - strb r2, [r3] - adds r5, r4, 0 - adds r5, 0x3F - ldrb r1, [r5] - movs r0, 0x11 - negs r0, r0 - ands r0, r1 - strb r0, [r5] - adds r0, r4, 0 - adds r0, 0x2D - strb r2, [r0] - adds r2, r4, 0 - adds r2, 0x2A - ldrb r1, [r2] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r3] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldrh r0, [r0] - mov r9, r0 - lsls r0, 16 - mov r8, r0 - asrs r1, r0, 16 - movs r0, 0x1 - negs r0, r0 - cmp r1, r0 - beq _08007950 - ldrb r1, [r5] - subs r0, 0x4 - ands r0, r1 - strb r0, [r5] - ldrb r1, [r2] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r3] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r1, r0, 10 - lsrs r3, r1, 26 - lsls r1, r0, 9 - lsrs r7, r1, 31 - lsls r0, 8 - lsrs r6, r0, 31 - cmp r3, 0 - beq _080078E8 - subs r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_080078E8: - adds r2, r4, 0 - adds r2, 0x2C - movs r0, 0x3F - ands r3, r0 - ldrb r1, [r2] - subs r0, 0x7F - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08007912 - adds r0, r4, 0 - adds r1, r7, 0 - adds r2, r6, 0 - bl SetSpriteOamFlipBits -_08007912: - ldrb r1, [r5] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08007940 - adds r0, r4, 0 - adds r0, 0x40 - ldrh r1, [r0] - add r1, r9 - ldr r2, _08007938 @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r4, 0x4] - ldr r0, _0800793C @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - b _08007950 - .align 2, 0 -_08007938: .4byte 0x000003ff -_0800793C: .4byte 0xfffffc00 -_08007940: - mov r1, r8 - lsrs r0, r1, 16 - ldrh r1, [r4, 0x4] - lsls r1, 22 - lsrs r1, 22 - ldr r2, [r4, 0xC] - bl RequestSpriteFrameImageCopy -_08007950: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end BeginAnim - - thumb_func_start ContinueAnim -ContinueAnim: @ 800795C - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r0, 0x3F - ands r0, r1 - cmp r0, 0 - beq _080079AC - adds r0, r4, 0 - bl DecrementAnimDelayCounter - adds r0, r4, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r1, r0, 9 - lsrs r3, r1, 31 - lsls r0, 8 - lsrs r2, r0, 31 - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080079F2 - adds r0, r4, 0 - adds r1, r3, 0 - bl SetSpriteOamFlipBits - b _080079F2 -_080079AC: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _080079F2 - adds r2, r4, 0 - adds r2, 0x2B - ldrb r0, [r2] - adds r0, 0x1 - strb r0, [r2] - adds r0, r4, 0 - adds r0, 0x2A - ldrb r0, [r0] - ldr r1, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldrb r1, [r2] - ldr r0, [r0] - lsls r1, 2 - adds r1, r0 - movs r2, 0x3 - movs r3, 0 - ldrsh r0, [r1, r3] - cmp r0, 0 - bge _080079E2 - adds r0, 0x3 - lsls r0, 16 - lsrs r2, r0, 16 -_080079E2: - ldr r0, _080079F8 @ =gUnknown_8231D28 - lsls r1, r2, 16 - asrs r1, 14 - adds r1, r0 - ldr r1, [r1] - adds r0, r4, 0 - bl _call_via_r1 -_080079F2: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080079F8: .4byte gUnknown_8231D28 - thumb_func_end ContinueAnim - - thumb_func_start AnimCmd_frame -AnimCmd_frame: @ 80079FC - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldrh r7, [r0] - mov r8, r7 - ldr r0, [r0] - lsls r1, r0, 10 - lsrs r3, r1, 26 - lsls r1, r0, 9 - lsrs r6, r1, 31 - lsls r0, 8 - lsrs r5, r0, 31 - cmp r3, 0 - beq _08007A36 - subs r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_08007A36: - adds r2, r4, 0 - adds r2, 0x2C - movs r0, 0x3F - ands r3, r0 - ldrb r1, [r2] - subs r0, 0x7F - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08007A60 - adds r0, r4, 0 - adds r1, r6, 0 - adds r2, r5, 0 - bl SetSpriteOamFlipBits -_08007A60: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08007A90 - adds r0, r4, 0 - adds r0, 0x40 - ldrh r1, [r0] - adds r1, r7 - ldr r2, _08007A88 @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r4, 0x4] - ldr r0, _08007A8C @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - b _08007A9E - .align 2, 0 -_08007A88: .4byte 0x000003ff -_08007A8C: .4byte 0xfffffc00 -_08007A90: - mov r0, r8 - ldrh r1, [r4, 0x4] - lsls r1, 22 - lsrs r1, 22 - ldr r2, [r4, 0xC] - bl RequestSpriteFrameImageCopy -_08007A9E: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end AnimCmd_frame - - thumb_func_start AnimCmd_end -AnimCmd_end: @ 8007AA8 - adds r2, r0, 0 - adds r2, 0x2B - ldrb r1, [r2] - subs r1, 0x1 - strb r1, [r2] - adds r0, 0x3F - ldrb r1, [r0] - movs r2, 0x10 - orrs r1, r2 - strb r1, [r0] - bx lr - thumb_func_end AnimCmd_end - - thumb_func_start AnimCmd_jump -AnimCmd_jump: @ 8007AC0 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - adds r3, r4, 0 - adds r3, 0x2A - ldrb r1, [r3] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r2, r4, 0 - adds r2, 0x2B - ldrb r0, [r2] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r0, 10 - lsrs r0, 26 - strb r0, [r2] - ldrb r0, [r3] - ldr r1, [r4, 0x8] - lsls r0, 2 - adds r0, r1 - ldrb r1, [r2] - ldr r0, [r0] - lsls r1, 2 - adds r1, r0 - ldrh r7, [r1] - mov r8, r7 - ldr r0, [r1] - lsls r1, r0, 10 - lsrs r3, r1, 26 - lsls r1, r0, 9 - lsrs r6, r1, 31 - lsls r0, 8 - lsrs r5, r0, 31 - cmp r3, 0 - beq _08007B14 - subs r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 -_08007B14: - adds r2, r4, 0 - adds r2, 0x2C - movs r0, 0x3F - ands r3, r0 - ldrb r1, [r2] - subs r0, 0x7F - ands r0, r1 - orrs r0, r3 - strb r0, [r2] - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08007B3E - adds r0, r4, 0 - adds r1, r6, 0 - adds r2, r5, 0 - bl SetSpriteOamFlipBits -_08007B3E: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08007B70 - adds r0, r4, 0 - adds r0, 0x40 - ldrh r1, [r0] - adds r1, r7 - ldr r2, _08007B68 @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r4, 0x4] - ldr r0, _08007B6C @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r4, 0x4] - b _08007B7E - .align 2, 0 -_08007B68: .4byte 0x000003ff -_08007B6C: .4byte 0xfffffc00 -_08007B70: - mov r0, r8 - ldrh r1, [r4, 0x4] - lsls r1, 22 - lsrs r1, 22 - ldr r2, [r4, 0xC] - bl RequestSpriteFrameImageCopy -_08007B7E: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end AnimCmd_jump - - thumb_func_start AnimCmd_loop -AnimCmd_loop: @ 8007B88 - push {lr} - adds r1, r0, 0 - adds r0, 0x2D - ldrb r0, [r0] - cmp r0, 0 - beq _08007B9C - adds r0, r1, 0 - bl ContinueAnimLoop - b _08007BA2 -_08007B9C: - adds r0, r1, 0 - bl BeginAnimLoop -_08007BA2: - pop {r0} - bx r0 - thumb_func_end AnimCmd_loop - - thumb_func_start BeginAnimLoop -BeginAnimLoop: @ 8007BA8 - push {r4,lr} - adds r4, r0, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r4, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r4, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - lsls r0, 10 - lsrs r0, 26 - adds r1, r4, 0 - adds r1, 0x2D - strb r0, [r1] - adds r0, r4, 0 - bl JumpToTopOfAnimLoop - adds r0, r4, 0 - bl ContinueAnim - pop {r4} - pop {r0} - bx r0 - thumb_func_end BeginAnimLoop - - thumb_func_start ContinueAnimLoop -ContinueAnimLoop: @ 8007BE0 - push {r4,lr} - adds r4, r0, 0 - adds r1, r4, 0 - adds r1, 0x2D - ldrb r0, [r1] - subs r0, 0x1 - strb r0, [r1] - adds r0, r4, 0 - bl JumpToTopOfAnimLoop - adds r0, r4, 0 - bl ContinueAnim - pop {r4} - pop {r0} - bx r0 - thumb_func_end ContinueAnimLoop - - thumb_func_start JumpToTopOfAnimLoop -JumpToTopOfAnimLoop: @ 8007C00 - push {r4-r7,lr} - mov r12, r0 - adds r0, 0x2D - ldrb r0, [r0] - cmp r0, 0 - beq _08007C6C - mov r3, r12 - adds r3, 0x2B - ldrb r0, [r3] - subs r0, 0x1 - strb r0, [r3] - mov r5, r12 - adds r5, 0x2A - ldrb r1, [r5] - mov r2, r12 - ldr r0, [r2, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r3] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - subs r0, 0x4 - movs r7, 0 - ldrsh r0, [r0, r7] - movs r1, 0x3 - negs r1, r1 - adds r4, r3, 0 - cmp r0, r1 - beq _08007C66 - adds r6, r1, 0 - adds r2, r4, 0 -_08007C40: - ldrb r0, [r2] - cmp r0, 0 - beq _08007C66 - subs r0, 0x1 - strb r0, [r3] - ldrb r1, [r5] - mov r7, r12 - ldr r0, [r7, 0x8] - lsls r1, 2 - adds r1, r0 - ldrb r0, [r2] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - subs r0, 0x4 - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, r6 - bne _08007C40 -_08007C66: - ldrb r0, [r4] - subs r0, 0x1 - strb r0, [r4] -_08007C6C: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end JumpToTopOfAnimLoop - - thumb_func_start BeginAffineAnim -BeginAffineAnim: @ 8007C74 - push {r4-r7,lr} - sub sp, 0x8 - adds r6, r0, 0 - ldrb r0, [r6, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08007CF6 - ldr r0, [r6, 0x10] - ldr r0, [r0] - movs r2, 0 - ldrsh r1, [r0, r2] - ldr r0, _08007D00 @ =0x00007fff - cmp r1, r0 - beq _08007CF6 - adds r0, r6, 0 - bl GetSpriteMatrixNum - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r4, 0 - bl AffineAnimStateRestartAnim - mov r5, sp - adds r0, r4, 0 - adds r1, r6, 0 - mov r2, sp - bl GetAffineAnimFrame - adds r7, r6, 0 - adds r7, 0x3F - ldrb r1, [r7] - movs r0, 0x9 - negs r0, r0 - ands r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r7] - adds r0, r4, 0 - mov r1, sp - bl ApplyAffineAnimFrame - ldr r1, _08007D04 @ =gUnknown_3000C68 - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r5, 0x5] - strb r1, [r0, 0x2] - ldrb r1, [r7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08007CF6 - movs r0, 0x3A - ldrsh r1, [r6, r0] - movs r0, 0x3C - ldrsh r2, [r6, r0] - adds r0, r6, 0 - bl obj_update_pos2 -_08007CF6: - add sp, 0x8 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08007D00: .4byte 0x00007fff -_08007D04: .4byte gUnknown_3000C68 - thumb_func_end BeginAffineAnim - - thumb_func_start ContinueAffineAnim -ContinueAffineAnim: @ 8007D08 - push {r4,r5,lr} - adds r4, r0, 0 - ldrb r0, [r4, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08007DAA - adds r0, r4, 0 - bl GetSpriteMatrixNum - lsls r0, 24 - lsrs r2, r0, 24 - adds r5, r2, 0 - ldr r1, _08007D40 @ =gUnknown_3000C68 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r3, r0, r1 - ldrb r0, [r3, 0x2] - cmp r0, 0 - beq _08007D44 - adds r0, r2, 0 - adds r1, r4, 0 - bl AffineAnimDelay - b _08007D8E - .align 2, 0 -_08007D40: .4byte gUnknown_3000C68 -_08007D44: - adds r0, r4, 0 - adds r0, 0x2C - ldrb r1, [r0] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08007DAA - ldrb r0, [r3, 0x1] - adds r0, 0x1 - strb r0, [r3, 0x1] - ldrb r0, [r3] - ldr r1, [r4, 0x10] - lsls r0, 2 - adds r0, r1 - ldrb r1, [r3, 0x1] - ldr r0, [r0] - lsls r1, 3 - adds r1, r0 - movs r2, 0x3 - movs r0, 0 - ldrsh r1, [r1, r0] - ldr r0, _08007DB0 @ =0x00007ffc - cmp r1, r0 - ble _08007D7C - ldr r2, _08007DB4 @ =0xffff8003 - adds r0, r1, r2 - lsls r0, 16 - lsrs r2, r0, 16 -_08007D7C: - ldr r0, _08007DB8 @ =gUnknown_8231D38 - lsls r1, r2, 16 - asrs r1, 14 - adds r1, r0 - ldr r2, [r1] - adds r0, r5, 0 - adds r1, r4, 0 - bl _call_via_r2 -_08007D8E: - adds r0, r4, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08007DAA - movs r0, 0x3A - ldrsh r1, [r4, r0] - movs r0, 0x3C - ldrsh r2, [r4, r0] - adds r0, r4, 0 - bl obj_update_pos2 -_08007DAA: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08007DB0: .4byte 0x00007ffc -_08007DB4: .4byte 0xffff8003 -_08007DB8: .4byte gUnknown_8231D38 - thumb_func_end ContinueAffineAnim - - thumb_func_start AffineAnimDelay -AffineAnimDelay: @ 8007DBC - push {r4,r5,lr} - sub sp, 0x8 - adds r5, r1, 0 - lsls r0, 24 - lsrs r4, r0, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl DecrementAffineAnimDelayCounter - lsls r0, 24 - cmp r0, 0 - bne _08007DE6 - adds r0, r4, 0 - adds r1, r5, 0 - mov r2, sp - bl GetAffineAnimFrame - adds r0, r4, 0 - mov r1, sp - bl ApplyAffineAnimFrameRelativeAndUpdateMatrix -_08007DE6: - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end AffineAnimDelay - - thumb_func_start AffineAnimCmd_loop -AffineAnimCmd_loop: @ 8007DF0 - push {lr} - adds r3, r1, 0 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r1, _08007E14 @ =gUnknown_3000C68 - lsls r0, r2, 1 - adds r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x3] - cmp r0, 0 - beq _08007E18 - adds r0, r2, 0 - adds r1, r3, 0 - bl ContinueAffineAnimLoop - b _08007E20 - .align 2, 0 -_08007E14: .4byte gUnknown_3000C68 -_08007E18: - adds r0, r2, 0 - adds r1, r3, 0 - bl BeginAffineAnimLoop -_08007E20: - pop {r0} - bx r0 - thumb_func_end AffineAnimCmd_loop - - thumb_func_start BeginAffineAnimLoop -BeginAffineAnimLoop: @ 8007E24 - push {r4,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r0, 24 - ldr r1, _08007E5C @ =gUnknown_3000C68 - lsls r3, r0, 1 - adds r3, r0 - lsls r3, 2 - adds r3, r1 - ldrb r2, [r3] - ldr r1, [r4, 0x10] - lsls r2, 2 - adds r2, r1 - ldrb r1, [r3, 0x1] - ldr r2, [r2] - lsls r1, 3 - adds r1, r2 - ldrh r1, [r1, 0x2] - strb r1, [r3, 0x3] - adds r1, r4, 0 - bl JumpToTopOfAffineAnimLoop - adds r0, r4, 0 - bl ContinueAffineAnim - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08007E5C: .4byte gUnknown_3000C68 - thumb_func_end BeginAffineAnimLoop - - thumb_func_start ContinueAffineAnimLoop -ContinueAffineAnimLoop: @ 8007E60 - push {r4,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08007E8C @ =gUnknown_3000C68 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r2, [r1, 0x3] - subs r2, 0x1 - strb r2, [r1, 0x3] - adds r1, r4, 0 - bl JumpToTopOfAffineAnimLoop - adds r0, r4, 0 - bl ContinueAffineAnim - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08007E8C: .4byte gUnknown_3000C68 - thumb_func_end ContinueAffineAnimLoop - - thumb_func_start JumpToTopOfAffineAnimLoop -JumpToTopOfAffineAnimLoop: @ 8007E90 - push {r4-r7,lr} - mov r12, r1 - lsls r0, 24 - lsrs r5, r0, 24 - ldr r1, _08007EB4 @ =gUnknown_3000C68 - lsls r3, r5, 1 - adds r0, r3, r5 - lsls r0, 2 - adds r2, r0, r1 - ldrb r0, [r2, 0x3] - adds r6, r1, 0 - cmp r0, 0 - beq _08007EF0 - ldrb r0, [r2, 0x1] - subs r0, 0x1 - strb r0, [r2, 0x1] - adds r4, r3, 0 - b _08007EC0 - .align 2, 0 -_08007EB4: .4byte gUnknown_3000C68 -_08007EB8: - cmp r2, 0 - beq _08007EE4 - subs r0, r2, 0x1 - strb r0, [r3, 0x1] -_08007EC0: - adds r0, r4, r5 - lsls r0, 2 - adds r3, r0, r6 - ldrb r0, [r3] - mov r2, r12 - ldr r1, [r2, 0x10] - lsls r0, 2 - adds r0, r1 - ldrb r2, [r3, 0x1] - ldr r1, [r0] - lsls r0, r2, 3 - adds r0, r1 - subs r0, 0x8 - movs r7, 0 - ldrsh r1, [r0, r7] - ldr r0, _08007EF8 @ =0x00007ffd - cmp r1, r0 - bne _08007EB8 -_08007EE4: - adds r1, r4, r5 - lsls r1, 2 - adds r1, r6 - ldrb r0, [r1, 0x1] - subs r0, 0x1 - strb r0, [r1, 0x1] -_08007EF0: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08007EF8: .4byte 0x00007ffd - thumb_func_end JumpToTopOfAffineAnimLoop - - thumb_func_start AffineAnimCmd_jump -AffineAnimCmd_jump: @ 8007EFC - push {r4-r6,lr} - sub sp, 0x8 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r0, _08007F44 @ =gUnknown_3000C68 - lsls r4, r5, 1 - adds r4, r5 - lsls r4, 2 - adds r4, r0 - ldrb r2, [r4] - ldr r0, [r1, 0x10] - lsls r2, 2 - adds r2, r0 - ldrb r0, [r4, 0x1] - ldr r2, [r2] - lsls r0, 3 - adds r0, r2 - ldrh r0, [r0, 0x2] - strb r0, [r4, 0x1] - mov r6, sp - adds r0, r5, 0 - mov r2, sp - bl GetAffineAnimFrame - adds r0, r5, 0 - mov r1, sp - bl ApplyAffineAnimFrame - ldrb r0, [r6, 0x5] - strb r0, [r4, 0x2] - add sp, 0x8 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08007F44: .4byte gUnknown_3000C68 - thumb_func_end AffineAnimCmd_jump - - thumb_func_start AffineAnimCmd_end -AffineAnimCmd_end: @ 8007F48 - push {lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - movs r2, 0 - movs r3, 0 - str r2, [sp] - str r3, [sp, 0x4] - adds r1, 0x3F - ldrb r2, [r1] - movs r3, 0x20 - orrs r2, r3 - strb r2, [r1] - ldr r2, _08007F80 @ =gUnknown_3000C68 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r2, [r1, 0x1] - subs r2, 0x1 - strb r2, [r1, 0x1] - mov r1, sp - bl ApplyAffineAnimFrameRelativeAndUpdateMatrix - add sp, 0x8 - pop {r0} - bx r0 - .align 2, 0 -_08007F80: .4byte gUnknown_3000C68 - thumb_func_end AffineAnimCmd_end - - thumb_func_start AffineAnimCmd_frame -AffineAnimCmd_frame: @ 8007F84 - push {r4,r5,lr} - sub sp, 0x8 - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - mov r5, sp - adds r0, r4, 0 - mov r2, sp - bl GetAffineAnimFrame - adds r0, r4, 0 - mov r1, sp - bl ApplyAffineAnimFrame - ldr r1, _08007FB8 @ =gUnknown_3000C68 - lsls r0, r4, 1 - adds r0, r4 - lsls r0, 2 - adds r0, r1 - ldrb r1, [r5, 0x5] - strb r1, [r0, 0x2] - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08007FB8: .4byte gUnknown_3000C68 - thumb_func_end AffineAnimCmd_frame - - thumb_func_start CopyOamMatrix -CopyOamMatrix: @ 8007FBC - lsls r0, 24 - ldr r2, _08007FD8 @ =gUnknown_2021BCC - lsrs r0, 21 - adds r0, r2 - ldrh r2, [r1] - strh r2, [r0] - ldrh r2, [r1, 0x2] - strh r2, [r0, 0x2] - ldrh r2, [r1, 0x4] - strh r2, [r0, 0x4] - ldrh r1, [r1, 0x6] - strh r1, [r0, 0x6] - bx lr - .align 2, 0 -_08007FD8: .4byte gUnknown_2021BCC - thumb_func_end CopyOamMatrix - - thumb_func_start GetSpriteMatrixNum -GetSpriteMatrixNum: @ 8007FDC - push {lr} - adds r2, r0, 0 - movs r3, 0 - ldrb r0, [r2, 0x1] - lsls r0, 30 - lsrs r0, 30 - movs r1, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08007FF6 - ldrb r0, [r2, 0x3] - lsls r0, 26 - lsrs r3, r0, 27 -_08007FF6: - adds r0, r3, 0 - pop {r1} - bx r1 - thumb_func_end GetSpriteMatrixNum - - thumb_func_start sub_8007FFC -sub_8007FFC: @ 8007FFC - strh r1, [r0, 0x3A] - strh r2, [r0, 0x3C] - adds r0, 0x3F - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] - bx lr - thumb_func_end sub_8007FFC - - thumb_func_start sub_800800C -sub_800800C: @ 800800C - push {r4,r5,lr} - adds r3, r0, 0 - adds r5, r2, 0 - subs r0, r1, r3 - cmp r0, 0 - bge _0800801E - negs r0, r0 - asrs r4, r0, 9 - b _08008022 -_0800801E: - asrs r0, 9 - negs r4, r0 -_08008022: - adds r0, r5, 0 - muls r0, r1 - adds r1, r3, 0 - bl __udivsi3 - adds r0, r4 - subs r0, r5, r0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_800800C - - thumb_func_start obj_update_pos2 -obj_update_pos2: @ 8008038 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r5, r0, 0 - adds r6, r1, 0 - mov r8, r2 - ldrb r1, [r5, 0x3] - lsls r0, r1, 26 - lsrs r7, r0, 27 - movs r0, 0x80 - lsls r0, 4 - mov r9, r0 - cmp r6, r9 - beq _08008086 - ldr r2, _080080CC @ =gUnknown_8231D48 - lsrs r1, 6 - lsls r1, 3 - ldrb r0, [r5, 0x1] - lsrs r0, 6 - lsls r0, 5 - adds r1, r0 - adds r1, r2 - ldr r0, [r1] - lsls r4, r0, 8 - lsls r0, 16 - ldr r2, _080080D0 @ =gUnknown_2021BCC - lsls r1, r7, 3 - adds r1, r2 - movs r2, 0 - ldrsh r1, [r1, r2] - bl __divsi3 - adds r1, r0, 0 - adds r0, r4, 0 - adds r2, r6, 0 - bl sub_800800C - strh r0, [r5, 0x24] -_08008086: - cmp r8, r9 - beq _080080BE - ldr r2, _080080CC @ =gUnknown_8231D48 - ldrb r1, [r5, 0x3] - lsrs r1, 6 - lsls r1, 3 - ldrb r0, [r5, 0x1] - lsrs r0, 6 - lsls r0, 5 - adds r1, r0 - adds r2, 0x4 - adds r1, r2 - ldr r0, [r1] - lsls r4, r0, 8 - lsls r0, 16 - ldr r2, _080080D0 @ =gUnknown_2021BCC - lsls r1, r7, 3 - adds r1, r2 - movs r2, 0x6 - ldrsh r1, [r1, r2] - bl __divsi3 - adds r1, r0, 0 - adds r0, r4, 0 - mov r2, r8 - bl sub_800800C - strh r0, [r5, 0x26] -_080080BE: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080080CC: .4byte gUnknown_8231D48 -_080080D0: .4byte gUnknown_2021BCC - thumb_func_end obj_update_pos2 - - thumb_func_start SetSpriteOamFlipBits -SetSpriteOamFlipBits: @ 80080D4 - push {r4-r6,lr} - mov r6, r8 - push {r6} - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - ldrb r6, [r0, 0x3] - lsls r3, r6, 26 - lsrs r3, 27 - movs r4, 0x7 - ands r3, r4 - lsls r3, 1 - subs r4, 0x46 - mov r8, r4 - mov r5, r8 - ands r5, r6 - orrs r5, r3 - strb r5, [r0, 0x3] - lsls r4, r5, 26 - lsrs r4, 27 - movs r6, 0x3F - adds r6, r0 - mov r12, r6 - ldrb r3, [r6] - lsls r3, 31 - lsrs r3, 31 - eors r1, r3 - movs r6, 0x1 - ands r1, r6 - lsls r1, 3 - orrs r4, r1 - lsls r4, 1 - mov r3, r8 - ands r3, r5 - orrs r3, r4 - strb r3, [r0, 0x3] - lsls r4, r3, 26 - lsrs r4, 27 - mov r5, r12 - ldrb r1, [r5] - lsls r1, 30 - lsrs r1, 31 - eors r2, r1 - ands r2, r6 - lsls r2, 4 - orrs r4, r2 - lsls r4, 1 - mov r6, r8 - ands r3, r6 - orrs r3, r4 - strb r3, [r0, 0x3] - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end SetSpriteOamFlipBits - - thumb_func_start AffineAnimStateRestartAnim -AffineAnimStateRestartAnim: @ 8008148 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08008160 @ =gUnknown_3000C68 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0 - strb r0, [r1, 0x1] - strb r0, [r1, 0x2] - strb r0, [r1, 0x3] - bx lr - .align 2, 0 -_08008160: .4byte gUnknown_3000C68 - thumb_func_end AffineAnimStateRestartAnim - - thumb_func_start AffineAnimStateStartAnim -AffineAnimStateStartAnim: @ 8008164 - lsls r0, 24 - lsrs r0, 24 - ldr r3, _08008188 @ =gUnknown_3000C68 - lsls r2, r0, 1 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - movs r3, 0 - strb r1, [r2] - strb r3, [r2, 0x1] - strb r3, [r2, 0x2] - strb r3, [r2, 0x3] - movs r0, 0x80 - lsls r0, 1 - strh r0, [r2, 0x4] - strh r0, [r2, 0x6] - strh r3, [r2, 0x8] - bx lr - .align 2, 0 -_08008188: .4byte gUnknown_3000C68 - thumb_func_end AffineAnimStateStartAnim - - thumb_func_start AffineAnimStateReset -AffineAnimStateReset: @ 800818C - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080081B0 @ =gUnknown_3000C68 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - movs r0, 0 - strb r0, [r1] - strb r0, [r1, 0x1] - strb r0, [r1, 0x2] - strb r0, [r1, 0x3] - movs r2, 0x80 - lsls r2, 1 - strh r2, [r1, 0x4] - strh r2, [r1, 0x6] - strh r0, [r1, 0x8] - bx lr - .align 2, 0 -_080081B0: .4byte gUnknown_3000C68 - thumb_func_end AffineAnimStateReset - - thumb_func_start ApplyAffineAnimFrameAbsolute -ApplyAffineAnimFrameAbsolute: @ 80081B4 - lsls r0, 24 - lsrs r0, 24 - ldr r3, _080081D4 @ =gUnknown_3000C68 - lsls r2, r0, 1 - adds r2, r0 - lsls r2, 2 - adds r2, r3 - ldrh r0, [r1] - strh r0, [r2, 0x4] - ldrh r0, [r1, 0x2] - strh r0, [r2, 0x6] - ldrb r0, [r1, 0x4] - lsls r0, 8 - strh r0, [r2, 0x8] - bx lr - .align 2, 0 -_080081D4: .4byte gUnknown_3000C68 - thumb_func_end ApplyAffineAnimFrameAbsolute - - thumb_func_start DecrementAnimDelayCounter -DecrementAnimDelayCounter: @ 80081D8 - push {lr} - adds r3, r0, 0 - adds r3, 0x2C - ldrb r2, [r3] - movs r0, 0x40 - ands r0, r2 - cmp r0, 0 - bne _080081FC - lsls r0, r2, 26 - lsrs r0, 26 - subs r0, 0x1 - movs r1, 0x3F - ands r0, r1 - movs r1, 0x40 - negs r1, r1 - ands r1, r2 - orrs r1, r0 - strb r1, [r3] -_080081FC: - pop {r0} - bx r0 - thumb_func_end DecrementAnimDelayCounter - - thumb_func_start DecrementAffineAnimDelayCounter -DecrementAffineAnimDelayCounter: @ 8008200 - push {lr} - lsls r1, 24 - lsrs r2, r1, 24 - adds r3, r0, 0 - adds r3, 0x2C - ldrb r1, [r3] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _08008224 - ldr r0, _0800822C @ =gUnknown_3000C68 - lsls r1, r2, 1 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1, 0x2] - subs r0, 0x1 - strb r0, [r1, 0x2] -_08008224: - ldrb r0, [r3] - lsrs r0, 7 - pop {r1} - bx r1 - .align 2, 0 -_0800822C: .4byte gUnknown_3000C68 - thumb_func_end DecrementAffineAnimDelayCounter - - thumb_func_start ApplyAffineAnimFrameRelativeAndUpdateMatrix -ApplyAffineAnimFrameRelativeAndUpdateMatrix: @ 8008230 - push {r4-r6,lr} - sub sp, 0x10 - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldr r0, _080082B8 @ =gUnknown_3000C68 - lsls r4, r5, 1 - adds r4, r5 - lsls r4, 2 - adds r4, r0 - ldrh r0, [r1] - ldrh r2, [r4, 0x4] - adds r0, r2 - strh r0, [r4, 0x4] - ldrh r0, [r1, 0x2] - ldrh r2, [r4, 0x6] - adds r0, r2 - strh r0, [r4, 0x6] - ldrb r0, [r1, 0x4] - lsls r0, 8 - ldrh r1, [r4, 0x8] - adds r0, r1 - ldr r2, _080082BC @ =0xffffff00 - adds r1, r2, 0 - ands r0, r1 - strh r0, [r4, 0x8] - movs r1, 0x4 - ldrsh r0, [r4, r1] - bl ConvertScaleParam - lsls r0, 16 - lsrs r0, 16 - ldr r6, _080082C0 @ =0xffff0000 - ldr r1, [sp] - ands r1, r6 - orrs r1, r0 - str r1, [sp] - movs r2, 0x6 - ldrsh r0, [r4, r2] - bl ConvertScaleParam - lsls r0, 16 - ldr r2, _080082C4 @ =0x0000ffff - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - ldrh r1, [r4, 0x8] - ldr r0, [sp, 0x4] - ands r0, r6 - orrs r0, r1 - str r0, [sp, 0x4] - add r4, sp, 0x8 - mov r0, sp - adds r1, r4, 0 - movs r2, 0x1 - movs r3, 0x2 - bl ObjAffineSet - adds r0, r5, 0 - adds r1, r4, 0 - bl CopyOamMatrix - add sp, 0x10 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080082B8: .4byte gUnknown_3000C68 -_080082BC: .4byte 0xffffff00 -_080082C0: .4byte 0xffff0000 -_080082C4: .4byte 0x0000ffff - thumb_func_end ApplyAffineAnimFrameRelativeAndUpdateMatrix - - thumb_func_start ConvertScaleParam -ConvertScaleParam: @ 80082C8 - push {lr} - adds r1, r0, 0 - movs r0, 0x80 - lsls r0, 9 - lsls r1, 16 - asrs r1, 16 - bl __divsi3 - lsls r0, 16 - asrs r0, 16 - pop {r1} - bx r1 - thumb_func_end ConvertScaleParam - - thumb_func_start GetAffineAnimFrame -GetAffineAnimFrame: @ 80082E0 - push {r4,lr} - lsls r0, 24 - lsrs r0, 24 - ldr r3, _08008348 @ =gUnknown_3000C68 - lsls r4, r0, 1 - adds r4, r0 - lsls r4, 2 - adds r4, r3 - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r3, [r3] - lsls r0, 3 - adds r0, r3 - ldrh r0, [r0] - strh r0, [r2] - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r3, [r3] - lsls r0, 3 - adds r0, r3 - ldrh r0, [r0, 0x2] - strh r0, [r2, 0x2] - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r3, [r3] - lsls r0, 3 - adds r0, r3 - ldrb r0, [r0, 0x4] - strb r0, [r2, 0x4] - ldrb r3, [r4] - ldr r0, [r1, 0x10] - lsls r3, 2 - adds r3, r0 - ldrb r0, [r4, 0x1] - ldr r1, [r3] - lsls r0, 3 - adds r0, r1 - ldrb r0, [r0, 0x5] - strb r0, [r2, 0x5] - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08008348: .4byte gUnknown_3000C68 - thumb_func_end GetAffineAnimFrame - - thumb_func_start ApplyAffineAnimFrame -ApplyAffineAnimFrame: @ 800834C - push {r4,lr} - sub sp, 0x8 - adds r2, r1, 0 - lsls r0, 24 - lsrs r4, r0, 24 - movs r0, 0 - movs r1, 0 - str r0, [sp] - str r1, [sp, 0x4] - ldrb r0, [r2, 0x5] - cmp r0, 0 - beq _08008372 - subs r0, 0x1 - strb r0, [r2, 0x5] - adds r0, r4, 0 - adds r1, r2, 0 - bl ApplyAffineAnimFrameRelativeAndUpdateMatrix - b _08008382 -_08008372: - adds r0, r4, 0 - adds r1, r2, 0 - bl ApplyAffineAnimFrameAbsolute - adds r0, r4, 0 - mov r1, sp - bl ApplyAffineAnimFrameRelativeAndUpdateMatrix -_08008382: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - thumb_func_end ApplyAffineAnimFrame - - thumb_func_start StartSpriteAnim -StartSpriteAnim: @ 800838C - adds r2, r0, 0 - adds r2, 0x2A - strb r1, [r2] - adds r0, 0x3F - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - movs r2, 0x11 - negs r2, r2 - ands r1, r2 - strb r1, [r0] - bx lr - thumb_func_end StartSpriteAnim - - thumb_func_start StartSpriteAnimIfDifferent -StartSpriteAnimIfDifferent: @ 80083A4 - push {lr} - adds r2, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r0, 0x2A - ldrb r0, [r0] - cmp r0, r1 - beq _080083BA - adds r0, r2, 0 - bl StartSpriteAnim -_080083BA: - pop {r0} - bx r0 - thumb_func_end StartSpriteAnimIfDifferent - - thumb_func_start SeekSpriteAnim -SeekSpriteAnim: @ 80083C0 - push {r4-r7,lr} - adds r3, r0, 0 - lsls r1, 24 - lsrs r1, 24 - adds r4, r3, 0 - adds r4, 0x2C - ldrb r0, [r4] - lsls r0, 25 - lsrs r6, r0, 31 - subs r1, 0x1 - adds r0, r3, 0 - adds r0, 0x2B - strb r1, [r0] - ldrb r1, [r4] - movs r7, 0x40 - negs r7, r7 - adds r0, r7, 0 - ands r0, r1 - strb r0, [r4] - adds r2, r3, 0 - adds r2, 0x3F - ldrb r1, [r2] - movs r0, 0x5 - negs r0, r0 - ands r0, r1 - movs r1, 0x11 - negs r1, r1 - ands r0, r1 - strb r0, [r2] - ldrb r1, [r4] - movs r5, 0x41 - negs r5, r5 - adds r0, r5, 0 - ands r0, r1 - strb r0, [r4] - adds r0, r3, 0 - bl ContinueAnim - ldrb r2, [r4] - movs r0, 0x3F - ands r0, r2 - cmp r0, 0 - beq _08008428 - lsls r0, r2, 26 - lsrs r0, 26 - adds r0, 0x1 - movs r1, 0x3F - ands r0, r1 - adds r1, r7, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r4] -_08008428: - lsls r2, r6, 6 - ldrb r1, [r4] - adds r0, r5, 0 - ands r0, r1 - orrs r0, r2 - strb r0, [r4] - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end SeekSpriteAnim - - thumb_func_start StartSpriteAffineAnim -StartSpriteAffineAnim: @ 800843C - push {r4,r5,lr} - adds r5, r0, 0 - lsls r4, r1, 24 - lsrs r4, 24 - bl GetSpriteMatrixNum - lsls r0, 24 - lsrs r0, 24 - adds r1, r4, 0 - bl AffineAnimStateStartAnim - adds r5, 0x3F - ldrb r0, [r5] - movs r1, 0x8 - orrs r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end StartSpriteAffineAnim - - thumb_func_start StartSpriteAffineAnimIfDifferent -StartSpriteAffineAnimIfDifferent: @ 8008468 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - bl GetSpriteMatrixNum - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08008498 @ =gUnknown_3000C68 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1] - cmp r0, r4 - beq _08008490 - adds r0, r5, 0 - adds r1, r4, 0 - bl StartSpriteAffineAnim -_08008490: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08008498: .4byte gUnknown_3000C68 - thumb_func_end StartSpriteAffineAnimIfDifferent - - thumb_func_start ChangeSpriteAffineAnim -ChangeSpriteAffineAnim: @ 800849C - push {r4,r5,lr} - adds r5, r0, 0 - lsls r4, r1, 24 - lsrs r4, 24 - bl GetSpriteMatrixNum - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080084D0 @ =gUnknown_3000C68 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - strb r4, [r1] - adds r5, 0x3F - ldrb r0, [r5] - movs r1, 0x8 - orrs r0, r1 - movs r1, 0x21 - negs r1, r1 - ands r0, r1 - strb r0, [r5] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080084D0: .4byte gUnknown_3000C68 - thumb_func_end ChangeSpriteAffineAnim - - thumb_func_start ChangeSpriteAffineAnimIfDifferent -ChangeSpriteAffineAnimIfDifferent: @ 80084D4 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r1, 24 - lsrs r4, r1, 24 - bl GetSpriteMatrixNum - lsls r0, 24 - lsrs r0, 24 - ldr r2, _08008504 @ =gUnknown_3000C68 - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldrb r0, [r1] - cmp r0, r4 - beq _080084FC - adds r0, r5, 0 - adds r1, r4, 0 - bl ChangeSpriteAffineAnim -_080084FC: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08008504: .4byte gUnknown_3000C68 - thumb_func_end ChangeSpriteAffineAnimIfDifferent - - thumb_func_start SetSpriteSheetFrameTileNum -SetSpriteSheetFrameTileNum: @ 8008508 - push {lr} - adds r3, r0, 0 - adds r0, 0x3F - ldrb r1, [r0] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08008554 - adds r0, r3, 0 - adds r0, 0x2A - ldrb r1, [r0] - ldr r0, [r3, 0x8] - lsls r1, 2 - adds r1, r0 - adds r0, r3, 0 - adds r0, 0x2B - ldrb r0, [r0] - ldr r1, [r1] - lsls r0, 2 - adds r0, r1 - ldrh r2, [r0] - movs r1, 0 - ldrsh r0, [r0, r1] - cmp r0, 0 - bge _0800853C - movs r2, 0 -_0800853C: - adds r0, r3, 0 - adds r0, 0x40 - ldrh r1, [r0] - adds r1, r2 - ldr r2, _08008558 @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - ldr r0, _0800855C @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] -_08008554: - pop {r0} - bx r0 - .align 2, 0 -_08008558: .4byte 0x000003ff -_0800855C: .4byte 0xfffffc00 - thumb_func_end SetSpriteSheetFrameTileNum - - thumb_func_start ResetAffineAnimData -ResetAffineAnimData: @ 8008560 - push {r4,lr} - ldr r1, _0800858C @ =gUnknown_2021CCC - movs r0, 0 - strb r0, [r1] - ldr r1, _08008590 @ =gUnknown_3003E54 - movs r0, 0 - str r0, [r1] - bl ResetOamMatrices - movs r4, 0 -_08008574: - adds r0, r4, 0 - bl AffineAnimStateReset - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x1F - bls _08008574 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0800858C: .4byte gUnknown_2021CCC -_08008590: .4byte gUnknown_3003E54 - thumb_func_end ResetAffineAnimData - - thumb_func_start AllocOamMatrix -AllocOamMatrix: @ 8008594 - push {r4,lr} - movs r2, 0 - movs r1, 0x1 - ldr r0, _080085B4 @ =gUnknown_3003E54 - ldr r4, [r0] - adds r3, r0, 0 -_080085A0: - adds r0, r4, 0 - ands r0, r1 - cmp r0, 0 - bne _080085B8 - ldr r0, [r3] - orrs r0, r1 - str r0, [r3] - adds r0, r2, 0 - b _080085C6 - .align 2, 0 -_080085B4: .4byte gUnknown_3003E54 -_080085B8: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - lsls r1, 1 - cmp r2, 0x1F - bls _080085A0 - movs r0, 0xFF -_080085C6: - pop {r4} - pop {r1} - bx r1 - thumb_func_end AllocOamMatrix - - thumb_func_start FreeOamMatrix -FreeOamMatrix: @ 80085CC - push {lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r2, r0, 24 - movs r0, 0 - movs r1, 0x1 - ldr r3, _08008608 @ =gUnknown_3003E54 - cmp r0, r2 - bcs _080085EA -_080085DE: - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 1 - cmp r0, r2 - bcc _080085DE -_080085EA: - ldr r0, [r3] - bics r0, r1 - str r0, [r3] - movs r1, 0x80 - lsls r1, 1 - str r1, [sp] - adds r0, r2, 0 - movs r2, 0 - movs r3, 0 - bl SetOamMatrix - add sp, 0x4 - pop {r0} - bx r0 - .align 2, 0 -_08008608: .4byte gUnknown_3003E54 - thumb_func_end FreeOamMatrix - - thumb_func_start InitSpriteAffineAnim -InitSpriteAffineAnim: @ 800860C - push {r4,r5,lr} - adds r4, r0, 0 - bl AllocOamMatrix - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0xFF - beq _08008654 - ldrb r3, [r4, 0x1] - lsrs r1, r3, 6 - ldrb r2, [r4, 0x3] - lsrs r2, 6 - lsls r3, 30 - lsrs r3, 30 - adds r0, r4, 0 - bl CalcCenterToCornerVec - movs r0, 0x1F - adds r1, r5, 0 - ands r1, r0 - lsls r1, 1 - ldrb r2, [r4, 0x3] - movs r0, 0x3F - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r4, 0x3] - adds r2, r4, 0 - adds r2, 0x3F - ldrb r0, [r2] - movs r1, 0x8 - orrs r0, r1 - strb r0, [r2] - adds r0, r5, 0 - bl AffineAnimStateReset -_08008654: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end InitSpriteAffineAnim - - thumb_func_start SetOamMatrixRotationScaling -SetOamMatrixRotationScaling: @ 800865C - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x10 - adds r6, r0, 0 - adds r0, r1, 0 - adds r4, r2, 0 - adds r5, r3, 0 - lsls r6, 24 - lsrs r6, 24 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r0, 16 - asrs r0, 16 - bl ConvertScaleParam - lsls r0, 16 - lsrs r0, 16 - ldr r1, _080086D4 @ =0xffff0000 - mov r8, r1 - ldr r1, [sp] - mov r2, r8 - ands r1, r2 - orrs r1, r0 - str r1, [sp] - lsls r4, 16 - asrs r4, 16 - adds r0, r4, 0 - bl ConvertScaleParam - lsls r0, 16 - ldr r2, _080086D8 @ =0x0000ffff - ldr r1, [sp] - ands r1, r2 - orrs r1, r0 - str r1, [sp] - ldr r0, [sp, 0x4] - mov r1, r8 - ands r0, r1 - orrs r0, r5 - str r0, [sp, 0x4] - add r4, sp, 0x8 - mov r0, sp - adds r1, r4, 0 - movs r2, 0x1 - movs r3, 0x2 - bl ObjAffineSet - adds r0, r6, 0 - adds r1, r4, 0 - bl CopyOamMatrix - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080086D4: .4byte 0xffff0000 -_080086D8: .4byte 0x0000ffff - thumb_func_end SetOamMatrixRotationScaling - - thumb_func_start LoadSpriteSheet -LoadSpriteSheet: @ 80086DC - push {r4-r6,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x4] - lsrs r0, 5 - bl AllocSpriteTiles - lsls r4, r0, 16 - asrs r6, r4, 16 - cmp r6, 0 - blt _08008718 - ldrh r0, [r5, 0x6] - lsrs r4, 16 - ldrh r2, [r5, 0x4] - lsrs r2, 5 - adds r1, r4, 0 - bl AllocSpriteTileRange - ldr r0, [r5] - lsls r1, r6, 5 - ldr r2, _08008714 @ =0x06010000 - adds r1, r2 - ldrh r2, [r5, 0x4] - lsrs r2, 1 - bl CpuSet - adds r0, r4, 0 - b _0800871A - .align 2, 0 -_08008714: .4byte 0x06010000 -_08008718: - movs r0, 0 -_0800871A: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end LoadSpriteSheet - - thumb_func_start LoadSpriteSheets -LoadSpriteSheets: @ 8008720 - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 - ldr r0, [r5] - cmp r0, 0 - beq _08008744 -_0800872C: - lsls r0, r4, 3 - adds r0, r5, r0 - bl LoadSpriteSheet - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 3 - adds r0, r5 - ldr r0, [r0] - cmp r0, 0 - bne _0800872C -_08008744: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end LoadSpriteSheets - - thumb_func_start FreeSpriteTilesByTag -FreeSpriteTilesByTag: @ 800874C - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 16 - lsrs r0, 16 - bl IndexOfSpriteTileTag - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - beq _080087AA - ldr r0, _080087B4 @ =gUnknown_3000B68 - lsls r1, r4, 2 - adds r2, r1, r0 - adds r0, 0x2 - adds r1, r0 - ldrh r0, [r1] - ldrh r3, [r2] - adds r0, r3, r0 - ldr r1, _080087B8 @ =gUnknown_3000AE8 - mov r8, r1 - lsls r5, r4, 1 - cmp r3, r0 - bge _080087A2 - ldr r1, _080087BC @ =gUnknown_2021B48 - mov r12, r1 - movs r6, 0x7 - movs r7, 0x1 - adds r4, r0, 0 -_08008786: - lsrs r2, r3, 3 - add r2, r12 - adds r0, r3, 0 - ands r0, r6 - adds r1, r7, 0 - lsls r1, r0 - ldrb r0, [r2] - bics r0, r1 - strb r0, [r2] - adds r0, r3, 0x1 - lsls r0, 16 - lsrs r3, r0, 16 - cmp r3, r4 - blt _08008786 -_080087A2: - mov r0, r8 - adds r1, r5, r0 - ldr r0, _080087C0 @ =0x0000ffff - strh r0, [r1] -_080087AA: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080087B4: .4byte gUnknown_3000B68 -_080087B8: .4byte gUnknown_3000AE8 -_080087BC: .4byte gUnknown_2021B48 -_080087C0: .4byte 0x0000ffff - thumb_func_end FreeSpriteTilesByTag - - thumb_func_start FreeSpriteTileRanges -FreeSpriteTileRanges: @ 80087C4 - push {r4-r7,lr} - movs r2, 0 - ldr r7, _080087F8 @ =gUnknown_3000AE8 - ldr r0, _080087FC @ =0x0000ffff - adds r6, r0, 0 - ldr r4, _08008800 @ =gUnknown_3000B68 - movs r3, 0 - adds r5, r4, 0x2 -_080087D4: - lsls r1, r2, 1 - adds r1, r7 - ldrh r0, [r1] - orrs r0, r6 - strh r0, [r1] - lsls r1, r2, 2 - adds r0, r1, r4 - strh r3, [r0] - adds r1, r5 - strh r3, [r1] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _080087D4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080087F8: .4byte gUnknown_3000AE8 -_080087FC: .4byte 0x0000ffff -_08008800: .4byte gUnknown_3000B68 - thumb_func_end FreeSpriteTileRanges - - thumb_func_start GetSpriteTileStartByTag -GetSpriteTileStartByTag: @ 8008804 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl IndexOfSpriteTileTag - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xFF - beq _08008824 - ldr r0, _08008820 @ =gUnknown_3000B68 - lsls r1, 2 - adds r1, r0 - ldrh r0, [r1] - b _08008826 - .align 2, 0 -_08008820: .4byte gUnknown_3000B68 -_08008824: - ldr r0, _0800882C @ =0x0000ffff -_08008826: - pop {r1} - bx r1 - .align 2, 0 -_0800882C: .4byte 0x0000ffff - thumb_func_end GetSpriteTileStartByTag - - thumb_func_start IndexOfSpriteTileTag -IndexOfSpriteTileTag: @ 8008830 - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - movs r1, 0 - ldr r3, _08008848 @ =gUnknown_3000AE8 -_0800883A: - lsls r0, r1, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r2 - bne _0800884C - adds r0, r1, 0 - b _08008858 - .align 2, 0 -_08008848: .4byte gUnknown_3000AE8 -_0800884C: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x3F - bls _0800883A - movs r0, 0xFF -_08008858: - pop {r1} - bx r1 - thumb_func_end IndexOfSpriteTileTag - - thumb_func_start GetSpriteTileTagByTileStart -GetSpriteTileTagByTileStart: @ 800885C - push {r4-r6,lr} - lsls r0, 16 - lsrs r3, r0, 16 - movs r2, 0 - ldr r6, _08008884 @ =gUnknown_3000AE8 - ldr r5, _08008888 @ =0x0000ffff - ldr r4, _0800888C @ =gUnknown_3000B68 -_0800886A: - lsls r0, r2, 1 - adds r1, r0, r6 - ldrh r0, [r1] - cmp r0, r5 - beq _08008890 - lsls r0, r2, 2 - adds r0, r4 - ldrh r0, [r0] - cmp r0, r3 - bne _08008890 - ldrh r0, [r1] - b _0800889C - .align 2, 0 -_08008884: .4byte gUnknown_3000AE8 -_08008888: .4byte 0x0000ffff -_0800888C: .4byte gUnknown_3000B68 -_08008890: - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x3F - bls _0800886A - ldr r0, _080088A4 @ =0x0000ffff -_0800889C: - pop {r4-r6} - pop {r1} - bx r1 - .align 2, 0 -_080088A4: .4byte 0x0000ffff - thumb_func_end GetSpriteTileTagByTileStart - - thumb_func_start AllocSpriteTileRange -AllocSpriteTileRange: @ 80088A8 - push {r4-r6,lr} - adds r4, r0, 0 - adds r5, r1, 0 - adds r6, r2, 0 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 16 - lsrs r5, 16 - lsls r6, 16 - lsrs r6, 16 - ldr r0, _080088E4 @ =0x0000ffff - bl IndexOfSpriteTileTag - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080088E8 @ =gUnknown_3000AE8 - lsls r1, r0, 1 - adds r1, r2 - strh r4, [r1] - ldr r1, _080088EC @ =gUnknown_3000B68 - lsls r0, 2 - adds r2, r0, r1 - strh r5, [r2] - adds r1, 0x2 - adds r0, r1 - strh r6, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080088E4: .4byte 0x0000ffff -_080088E8: .4byte gUnknown_3000AE8 -_080088EC: .4byte gUnknown_3000B68 - thumb_func_end AllocSpriteTileRange - - thumb_func_start FreeAllSpritePalettes -FreeAllSpritePalettes: @ 80088F0 - push {r4,lr} - ldr r1, _0800891C @ =gUnknown_3003E58 - movs r0, 0 - strb r0, [r1] - movs r2, 0 - ldr r4, _08008920 @ =gUnknown_3000DE8 - ldr r0, _08008924 @ =0x0000ffff - adds r3, r0, 0 -_08008900: - lsls r0, r2, 1 - adds r0, r4 - ldrh r1, [r0] - orrs r1, r3 - strh r1, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xF - bls _08008900 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0800891C: .4byte gUnknown_3003E58 -_08008920: .4byte gUnknown_3000DE8 -_08008924: .4byte 0x0000ffff - thumb_func_end FreeAllSpritePalettes - - thumb_func_start LoadSpritePalette -LoadSpritePalette: @ 8008928 - push {r4,r5,lr} - adds r5, r0, 0 - ldrh r0, [r5, 0x4] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - beq _0800893E - adds r0, r4, 0 - b _0800896E -_0800893E: - ldr r0, _08008964 @ =0x0000ffff - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0xFF - beq _0800896C - ldr r1, _08008968 @ =gUnknown_3000DE8 - lsls r0, r4, 1 - adds r0, r1 - ldrh r1, [r5, 0x4] - strh r1, [r0] - ldr r0, [r5] - lsls r1, r4, 4 - bl DoLoadSpritePalette - adds r0, r4, 0 - b _0800896E - .align 2, 0 -_08008964: .4byte 0x0000ffff -_08008968: .4byte gUnknown_3000DE8 -_0800896C: - movs r0, 0xFF -_0800896E: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end LoadSpritePalette - - thumb_func_start LoadSpritePalettes -LoadSpritePalettes: @ 8008974 - push {r4,r5,lr} - adds r5, r0, 0 - movs r4, 0 - b _08008982 -_0800897C: - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_08008982: - lsls r0, r4, 3 - adds r1, r0, r5 - ldr r0, [r1] - cmp r0, 0 - beq _0800899A - adds r0, r1, 0 - bl LoadSpritePalette - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xFF - bne _0800897C -_0800899A: - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end LoadSpritePalettes - - thumb_func_start DoLoadSpritePalette -DoLoadSpritePalette: @ 80089A0 - push {lr} - lsls r1, 16 - movs r2, 0x80 - lsls r2, 17 - adds r1, r2 - lsrs r1, 16 - movs r2, 0x20 - bl LoadPalette - pop {r0} - bx r0 - thumb_func_end DoLoadSpritePalette - - thumb_func_start AllocSpritePalette -AllocSpritePalette: @ 80089B8 - push {r4,lr} - lsls r0, 16 - lsrs r4, r0, 16 - ldr r0, _080089D8 @ =0x0000ffff - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xFF - beq _080089E0 - ldr r1, _080089DC @ =gUnknown_3000DE8 - lsls r0, r2, 1 - adds r0, r1 - strh r4, [r0] - adds r0, r2, 0 - b _080089E2 - .align 2, 0 -_080089D8: .4byte 0x0000ffff -_080089DC: .4byte gUnknown_3000DE8 -_080089E0: - movs r0, 0xFF -_080089E2: - pop {r4} - pop {r1} - bx r1 - thumb_func_end AllocSpritePalette - - thumb_func_start IndexOfSpritePaletteTag -IndexOfSpritePaletteTag: @ 80089E8 - push {lr} - lsls r0, 16 - lsrs r2, r0, 16 - ldr r0, _08008A08 @ =gUnknown_3003E58 - ldrb r1, [r0] - cmp r1, 0xF - bhi _08008A1A - ldr r3, _08008A0C @ =gUnknown_3000DE8 -_080089F8: - lsls r0, r1, 1 - adds r0, r3 - ldrh r0, [r0] - cmp r0, r2 - bne _08008A10 - adds r0, r1, 0 - b _08008A1C - .align 2, 0 -_08008A08: .4byte gUnknown_3003E58 -_08008A0C: .4byte gUnknown_3000DE8 -_08008A10: - adds r0, r1, 0x1 - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xF - bls _080089F8 -_08008A1A: - movs r0, 0xFF -_08008A1C: - pop {r1} - bx r1 - thumb_func_end IndexOfSpritePaletteTag - - thumb_func_start GetSpritePaletteTagByPaletteNum -GetSpritePaletteTagByPaletteNum: @ 8008A20 - lsls r0, 24 - ldr r1, _08008A2C @ =gUnknown_3000DE8 - lsrs r0, 23 - adds r0, r1 - ldrh r0, [r0] - bx lr - .align 2, 0 -_08008A2C: .4byte gUnknown_3000DE8 - thumb_func_end GetSpritePaletteTagByPaletteNum - - thumb_func_start FreeSpritePaletteByTag -FreeSpritePaletteByTag: @ 8008A30 - push {lr} - lsls r0, 16 - lsrs r0, 16 - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0xFF - beq _08008A4C - ldr r0, _08008A50 @ =gUnknown_3000DE8 - lsls r1, 1 - adds r1, r0 - ldr r0, _08008A54 @ =0x0000ffff - strh r0, [r1] -_08008A4C: - pop {r0} - bx r0 - .align 2, 0 -_08008A50: .4byte gUnknown_3000DE8 -_08008A54: .4byte 0x0000ffff - thumb_func_end FreeSpritePaletteByTag - - thumb_func_start SetSubspriteTables -SetSubspriteTables: @ 8008A58 - str r1, [r0, 0x18] - adds r0, 0x42 - movs r1, 0x40 - strb r1, [r0] - bx lr - thumb_func_end SetSubspriteTables - - thumb_func_start AddSpriteToOamBuffer -AddSpriteToOamBuffer: @ 8008A64 - push {r4,lr} - adds r4, r0, 0 - adds r3, r1, 0 - ldr r1, _08008A78 @ =gUnknown_2021B44 - ldrb r0, [r3] - ldrb r1, [r1] - cmp r0, r1 - bcc _08008A7C - movs r0, 0x1 - b _08008AC4 - .align 2, 0 -_08008A78: .4byte gUnknown_2021B44 -_08008A7C: - ldr r0, [r4, 0x18] - cmp r0, 0 - beq _08008A90 - adds r0, r4, 0 - adds r0, 0x42 - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0 - bne _08008AB0 -_08008A90: - ldr r0, _08008AAC @ =gMain - ldrb r2, [r3] - lsls r2, 3 - adds r0, 0x38 - adds r2, r0 - ldr r0, [r4] - ldr r1, [r4, 0x4] - str r0, [r2] - str r1, [r2, 0x4] - ldrb r0, [r3] - adds r0, 0x1 - strb r0, [r3] - movs r0, 0 - b _08008AC4 - .align 2, 0 -_08008AAC: .4byte gMain -_08008AB0: - ldrb r1, [r3] - lsls r1, 3 - ldr r0, _08008ACC @ =gMain + 0x38 - adds r1, r0 - adds r0, r4, 0 - adds r2, r3, 0 - bl AddSubspritesToOamBuffer - lsls r0, 24 - lsrs r0, 24 -_08008AC4: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_08008ACC: .4byte gMain + 0x38 - thumb_func_end AddSpriteToOamBuffer - - thumb_func_start AddSubspritesToOamBuffer -AddSubspritesToOamBuffer: @ 8008AD0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - adds r3, r0, 0 - str r1, [sp] - mov r8, r2 - ldr r0, _08008AF0 @ =gUnknown_2021B44 - ldrb r1, [r2] - ldrb r0, [r0] - cmp r1, r0 - bcc _08008AF4 -_08008AEC: - movs r0, 0x1 - b _08008CCA - .align 2, 0 -_08008AF0: .4byte gUnknown_2021B44 -_08008AF4: - adds r0, r3, 0 - adds r0, 0x42 - ldrb r1, [r0] - lsls r1, 26 - lsrs r1, 23 - ldr r2, [r3, 0x18] - adds r7, r2, r1 - mov r12, r3 - str r0, [sp, 0x18] - cmp r7, 0 - beq _08008B10 - ldr r0, [r7, 0x4] - cmp r0, 0 - bne _08008B26 -_08008B10: - mov r2, r12 - ldr r0, [r2] - ldr r1, [r2, 0x4] - ldr r2, [sp] - str r0, [r2] - str r1, [r2, 0x4] - mov r1, r8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _08008CC8 -_08008B26: - mov r2, r12 - ldrh r0, [r2, 0x4] - lsls r0, 22 - lsrs r0, 22 - str r0, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0xC] - ldrb r0, [r2, 0x3] - lsls r0, 26 - lsrs r0, 27 - asrs r1, r0, 3 - str r1, [sp, 0x10] - movs r1, 0x1 - ldr r2, [sp, 0x10] - ands r2, r1 - str r2, [sp, 0x10] - asrs r0, 4 - mov r10, r0 - ands r0, r1 - mov r10, r0 - mov r1, r12 - ldrh r0, [r1, 0x2] - lsls r0, 23 - lsrs r0, 23 - adds r1, 0x28 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 - lsls r0, 16 - lsrs r2, r0, 16 - mov r1, r12 - ldrb r0, [r1] - adds r1, 0x29 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - subs r0, r1 - lsls r0, 16 - lsrs r0, 16 - str r0, [sp, 0x8] - movs r0, 0 - mov r9, r0 - ldr r1, [sp, 0xC] - cmp r9, r1 - bcc _08008B84 - b _08008CC8 -_08008B84: - lsls r0, r2, 16 - asrs r0, 16 - str r0, [sp, 0x14] -_08008B8A: - mov r2, r8 - ldrb r0, [r2] - ldr r1, _08008CDC @ =gUnknown_2021B44 - ldrb r1, [r1] - cmp r0, r1 - bcs _08008AEC - ldr r0, [r7, 0x4] - mov r2, r9 - lsls r6, r2, 2 - adds r2, r6, r0 - movs r0, 0 - ldrsb r0, [r2, r0] - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0x1 - ldrsb r0, [r2, r0] - lsls r0, 16 - lsrs r5, r0, 16 - ldr r0, [sp, 0x10] - cmp r0, 0 - beq _08008BE0 - ldr r0, [r2] - lsls r1, r0, 12 - lsrs r1, 30 - lsls r1, 2 - lsls r0, 14 - lsrs r0, 30 - lsls r0, 4 - adds r1, r0 - ldr r0, _08008CE0 @ =gUnknown_8231DA8 - adds r1, r0 - ldrb r1, [r1] - lsls r1, 24 - asrs r1, 24 - lsls r0, r4, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r4, r0, 16 - mvns r0, r4 - adds r0, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_08008BE0: - mov r1, r10 - cmp r1, 0 - beq _08008C12 - ldr r0, [r2] - lsls r1, r0, 12 - lsrs r1, 30 - lsls r1, 2 - lsls r0, 14 - lsrs r0, 30 - lsls r0, 4 - adds r1, r0 - ldr r2, _08008CE0 @ =gUnknown_8231DA8 - adds r1, r2 - ldrb r1, [r1, 0x1] - lsls r1, 24 - asrs r1, 24 - lsls r0, r5, 16 - asrs r0, 16 - adds r0, r1 - lsls r0, 16 - lsrs r5, r0, 16 - mvns r0, r5 - adds r0, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_08008C12: - mov r1, r9 - lsls r0, r1, 3 - ldr r2, [sp] - adds r3, r0, r2 - mov r2, r12 - ldr r0, [r2] - ldr r1, [r2, 0x4] - str r0, [r3] - str r1, [r3, 0x4] - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldr r1, [r0] - lsls r1, 14 - lsrs r1, 30 - lsls r1, 6 - ldrb r2, [r3, 0x1] - movs r0, 0x3F - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x1] - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldr r1, [r0] - lsls r1, 12 - lsrs r1, 30 - lsls r1, 6 - ldrb r2, [r3, 0x3] - movs r0, 0x3F - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x3] - lsls r1, r4, 16 - asrs r1, 16 - ldr r0, [sp, 0x14] - adds r1, r0, r1 - ldr r2, _08008CE4 @ =0x000001ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x2] - ldr r0, _08008CE8 @ =0xfffffe00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x2] - ldr r1, [sp, 0x8] - adds r0, r1, r5 - strb r0, [r3] - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldr r1, [r0] - lsls r1, 2 - lsrs r1, 22 - ldr r2, [sp, 0x4] - adds r1, r2, r1 - ldr r2, _08008CEC @ =0x000003ff - adds r0, r2, 0 - ands r1, r0 - ldrh r2, [r3, 0x4] - ldr r0, _08008CF0 @ =0xfffffc00 - ands r0, r2 - orrs r0, r1 - strh r0, [r3, 0x4] - ldr r0, [sp, 0x18] - ldrb r1, [r0] - movs r0, 0xC0 - ands r0, r1 - cmp r0, 0x80 - beq _08008CAE - ldr r0, [r7, 0x4] - adds r0, r6, r0 - ldr r1, [r0] - lsrs r1, 30 - lsls r1, 2 - ldrb r2, [r3, 0x5] - movs r0, 0xD - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0x5] -_08008CAE: - mov r0, r9 - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - mov r1, r8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - ldr r2, [sp, 0xC] - cmp r9, r2 - bcs _08008CC8 - b _08008B8A -_08008CC8: - movs r0, 0 -_08008CCA: - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08008CDC: .4byte gUnknown_2021B44 -_08008CE0: .4byte gUnknown_8231DA8 -_08008CE4: .4byte 0x000001ff -_08008CE8: .4byte 0xfffffe00 -_08008CEC: .4byte 0x000003ff -_08008CF0: .4byte 0xfffffc00 - thumb_func_end AddSubspritesToOamBuffer - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/ss_anne.s b/asm/ss_anne.s index 5fdbe9600..0211fc212 100644 --- a/asm/ss_anne.s +++ b/asm/ss_anne.s @@ -102,7 +102,7 @@ _0815D3D6: lsls r0, 2 ldr r1, _0815D42C @ =gUnknown_2036E38 adds r0, r1 - ldr r2, _0815D430 @ =gUnknown_202063C + ldr r2, _0815D430 @ =gSprites ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -129,7 +129,7 @@ _0815D3D6: _0815D424: .4byte gUnknown_3005098 _0815D428: .4byte gSaveBlock1Ptr _0815D42C: .4byte gUnknown_2036E38 -_0815D430: .4byte gUnknown_202063C +_0815D430: .4byte gSprites _0815D434: .4byte sub_815D454 _0815D438: movs r1, 0x4 @@ -199,7 +199,7 @@ sub_815D498: @ 815D498 lsls r0, 2 ldr r1, _0815D50C @ =gUnknown_2036E38 adds r0, r1 - ldr r4, _0815D510 @ =gUnknown_202063C + ldr r4, _0815D510 @ =gSprites ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -239,7 +239,7 @@ sub_815D498: @ 815D498 .align 2, 0 _0815D508: .4byte gSaveBlock1Ptr _0815D50C: .4byte gUnknown_2036E38 -_0815D510: .4byte gUnknown_202063C +_0815D510: .4byte gSprites _0815D514: .4byte gUnknown_8479C88 thumb_func_end sub_815D498 @@ -262,7 +262,7 @@ sub_815D518: @ 815D518 lsls r0, 2 ldr r1, _0815D59C @ =gUnknown_2036E38 adds r0, r1 - ldr r2, _0815D5A0 @ =gUnknown_202063C + ldr r2, _0815D5A0 @ =gSprites ldrb r1, [r0, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -309,7 +309,7 @@ _0815D58E: .align 2, 0 _0815D598: .4byte gSaveBlock1Ptr _0815D59C: .4byte gUnknown_2036E38 -_0815D5A0: .4byte gUnknown_202063C +_0815D5A0: .4byte gSprites thumb_func_end sub_815D518 thumb_func_start sub_815D5A4 @@ -330,7 +330,7 @@ sub_815D5A4: @ 815D5A4 lsls r0, 2 ldr r1, _0815D618 @ =gUnknown_2036E38 adds r0, r1 - ldr r4, _0815D61C @ =gUnknown_202063C + ldr r4, _0815D61C @ =gSprites ldrb r0, [r0, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -372,7 +372,7 @@ _0815D60C: .align 2, 0 _0815D614: .4byte gSaveBlock1Ptr _0815D618: .4byte gUnknown_2036E38 -_0815D61C: .4byte gUnknown_202063C +_0815D61C: .4byte gSprites _0815D620: .4byte gUnknown_8479CC0 thumb_func_end sub_815D5A4 diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s index 9430d764b..a9edb5b44 100644 --- a/asm/teachy_tv.s +++ b/asm/teachy_tv.s @@ -538,7 +538,7 @@ sub_815AFEC: @ 815AFEC sub_815B014: @ 815B014 push {lr} sub sp, 0x4 - ldr r1, _0815B054 @ =nullsub_8 + ldr r1, _0815B054 @ =SpriteCallbackDummy movs r0, 0x8 str r0, [sp] movs r0, 0x5A @@ -547,7 +547,7 @@ sub_815B014: @ 815B014 bl AddPseudoFieldObject lsls r0, 24 lsrs r0, 24 - ldr r1, _0815B058 @ =gUnknown_202063C + ldr r1, _0815B058 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -568,8 +568,8 @@ sub_815B014: @ 815B014 pop {r1} bx r1 .align 2, 0 -_0815B054: .4byte nullsub_8 -_0815B058: .4byte gUnknown_202063C +_0815B054: .4byte SpriteCallbackDummy +_0815B058: .4byte gSprites thumb_func_end sub_815B014 thumb_func_start sub_815B05C @@ -580,7 +580,7 @@ sub_815B05C: @ 815B05C lsrs r4, 24 lsls r3, 24 lsrs r3, 24 - ldr r5, _0815B090 @ =gUnknown_202063C + ldr r5, _0815B090 @ =gSprites lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -600,7 +600,7 @@ sub_815B05C: @ 815B05C pop {r0} bx r0 .align 2, 0 -_0815B090: .4byte gUnknown_202063C +_0815B090: .4byte gSprites thumb_func_end sub_815B05C thumb_func_start sub_815B094 @@ -689,7 +689,7 @@ sub_815B118: @ 815B118 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815B194 @ =gUnknown_202063C + ldr r1, _0815B194 @ =gSprites adds r7, r0, r1 movs r0, 0x1 bl ClearWindowTilemap @@ -731,7 +731,7 @@ sub_815B118: @ 815B118 b _0815B1B8 .align 2, 0 _0815B190: .4byte gUnknown_3005098 -_0815B194: .4byte gUnknown_202063C +_0815B194: .4byte gSprites _0815B198: .4byte gUnknown_203F444 _0815B19C: .4byte gUnknown_203F450 _0815B1A0: .4byte 0x00004004 @@ -1090,7 +1090,7 @@ sub_815B454: @ 815B454 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815B488 @ =gUnknown_202063C + ldr r1, _0815B488 @ =gSprites adds r1, r0, r1 ldrh r2, [r4, 0x4] movs r3, 0x4 @@ -1102,7 +1102,7 @@ sub_815B454: @ 815B454 b _0815B4B8 .align 2, 0 _0815B484: .4byte gUnknown_3005098 -_0815B488: .4byte gUnknown_202063C +_0815B488: .4byte gSprites _0815B48C: ldrh r2, [r1, 0x24] movs r3, 0x24 @@ -1362,7 +1362,7 @@ sub_815B664: @ 815B664 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815B6A4 @ =gUnknown_202063C + ldr r1, _0815B6A4 @ =gSprites adds r0, r1 movs r1, 0x5 bl StartSpriteAnim @@ -1379,7 +1379,7 @@ sub_815B664: @ 815B664 bx r0 .align 2, 0 _0815B6A0: .4byte gUnknown_3005098 -_0815B6A4: .4byte gUnknown_202063C +_0815B6A4: .4byte gSprites thumb_func_end sub_815B664 thumb_func_start sub_815B6A8 @@ -1398,7 +1398,7 @@ sub_815B6A8: @ 815B6A8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815B734 @ =gUnknown_202063C + ldr r1, _0815B734 @ =gSprites adds r6, r0, r1 movs r1, 0x80 lsls r1, 1 @@ -1452,7 +1452,7 @@ _0815B726: bx r0 .align 2, 0 _0815B730: .4byte gUnknown_3005098 -_0815B734: .4byte gUnknown_202063C +_0815B734: .4byte gSprites _0815B738: .4byte gUnknown_203F450 _0815B73C: .4byte 0x00004005 thumb_func_end sub_815B6A8 @@ -1474,7 +1474,7 @@ sub_815B740: @ 815B740 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815B7D8 @ =gUnknown_202063C + ldr r1, _0815B7D8 @ =gSprites adds r6, r0, r1 movs r1, 0x80 lsls r1, 1 @@ -1534,7 +1534,7 @@ _0815B7CA: bx r0 .align 2, 0 _0815B7D4: .4byte gUnknown_3005098 -_0815B7D8: .4byte gUnknown_202063C +_0815B7D8: .4byte gSprites _0815B7DC: .4byte gUnknown_203F450 _0815B7E0: .4byte 0x00004004 thumb_func_end sub_815B740 @@ -1556,7 +1556,7 @@ sub_815B7E4: @ 815B7E4 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 - ldr r0, _0815B83C @ =gUnknown_202063C + ldr r0, _0815B83C @ =gSprites adds r4, r0 adds r0, r4, 0 movs r1, 0x6 @@ -1582,7 +1582,7 @@ sub_815B7E4: @ 815B7E4 bx r0 .align 2, 0 _0815B838: .4byte gUnknown_3005098 -_0815B83C: .4byte gUnknown_202063C +_0815B83C: .4byte gSprites thumb_func_end sub_815B7E4 thumb_func_start sub_815B840 @@ -1601,7 +1601,7 @@ sub_815B840: @ 815B840 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815B894 @ =gUnknown_202063C + ldr r1, _0815B894 @ =gSprites adds r4, r0, r1 ldrh r1, [r4, 0x24] movs r0, 0xF @@ -1629,7 +1629,7 @@ _0815B87E: b _0815B89C .align 2, 0 _0815B890: .4byte gUnknown_3005098 -_0815B894: .4byte gUnknown_202063C +_0815B894: .4byte gSprites _0815B898: subs r0, r1, 0x1 strh r0, [r4, 0x24] @@ -1941,7 +1941,7 @@ sub_815BAA0: @ 815BAA0 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0815BB44 @ =gUnknown_202063C + ldr r0, _0815BB44 @ =gSprites adds r4, r1, r0 strh r6, [r4, 0x24] adds r0, r5, 0 @@ -1970,7 +1970,7 @@ _0815BB34: .4byte gUnknown_203F450 _0815BB38: .4byte 0x00004006 _0815BB3C: .4byte 0xfff00000 _0815BB40: .4byte gUnknown_83A0010 -_0815BB44: .4byte gUnknown_202063C +_0815BB44: .4byte gSprites _0815BB48: .4byte sub_815BB6C _0815BB4C: ldr r1, _0815BB68 @ =gUnknown_84795B8 @@ -2007,7 +2007,7 @@ sub_815BB6C: @ 815BB6C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815BBA8 @ =gUnknown_202063C + ldr r1, _0815BBA8 @ =gSprites adds r5, r0, r1 ldr r0, _0815BBAC @ =gUnknown_203F450 ldr r0, [r0] @@ -2021,7 +2021,7 @@ sub_815BB6C: @ 815BB6C b _0815BC3A .align 2, 0 _0815BBA4: .4byte gUnknown_3005098 -_0815BBA8: .4byte gUnknown_202063C +_0815BBA8: .4byte gSprites _0815BBAC: .4byte gUnknown_203F450 _0815BBB0: .4byte 0x00004006 _0815BBB4: diff --git a/asm/text.s b/asm/text.s index 31643b204..4c554ae88 100644 --- a/asm/text.s +++ b/asm/text.s @@ -96,7 +96,7 @@ sub_8006300: @ 8006300 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r1, _08006394 @ =gUnknown_202063C + ldr r1, _08006394 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -125,7 +125,7 @@ sub_8006300: @ 8006300 _08006388: .4byte gUnknown_81EA68C _0800638C: .4byte gUnknown_81EA6A4 _08006390: .4byte gUnknown_81EA6B4 -_08006394: .4byte gUnknown_202063C +_08006394: .4byte gSprites thumb_func_end sub_8006300 thumb_func_start sub_8006398 @@ -137,7 +137,7 @@ sub_8006398: @ 8006398 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080063C4 @ =gUnknown_202063C + ldr r1, _080063C4 @ =gSprites adds r0, r1 bl DestroySprite movs r4, 0x80 @@ -150,7 +150,7 @@ sub_8006398: @ 8006398 pop {r0} bx r0 .align 2, 0 -_080063C4: .4byte gUnknown_202063C +_080063C4: .4byte gSprites thumb_func_end sub_8006398 thumb_func_start DrawKeypadIcon diff --git a/asm/title_screen.s b/asm/title_screen.s index 4dc0c43da..e3c2adb02 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -1815,7 +1815,7 @@ _080797CA: lsrs r1, r0, 24 cmp r1, 0x40 beq _08079834 - ldr r0, _0807982C @ =gUnknown_202063C + ldr r0, _0807982C @ =gSprites mov r12, r0 lsls r0, r1, 4 adds r0, r1 @@ -1854,7 +1854,7 @@ _0807980C: b _08079836 .align 2, 0 _08079828: .4byte gUnknown_83BFB1C -_0807982C: .4byte gUnknown_202063C +_0807982C: .4byte gSprites _08079830: .4byte sub_8079730 _08079834: movs r0, 0 @@ -2137,7 +2137,7 @@ sub_8079A40: @ 8079A40 adds r4, r1, 0 cmp r1, 0x40 beq _08079A74 - ldr r3, _08079A80 @ =gUnknown_202063C + ldr r3, _08079A80 @ =gSprites lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -2157,7 +2157,7 @@ _08079A74: bx r1 .align 2, 0 _08079A7C: .4byte gUnknown_83BFB5C -_08079A80: .4byte gUnknown_202063C +_08079A80: .4byte gSprites _08079A84: .4byte sub_8079AD8 thumb_func_end sub_8079A40 @@ -2168,7 +2168,7 @@ sub_8079A88: @ 8079A88 lsrs r2, r0, 24 cmp r2, 0x40 beq _08079AA0 - ldr r0, _08079AA4 @ =gUnknown_202063C + ldr r0, _08079AA4 @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -2179,7 +2179,7 @@ _08079AA0: pop {r0} bx r0 .align 2, 0 -_08079AA4: .4byte gUnknown_202063C +_08079AA4: .4byte gSprites thumb_func_end sub_8079A88 thumb_func_start sub_8079AA8 @@ -2192,7 +2192,7 @@ sub_8079AA8: @ 8079AA8 movs r0, 0 b _08079ACE _08079AB6: - ldr r1, _08079AD4 @ =gUnknown_202063C + ldr r1, _08079AD4 @ =gSprites lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -2208,7 +2208,7 @@ _08079ACE: pop {r1} bx r1 .align 2, 0 -_08079AD4: .4byte gUnknown_202063C +_08079AD4: .4byte gSprites thumb_func_end sub_8079AA8 thumb_func_start sub_8079AD8 diff --git a/asm/tm_case.s b/asm/tm_case.s index c551cfddf..8883ebe63 100644 --- a/asm/tm_case.s +++ b/asm/tm_case.s @@ -3694,7 +3694,7 @@ sub_813368C: @ 813368C lsls r4, r7, 4 adds r4, r7 lsls r4, 2 - ldr r0, _081336EC @ =gUnknown_202063C + ldr r0, _081336EC @ =gSprites adds r4, r0 adds r0, r4, 0 adds r1, r5, 0 @@ -3716,13 +3716,13 @@ sub_813368C: @ 813368C b _08133700 .align 2, 0 _081336E8: .4byte gUnknown_8463220 -_081336EC: .4byte gUnknown_202063C +_081336EC: .4byte gSprites _081336F0: .4byte gUnknown_8250C04 _081336F4: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 - ldr r1, _08133710 @ =gUnknown_202063C + ldr r1, _08133710 @ =gSprites adds r0, r1 movs r1, 0xFF _08133700: @@ -3734,7 +3734,7 @@ _08133700: pop {r1} bx r1 .align 2, 0 -_08133710: .4byte gUnknown_202063C +_08133710: .4byte gSprites thumb_func_end sub_813368C thumb_func_start sub_8133714 @@ -3854,7 +3854,7 @@ sub_81337E4: @ 81337E4 push {r4,lr} lsls r0, 24 lsrs r0, 24 - ldr r3, _08133808 @ =gUnknown_202063C + ldr r3, _08133808 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -3870,7 +3870,7 @@ sub_81337E4: @ 81337E4 pop {r0} bx r0 .align 2, 0 -_08133808: .4byte gUnknown_202063C +_08133808: .4byte gSprites _0813380C: .4byte sub_8133810 thumb_func_end sub_81337E4 @@ -3938,11 +3938,11 @@ _08133886: cmp r0, 0 bgt _0813389C _08133890: - ldr r0, _08133898 @ =nullsub_8 + ldr r0, _08133898 @ =SpriteCallbackDummy str r0, [r5, 0x1C] b _081338A2 .align 2, 0 -_08133898: .4byte nullsub_8 +_08133898: .4byte SpriteCallbackDummy _0813389C: adds r0, r1, 0 subs r0, 0xA diff --git a/asm/trade.s b/asm/trade.s index 8f33fa26a..0cfac7187 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -2025,7 +2025,7 @@ sub_804D764: @ 804D764 movs r3, 0 ldr r5, _0804D7B4 @ =gUnknown_2031DA8 mov r8, r5 - ldr r0, _0804D7B8 @ =gUnknown_202063C + ldr r0, _0804D7B8 @ =gSprites mov r12, r0 movs r1, 0x5 negs r1, r1 @@ -2060,7 +2060,7 @@ _0804D782: b _0804D7C2 .align 2, 0 _0804D7B4: .4byte gUnknown_2031DA8 -_0804D7B8: .4byte gUnknown_202063C +_0804D7B8: .4byte gSprites _0804D7BC: adds r0, 0x38 adds r0, r3 @@ -3171,7 +3171,7 @@ TradeMenuMoveCursor: @ 804E074 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0804E0C8 @ =gUnknown_202063C + ldr r4, _0804E0C8 @ =gSprites adds r0, r4 movs r1, 0x1 bl StartSpriteAnim @@ -3194,7 +3194,7 @@ TradeMenuMoveCursor: @ 804E074 b _0804E114 .align 2, 0 _0804E0C4: .4byte gUnknown_2031DA8 -_0804E0C8: .4byte gUnknown_202063C +_0804E0C8: .4byte gSprites _0804E0CC: ldr r4, _0804E128 @ =gUnknown_2031DA8 ldr r0, [r4] @@ -3203,7 +3203,7 @@ _0804E0CC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _0804E12C @ =gUnknown_202063C + ldr r5, _0804E12C @ =gSprites adds r0, r5 movs r1, 0 bl StartSpriteAnim @@ -3244,7 +3244,7 @@ _0804E120: bx r0 .align 2, 0 _0804E128: .4byte gUnknown_2031DA8 -_0804E12C: .4byte gUnknown_202063C +_0804E12C: .4byte gSprites _0804E130: .4byte gUnknown_8261E40 thumb_func_end TradeMenuMoveCursor @@ -3496,7 +3496,7 @@ sub_804E330: @ 804E330 adds r0, 0x6F movs r1, 0 strb r1, [r0] - ldr r2, _0804E37C @ =gUnknown_202063C + ldr r2, _0804E37C @ =gSprites ldr r0, [r3] adds r0, 0x34 ldrb r1, [r0] @@ -3524,7 +3524,7 @@ sub_804E330: @ 804E330 bx r0 .align 2, 0 _0804E378: .4byte gUnknown_2031DA8 -_0804E37C: .4byte gUnknown_202063C +_0804E37C: .4byte gSprites _0804E380: .4byte gUnknown_8261ECC _0804E384: .4byte 0x06010000 thumb_func_end sub_804E330 @@ -3597,7 +3597,7 @@ _0804E404: .4byte _0804E450 _0804E41C: bl sub_804E134 - ldr r2, _0804E43C @ =gUnknown_202063C + ldr r2, _0804E43C @ =gSprites ldr r0, _0804E440 @ =gUnknown_2031DA8 ldr r0, [r0] adds r0, 0x34 @@ -3612,7 +3612,7 @@ _0804E41C: orrs r1, r2 b _0804E460 .align 2, 0 -_0804E43C: .4byte gUnknown_202063C +_0804E43C: .4byte gSprites _0804E440: .4byte gUnknown_2031DA8 _0804E444: movs r0, 0x3 @@ -4049,7 +4049,7 @@ _0804E766: movs r0, 0x5 movs r1, 0 bl sub_804F488 - ldr r2, _0804E7B4 @ =gUnknown_202063C + ldr r2, _0804E7B4 @ =gSprites ldr r0, [r4] adds r0, 0x34 ldrb r1, [r0] @@ -4071,7 +4071,7 @@ _0804E766: .align 2, 0 _0804E7AC: .4byte gUnknown_2031DA8 _0804E7B0: .4byte 0x0000eeaa -_0804E7B4: .4byte gUnknown_202063C +_0804E7B4: .4byte gSprites _0804E7B8: movs r0, 0x5 bl PlaySE @@ -4220,7 +4220,7 @@ _0804E8A6: adds r0, 0x6F movs r1, 0 strb r1, [r0] - ldr r3, _0804E904 @ =gUnknown_202063C + ldr r3, _0804E904 @ =gSprites ldr r0, [r2] adds r0, 0x34 ldrb r1, [r0] @@ -4241,7 +4241,7 @@ _0804E8F4: .align 2, 0 _0804E8FC: .4byte gMain _0804E900: .4byte gUnknown_2031DA8 -_0804E904: .4byte gUnknown_202063C +_0804E904: .4byte gSprites thumb_func_end sub_804E880 thumb_func_start sub_804E908 @@ -4538,7 +4538,7 @@ _0804EB46: ldrb r0, [r0] cmp r8, r0 bcs _0804EB9A - ldr r0, _0804ECA0 @ =gUnknown_202063C + ldr r0, _0804ECA0 @ =gSprites mov r8, r0 ldr r4, _0804ECA4 @ =gUnknown_2031DA8 ldr r0, [sp, 0x60] @@ -4585,7 +4585,7 @@ _0804EBA2: lsrs r5, r0, 24 cmp r5, 0x5 bls _0804EBA2 - ldr r1, _0804ECA0 @ =gUnknown_202063C + ldr r1, _0804ECA0 @ =gSprites mov r8, r1 ldr r2, _0804ECA4 @ =gUnknown_2031DA8 ldr r0, [r2] @@ -4695,13 +4695,13 @@ _0804EC98: bl sub_804F3B4 b _0804EE54 .align 2, 0 -_0804ECA0: .4byte gUnknown_202063C +_0804ECA0: .4byte gSprites _0804ECA4: .4byte gUnknown_2031DA8 _0804ECA8: .4byte gUnknown_8261E40 _0804ECAC: .4byte sub_809718C _0804ECB0: .4byte gUnknown_8260A32 _0804ECB4: - ldr r2, _0804ECE4 @ =gUnknown_202063C + ldr r2, _0804ECE4 @ =gSprites ldr r1, [sp, 0x60] lsls r0, r1, 1 adds r0, r1 @@ -4726,7 +4726,7 @@ _0804ECDC: strb r0, [r3] b _0804EE54 .align 2, 0 -_0804ECE4: .4byte gUnknown_202063C +_0804ECE4: .4byte gSprites _0804ECE8: .4byte sub_809718C _0804ECEC: ldr r1, _0804EE08 @ =gUnknown_8260834 @@ -4746,7 +4746,7 @@ _0804ECEC: bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0x1 bl CopyBgTilemapBufferToVram - ldr r6, _0804EE0C @ =gUnknown_202063C + ldr r6, _0804EE0C @ =gSprites ldr r1, _0804EE10 @ =gUnknown_2031DA8 ldr r4, [r1] ldr r2, [sp, 0x60] @@ -4863,7 +4863,7 @@ _0804ECEC: b _0804EE4A .align 2, 0 _0804EE08: .4byte gUnknown_8260834 -_0804EE0C: .4byte gUnknown_202063C +_0804EE0C: .4byte gSprites _0804EE10: .4byte gUnknown_2031DA8 _0804EE14: .4byte gUnknown_8261E40 _0804EE18: .4byte gUnknown_8261F18 @@ -5500,7 +5500,7 @@ sub_804F2E8: @ 804F2E8 ldrb r0, [r0] cmp r7, r0 bge _0804F39A - ldr r6, _0804F3AC @ =gUnknown_202063C + ldr r6, _0804F3AC @ =gSprites mov r9, r3 mov r1, r12 lsls r0, r1, 1 @@ -5584,7 +5584,7 @@ _0804F39A: bx r0 .align 2, 0 _0804F3A8: .4byte gUnknown_2031DA8 -_0804F3AC: .4byte gUnknown_202063C +_0804F3AC: .4byte gSprites _0804F3B0: .4byte gUnknown_8261E40 thumb_func_end sub_804F2E8 @@ -6347,7 +6347,7 @@ _0804F988: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0804F9D4 @ =gUnknown_202063C + ldr r1, _0804F9D4 @ =gSprites adds r0, r1 adds r2, 0x5D adds r2, r3 @@ -6375,7 +6375,7 @@ _0804F9BE: bx r0 .align 2, 0 _0804F9D0: .4byte gUnknown_2031DA8 -_0804F9D4: .4byte gUnknown_202063C +_0804F9D4: .4byte gSprites thumb_func_end sub_804F964 thumb_func_start sub_804F9D8 @@ -7348,7 +7348,7 @@ _080500C8: adds r1, 0x8E adds r1, r6 strb r0, [r1] - ldr r3, _08050130 @ =gUnknown_202063C + ldr r3, _08050130 @ =gSprites ldr r0, [r4] adds r0, 0x8E adds r0, r6 @@ -7371,7 +7371,7 @@ _080500C8: lsls r0, 2 adds r3, 0x1C adds r0, r3 - ldr r1, _08050134 @ =nullsub_8 + ldr r1, _08050134 @ =SpriteCallbackDummy str r1, [r0] _0805011E: pop {r3} @@ -7382,8 +7382,8 @@ _0805011E: .align 2, 0 _08050128: .4byte gUnknown_20244DC _0805012C: .4byte gUnknown_2031DAC -_08050130: .4byte gUnknown_202063C -_08050134: .4byte nullsub_8 +_08050130: .4byte gSprites +_08050134: .4byte SpriteCallbackDummy thumb_func_end sub_804FFE4 thumb_func_start sub_8050138 @@ -9271,7 +9271,7 @@ _08050F6C: .4byte _08052318 .4byte _08052198 _0805139C: - ldr r3, _08051408 @ =gUnknown_202063C + ldr r3, _08051408 @ =gSprites ldr r0, [r7] adds r0, 0x8E ldrb r1, [r0] @@ -9322,7 +9322,7 @@ _0805139C: bl PlayNewMapMusic bl _08052318 .align 2, 0 -_08051408: .4byte gUnknown_202063C +_08051408: .4byte gSprites _0805140C: .4byte 0x0000ff4c _08051410: .4byte gUnknown_82349CC _08051414: @@ -9333,7 +9333,7 @@ _08051414: ldrsh r0, [r6, r1] cmp r0, 0 ble _08051448 - ldr r2, _08051444 @ =gUnknown_202063C + ldr r2, _08051444 @ =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -9349,9 +9349,9 @@ _08051414: strh r0, [r6] bl _08052318 .align 2, 0 -_08051444: .4byte gUnknown_202063C +_08051444: .4byte gSprites _08051448: - ldr r2, _0805146C @ =gUnknown_202063C + ldr r2, _0805146C @ =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -9368,7 +9368,7 @@ _08051448: strh r0, [r1] bl _08052318 .align 2, 0 -_0805146C: .4byte gUnknown_202063C +_0805146C: .4byte gSprites _08051470: ldr r4, _080514AC @ =gStringVar4 ldr r1, _080514B0 @ =gUnknown_841E1E9 @@ -9413,7 +9413,7 @@ _080514C8: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] - ldr r2, _0805151C @ =gUnknown_202063C + ldr r2, _0805151C @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -9449,12 +9449,12 @@ _080514C8: bl sub_8054508 bl _08052318 .align 2, 0 -_0805151C: .4byte gUnknown_202063C +_0805151C: .4byte gSprites _08051520: .4byte 0x000fffff _08051524: .4byte gStringVar4 _08051528: .4byte gUnknown_841E200 _0805152C: - ldr r5, _08051588 @ =gUnknown_202063C + ldr r5, _08051588 @ =gSprites ldr r0, [r7] adds r0, 0xD2 ldrb r1, [r0] @@ -9465,7 +9465,7 @@ _0805152C: adds r4, 0x1C adds r0, r4 ldr r1, [r0] - ldr r0, _0805158C @ =nullsub_8 + ldr r0, _0805158C @ =SpriteCallbackDummy cmp r1, r0 beq _0805154C bl _08052318 @@ -9498,8 +9498,8 @@ _0805154C: ldr r1, [r7] bl _080522AC .align 2, 0 -_08051588: .4byte gUnknown_202063C -_0805158C: .4byte nullsub_8 +_08051588: .4byte gSprites +_0805158C: .4byte SpriteCallbackDummy _08051590: .4byte gUnknown_826CDE4 _08051594: .4byte sub_8053938 _08051598: @@ -9622,7 +9622,7 @@ _08051678: .align 2, 0 _08051694: .4byte gUnknown_826CF30 _08051698: - ldr r2, _080516D8 @ =gUnknown_202063C + ldr r2, _080516D8 @ =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -9650,7 +9650,7 @@ _080516B8: ldr r1, [r7] bl _080522AC .align 2, 0 -_080516D8: .4byte gUnknown_202063C +_080516D8: .4byte gSprites _080516DC: .4byte 0x0000040c _080516E0: ldr r2, [r7] @@ -9715,7 +9715,7 @@ _08051730: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08051780 @ =gUnknown_202063C + ldr r1, _08051780 @ =gSprites adds r0, r1 movs r1, 0x1 bl StartSpriteAnim @@ -9725,7 +9725,7 @@ _08051730: _08051774: .4byte gUnknown_826CE44 _08051778: .4byte gUnknown_2031DAC _0805177C: .4byte gUnknown_826CE84 -_08051780: .4byte gUnknown_202063C +_08051780: .4byte gSprites _08051784: ldr r2, [r7] adds r1, r2, 0 @@ -9748,7 +9748,7 @@ _0805179E: .align 2, 0 _080517AC: .4byte 0x00001241 _080517B0: - ldr r2, _08051804 @ =gUnknown_202063C + ldr r2, _08051804 @ =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -9789,7 +9789,7 @@ _080517F6: strh r0, [r1] bl _08052318 .align 2, 0 -_08051804: .4byte gUnknown_202063C +_08051804: .4byte gSprites _08051808: movs r1, 0x1 negs r1, r1 @@ -9822,7 +9822,7 @@ _0805183C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08051874 @ =gUnknown_202063C + ldr r4, _08051874 @ =gSprites adds r0, r4 bl DestroySprite ldr r0, [r7] @@ -9839,7 +9839,7 @@ _0805183C: bl _080522AC .align 2, 0 _08051870: .4byte gUnknown_2037AB8 -_08051874: .4byte gUnknown_202063C +_08051874: .4byte gSprites _08051878: movs r1, 0x1 negs r1, r1 @@ -9889,7 +9889,7 @@ _080518C4: adds r0, 0x1 strh r0, [r1] _080518E2: - ldr r3, _0805191C @ =gUnknown_202063C + ldr r3, _0805191C @ =gSprites ldr r0, _08051918 @ =gUnknown_2031DAC ldr r2, [r0] adds r0, r2, 0 @@ -9915,9 +9915,9 @@ _080518E2: .align 2, 0 _08051914: .4byte gUnknown_2037AB8 _08051918: .4byte gUnknown_2031DAC -_0805191C: .4byte gUnknown_202063C +_0805191C: .4byte gSprites _08051920: - ldr r5, _0805197C @ =gUnknown_202063C + ldr r5, _0805197C @ =gSprites ldr r4, [r7] adds r2, r4, 0 adds r2, 0x90 @@ -9963,7 +9963,7 @@ _08051966: adds r1, r4, 0 bl _080522AC .align 2, 0 -_0805197C: .4byte gUnknown_202063C +_0805197C: .4byte gSprites _08051980: ldr r2, _08051990 @ =0x0000ffff movs r0, 0x1 @@ -9997,7 +9997,7 @@ _080519BC: lsls r0, 24 cmp r0, 0 bne _08051A34 - ldr r4, _08051A2C @ =gUnknown_202063C + ldr r4, _08051A2C @ =gSprites ldr r2, [r5] adds r2, 0x8E ldrb r1, [r2] @@ -10041,7 +10041,7 @@ _080519BC: b _08051A4A .align 2, 0 _08051A28: .4byte gUnknown_2031DAC -_08051A2C: .4byte gUnknown_202063C +_08051A2C: .4byte gSprites _08051A30: .4byte gUnknown_826CF88 _08051A34: ldr r0, [r5] @@ -10050,7 +10050,7 @@ _08051A34: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08051AD8 @ =gUnknown_202063C + ldr r1, _08051AD8 @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAffineAnim @@ -10062,7 +10062,7 @@ _08051A4A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08051AD8 @ =gUnknown_202063C + ldr r4, _08051AD8 @ =gSprites adds r0, r4 movs r1, 0 bl StartSpriteAffineAnim @@ -10124,11 +10124,11 @@ _08051A4A: ldr r1, [r5] bl _080522AC .align 2, 0 -_08051AD8: .4byte gUnknown_202063C +_08051AD8: .4byte gSprites _08051ADC: .4byte gUnknown_2031DAC _08051AE0: .4byte 0x0000ffe0 _08051AE4: - ldr r4, _08051BAC @ =gUnknown_202063C + ldr r4, _08051BAC @ =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -10228,10 +10228,10 @@ _08051B4C: bl BlendPalettes b _08052318 .align 2, 0 -_08051BAC: .4byte gUnknown_202063C +_08051BAC: .4byte gSprites _08051BB0: .4byte 0x0000ffff _08051BB4: - ldr r4, _08051C38 @ =gUnknown_202063C + ldr r4, _08051C38 @ =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x90 @@ -10296,7 +10296,7 @@ _08051BF6: bl DestroySprite b _08052318 .align 2, 0 -_08051C38: .4byte gUnknown_202063C +_08051C38: .4byte gSprites _08051C3C: ldr r0, _08051CA4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -10341,7 +10341,7 @@ _08051C4A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08051CB0 @ =gUnknown_202063C + ldr r1, _08051CB0 @ =gSprites adds r0, r1 movs r1, 0x1 bl StartSpriteAnim @@ -10350,7 +10350,7 @@ _08051C4A: _08051CA4: .4byte gUnknown_2037AB8 _08051CA8: .4byte gUnknown_826CE44 _08051CAC: .4byte gUnknown_826CE84 -_08051CB0: .4byte gUnknown_202063C +_08051CB0: .4byte gSprites _08051CB4: movs r1, 0x1 negs r1, r1 @@ -10377,7 +10377,7 @@ _08051CDC: .align 2, 0 _08051CE0: .4byte gUnknown_2037AB8 _08051CE4: - ldr r2, _08051D30 @ =gUnknown_202063C + ldr r2, _08051D30 @ =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -10416,7 +10416,7 @@ _08051D2A: adds r1, r4, 0 b _080522AC .align 2, 0 -_08051D30: .4byte gUnknown_202063C +_08051D30: .4byte gSprites _08051D34: ldr r1, [r7] adds r5, r1, 0 @@ -10441,7 +10441,7 @@ _08051D52: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08051D8C @ =gUnknown_202063C + ldr r4, _08051D8C @ =gSprites adds r0, r4 bl DestroySprite ldr r0, [r7] @@ -10462,7 +10462,7 @@ _08051D52: str r1, [r3, 0x64] b _08052318 .align 2, 0 -_08051D8C: .4byte gUnknown_202063C +_08051D8C: .4byte gSprites _08051D90: ldr r1, [r7] ldr r0, [r1, 0x64] @@ -10519,7 +10519,7 @@ _08051DE4: ldr r1, [r7] adds r1, 0x92 strb r0, [r1] - ldr r2, _08051E14 @ =gUnknown_202063C + ldr r2, _08051E14 @ =gSprites ldr r0, [r7] adds r0, 0x92 ldrb r1, [r0] @@ -10533,7 +10533,7 @@ _08051DE4: b _08052318 .align 2, 0 _08051E10: .4byte gUnknown_826CEB8 -_08051E14: .4byte gUnknown_202063C +_08051E14: .4byte gSprites _08051E18: .4byte sub_804FDDC _08051E1C: ldr r0, _08051E3C @ =gUnknown_826CF30 @@ -10554,7 +10554,7 @@ _08051E1C: _08051E3C: .4byte gUnknown_826CF30 _08051E40: .4byte gUnknown_2031DAC _08051E44: - ldr r2, _08051E80 @ =gUnknown_202063C + ldr r2, _08051E80 @ =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -10583,7 +10583,7 @@ _08051E62: bl PlaySE b _08052318 .align 2, 0 -_08051E80: .4byte gUnknown_202063C +_08051E80: .4byte gSprites _08051E84: ldr r1, [r7] adds r2, r1, 0 @@ -10697,7 +10697,7 @@ _08051F48: adds r1, 0xD3 movs r6, 0 strb r0, [r1] - ldr r4, _08051FE4 @ =gUnknown_202063C + ldr r4, _08051FE4 @ =gSprites ldr r2, [r5] adds r2, 0xD3 ldrb r1, [r2] @@ -10758,11 +10758,11 @@ _08051F48: .align 2, 0 _08051FDC: .4byte gUnknown_826CDE4 _08051FE0: .4byte gUnknown_2031DAC -_08051FE4: .4byte gUnknown_202063C +_08051FE4: .4byte gSprites _08051FE8: .4byte sub_8053A0C _08051FEC: .4byte 0x0000ffff _08051FF0: - ldr r2, _0805201C @ =gUnknown_202063C + ldr r2, _0805201C @ =gSprites ldr r0, [r7] adds r0, 0xD3 ldrb r1, [r0] @@ -10784,10 +10784,10 @@ _08051FF0: ldr r1, [r7] b _080522AC .align 2, 0 -_0805201C: .4byte gUnknown_202063C +_0805201C: .4byte gSprites _08052020: .4byte 0x0000ffff _08052024: - ldr r2, _08052060 @ =gUnknown_202063C + ldr r2, _08052060 @ =gSprites ldr r3, [r7] adds r0, r3, 0 adds r0, 0xD3 @@ -10798,7 +10798,7 @@ _08052024: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _08052064 @ =nullsub_8 + ldr r0, _08052064 @ =SpriteCallbackDummy cmp r1, r0 beq _08052042 b _08052318 @@ -10817,12 +10817,12 @@ _08052042: ldr r1, [r7] b _080522AC .align 2, 0 -_08052060: .4byte gUnknown_202063C -_08052064: .4byte nullsub_8 +_08052060: .4byte gSprites +_08052064: .4byte SpriteCallbackDummy _08052068: .4byte gUnknown_82350AC _0805206C: .4byte gUnknown_202401C _08052070: - ldr r4, _0805211C @ =gUnknown_202063C + ldr r4, _0805211C @ =gSprites ldr r2, [r7] adds r6, r2, 0 adds r6, 0x8F @@ -10905,7 +10905,7 @@ _08052070: ldr r1, [r7] b _080522AC .align 2, 0 -_0805211C: .4byte gUnknown_202063C +_0805211C: .4byte gSprites _08052120: .4byte gUnknown_82349CC _08052124: .4byte 0x000fffff _08052128: @@ -11447,7 +11447,7 @@ _0805235C: .4byte _08053774 .4byte _080535F4 _0805278C: - ldr r3, _080527F8 @ =gUnknown_202063C + ldr r3, _080527F8 @ =gSprites ldr r0, [r7] adds r0, 0x8E ldrb r1, [r0] @@ -11498,7 +11498,7 @@ _0805278C: bl PlayNewMapMusic bl _08053774 .align 2, 0 -_080527F8: .4byte gUnknown_202063C +_080527F8: .4byte gSprites _080527FC: .4byte 0x0000ff4c _08052800: .4byte gUnknown_82349CC _08052804: @@ -11509,7 +11509,7 @@ _08052804: ldrsh r0, [r6, r1] cmp r0, 0 ble _08052838 - ldr r2, _08052834 @ =gUnknown_202063C + ldr r2, _08052834 @ =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -11525,9 +11525,9 @@ _08052804: strh r0, [r6] bl _08053774 .align 2, 0 -_08052834: .4byte gUnknown_202063C +_08052834: .4byte gSprites _08052838: - ldr r2, _0805285C @ =gUnknown_202063C + ldr r2, _0805285C @ =gSprites adds r0, r5, 0 adds r0, 0x8E ldrb r1, [r0] @@ -11544,7 +11544,7 @@ _08052838: strh r0, [r1] bl _08053774 .align 2, 0 -_0805285C: .4byte gUnknown_202063C +_0805285C: .4byte gSprites _08052860: ldr r4, _0805289C @ =gStringVar4 ldr r1, _080528A0 @ =gUnknown_841E1E9 @@ -11589,7 +11589,7 @@ _080528B8: adds r0, r1, 0 adds r0, 0x8E ldrb r0, [r0] - ldr r2, _0805290C @ =gUnknown_202063C + ldr r2, _0805290C @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -11625,12 +11625,12 @@ _080528B8: bl sub_8054508 bl _08053774 .align 2, 0 -_0805290C: .4byte gUnknown_202063C +_0805290C: .4byte gSprites _08052910: .4byte 0x000fffff _08052914: .4byte gStringVar4 _08052918: .4byte gUnknown_841E200 _0805291C: - ldr r5, _08052978 @ =gUnknown_202063C + ldr r5, _08052978 @ =gSprites ldr r0, [r7] adds r0, 0xD2 ldrb r1, [r0] @@ -11641,7 +11641,7 @@ _0805291C: adds r4, 0x1C adds r0, r4 ldr r1, [r0] - ldr r0, _0805297C @ =nullsub_8 + ldr r0, _0805297C @ =SpriteCallbackDummy cmp r1, r0 beq _0805293C bl _08053774 @@ -11674,8 +11674,8 @@ _0805293C: ldr r1, [r7] bl _08053708 .align 2, 0 -_08052978: .4byte gUnknown_202063C -_0805297C: .4byte nullsub_8 +_08052978: .4byte gSprites +_0805297C: .4byte SpriteCallbackDummy _08052980: .4byte gUnknown_826CDE4 _08052984: .4byte sub_8053938 _08052988: @@ -11798,7 +11798,7 @@ _08052A68: .align 2, 0 _08052A88: .4byte gUnknown_826CF48 _08052A8C: - ldr r2, _08052AD4 @ =gUnknown_202063C + ldr r2, _08052AD4 @ =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -11829,7 +11829,7 @@ _08052AAC: ldr r1, [r7] bl _08053708 .align 2, 0 -_08052AD4: .4byte gUnknown_202063C +_08052AD4: .4byte gSprites _08052AD8: .4byte 0x00000452 _08052ADC: .4byte c3_08054588 _08052AE0: @@ -11875,7 +11875,7 @@ _08052B28: ldr r1, [r4] adds r1, 0x90 strb r0, [r1] - ldr r5, _08052B88 @ =gUnknown_202063C + ldr r5, _08052B88 @ =gSprites ldr r0, [r4] adds r0, 0x90 ldrb r1, [r0] @@ -11909,7 +11909,7 @@ _08052B28: .align 2, 0 _08052B80: .4byte gUnknown_826CE44 _08052B84: .4byte gUnknown_2031DAC -_08052B88: .4byte gUnknown_202063C +_08052B88: .4byte gSprites _08052B8C: .4byte sub_804FD48 _08052B90: .4byte gUnknown_826CE84 _08052B94: @@ -11934,7 +11934,7 @@ _08052BAE: .align 2, 0 _08052BBC: .4byte 0x00001241 _08052BC0: - ldr r2, _08052C14 @ =gUnknown_202063C + ldr r2, _08052C14 @ =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -11975,7 +11975,7 @@ _08052C06: strh r0, [r1] bl _08053774 .align 2, 0 -_08052C14: .4byte gUnknown_202063C +_08052C14: .4byte gSprites _08052C18: movs r1, 0x1 negs r1, r1 @@ -12008,7 +12008,7 @@ _08052C4C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08052C84 @ =gUnknown_202063C + ldr r4, _08052C84 @ =gSprites adds r0, r4 bl DestroySprite ldr r0, [r7] @@ -12025,7 +12025,7 @@ _08052C4C: bl _08053708 .align 2, 0 _08052C80: .4byte gUnknown_2037AB8 -_08052C84: .4byte gUnknown_202063C +_08052C84: .4byte gSprites _08052C88: movs r1, 0x1 negs r1, r1 @@ -12075,7 +12075,7 @@ _08052CD4: adds r0, 0x1 strh r0, [r1] _08052CF2: - ldr r3, _08052D2C @ =gUnknown_202063C + ldr r3, _08052D2C @ =gSprites ldr r0, _08052D28 @ =gUnknown_2031DAC ldr r2, [r0] adds r0, r2, 0 @@ -12101,9 +12101,9 @@ _08052CF2: .align 2, 0 _08052D24: .4byte gUnknown_2037AB8 _08052D28: .4byte gUnknown_2031DAC -_08052D2C: .4byte gUnknown_202063C +_08052D2C: .4byte gSprites _08052D30: - ldr r5, _08052D94 @ =gUnknown_202063C + ldr r5, _08052D94 @ =gSprites ldr r4, [r7] adds r2, r4, 0 adds r2, 0x90 @@ -12154,7 +12154,7 @@ _08052D76: ldr r0, _08052D98 @ =c3_0805465C b _08052FBE .align 2, 0 -_08052D94: .4byte gUnknown_202063C +_08052D94: .4byte gSprites _08052D98: .4byte c3_0805465C _08052D9C: ldr r2, _08052DAC @ =0x0000ffff @@ -12189,7 +12189,7 @@ _08052DD8: lsls r0, 24 cmp r0, 0 bne _08052E50 - ldr r4, _08052E48 @ =gUnknown_202063C + ldr r4, _08052E48 @ =gSprites ldr r2, [r5] adds r2, 0x8E ldrb r1, [r2] @@ -12233,7 +12233,7 @@ _08052DD8: b _08052E66 .align 2, 0 _08052E44: .4byte gUnknown_2031DAC -_08052E48: .4byte gUnknown_202063C +_08052E48: .4byte gSprites _08052E4C: .4byte gUnknown_826CF88 _08052E50: ldr r0, [r5] @@ -12242,7 +12242,7 @@ _08052E50: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08052EF4 @ =gUnknown_202063C + ldr r1, _08052EF4 @ =gSprites adds r0, r1 movs r1, 0 bl StartSpriteAffineAnim @@ -12254,7 +12254,7 @@ _08052E66: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08052EF4 @ =gUnknown_202063C + ldr r4, _08052EF4 @ =gSprites adds r0, r4 movs r1, 0 bl StartSpriteAffineAnim @@ -12316,11 +12316,11 @@ _08052E66: ldr r1, [r5] bl _08053708 .align 2, 0 -_08052EF4: .4byte gUnknown_202063C +_08052EF4: .4byte gSprites _08052EF8: .4byte gUnknown_2031DAC _08052EFC: .4byte 0x0000ffe0 _08052F00: - ldr r4, _08052FC8 @ =gUnknown_202063C + ldr r4, _08052FC8 @ =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x8E @@ -12420,10 +12420,10 @@ _08052FBE: bl CreateTask bl _08053774 .align 2, 0 -_08052FC8: .4byte gUnknown_202063C +_08052FC8: .4byte gSprites _08052FCC: .4byte sub_8054734 _08052FD0: - ldr r4, _08053054 @ =gUnknown_202063C + ldr r4, _08053054 @ =gSprites ldr r2, [r7] adds r3, r2, 0 adds r3, 0x90 @@ -12488,7 +12488,7 @@ _08053012: bl DestroySprite b _08053774 .align 2, 0 -_08053054: .4byte gUnknown_202063C +_08053054: .4byte gSprites _08053058: ldr r0, _080530E4 @ =gUnknown_2037AB8 ldrb r1, [r0, 0x7] @@ -12526,7 +12526,7 @@ _08053066: ldr r1, [r7] adds r1, 0x90 strb r0, [r1] - ldr r5, _080530EC @ =gUnknown_202063C + ldr r5, _080530EC @ =gSprites ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -12559,7 +12559,7 @@ _08053066: .align 2, 0 _080530E4: .4byte gUnknown_2037AB8 _080530E8: .4byte gUnknown_826CE44 -_080530EC: .4byte gUnknown_202063C +_080530EC: .4byte gSprites _080530F0: .4byte sub_804FD48 _080530F4: .4byte gUnknown_826CE84 _080530F8: @@ -12588,7 +12588,7 @@ _08053120: .align 2, 0 _08053124: .4byte gUnknown_2037AB8 _08053128: - ldr r2, _0805317C @ =gUnknown_202063C + ldr r2, _0805317C @ =gSprites ldr r4, [r7] adds r3, r4, 0 adds r3, 0x90 @@ -12632,7 +12632,7 @@ _0805316E: str r0, [r4, 0x64] b _08053774 .align 2, 0 -_0805317C: .4byte gUnknown_202063C +_0805317C: .4byte gSprites _08053180: movs r1, 0xB2 lsls r1, 5 @@ -12691,7 +12691,7 @@ _080531E8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08053220 @ =gUnknown_202063C + ldr r4, _08053220 @ =gSprites adds r0, r4 bl DestroySprite ldr r0, [r7] @@ -12712,7 +12712,7 @@ _080531E8: str r1, [r3, 0x64] b _08053774 .align 2, 0 -_08053220: .4byte gUnknown_202063C +_08053220: .4byte gSprites _08053224: ldr r0, _08053244 @ =c3_08054588 bl FuncIsActiveTask @@ -12779,7 +12779,7 @@ _0805327A: _08053298: .4byte gUnknown_826CF30 _0805329C: .4byte gUnknown_2031DAC _080532A0: - ldr r2, _080532DC @ =gUnknown_202063C + ldr r2, _080532DC @ =gSprites ldr r0, [r7] adds r0, 0x91 ldrb r1, [r0] @@ -12808,7 +12808,7 @@ _080532BE: bl PlaySE b _08053774 .align 2, 0 -_080532DC: .4byte gUnknown_202063C +_080532DC: .4byte gSprites _080532E0: ldr r1, [r7] adds r2, r1, 0 @@ -12922,7 +12922,7 @@ _080533A4: adds r1, 0xD3 movs r6, 0 strb r0, [r1] - ldr r4, _08053440 @ =gUnknown_202063C + ldr r4, _08053440 @ =gSprites ldr r2, [r5] adds r2, 0xD3 ldrb r1, [r2] @@ -12983,11 +12983,11 @@ _080533A4: .align 2, 0 _08053438: .4byte gUnknown_826CDE4 _0805343C: .4byte gUnknown_2031DAC -_08053440: .4byte gUnknown_202063C +_08053440: .4byte gSprites _08053444: .4byte sub_8053A0C _08053448: .4byte 0x0000ffff _0805344C: - ldr r2, _08053478 @ =gUnknown_202063C + ldr r2, _08053478 @ =gSprites ldr r0, [r7] adds r0, 0xD3 ldrb r1, [r0] @@ -13009,10 +13009,10 @@ _0805344C: ldr r1, [r7] b _08053708 .align 2, 0 -_08053478: .4byte gUnknown_202063C +_08053478: .4byte gSprites _0805347C: .4byte 0x0000ffff _08053480: - ldr r2, _080534BC @ =gUnknown_202063C + ldr r2, _080534BC @ =gSprites ldr r3, [r7] adds r0, r3, 0 adds r0, 0xD3 @@ -13023,7 +13023,7 @@ _08053480: adds r2, 0x1C adds r0, r2 ldr r1, [r0] - ldr r0, _080534C0 @ =nullsub_8 + ldr r0, _080534C0 @ =SpriteCallbackDummy cmp r1, r0 beq _0805349E b _08053774 @@ -13042,12 +13042,12 @@ _0805349E: ldr r1, [r7] b _08053708 .align 2, 0 -_080534BC: .4byte gUnknown_202063C -_080534C0: .4byte nullsub_8 +_080534BC: .4byte gSprites +_080534C0: .4byte SpriteCallbackDummy _080534C4: .4byte gUnknown_82350AC _080534C8: .4byte gUnknown_202401C _080534CC: - ldr r4, _08053578 @ =gUnknown_202063C + ldr r4, _08053578 @ =gSprites ldr r2, [r7] adds r6, r2, 0 adds r6, 0x8F @@ -13130,7 +13130,7 @@ _080534CC: ldr r1, [r7] b _08053708 .align 2, 0 -_08053578: .4byte gUnknown_202063C +_08053578: .4byte gSprites _0805357C: .4byte gUnknown_82349CC _08053580: .4byte 0x000fffff _08053584: @@ -13585,14 +13585,14 @@ _08053916: bne _0805392E movs r0, 0x1 strh r0, [r5, 0x3C] - ldr r0, _08053934 @ =nullsub_8 + ldr r0, _08053934 @ =SpriteCallbackDummy str r0, [r5, 0x1C] _0805392E: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_08053934: .4byte nullsub_8 +_08053934: .4byte SpriteCallbackDummy thumb_func_end sub_80538BC thumb_func_start sub_8053938 @@ -13768,7 +13768,7 @@ _08053A66: asrs r0, 16 cmp r0, 0x6C bne _08053A8C - ldr r0, _08053A98 @ =nullsub_8 + ldr r0, _08053A98 @ =SpriteCallbackDummy str r0, [r4, 0x1C] _08053A8C: pop {r4} @@ -13776,7 +13776,7 @@ _08053A8C: bx r0 .align 2, 0 _08053A94: .4byte gUnknown_826D1E4 -_08053A98: .4byte nullsub_8 +_08053A98: .4byte SpriteCallbackDummy thumb_func_end sub_8053A0C thumb_func_start sub_8053A9C @@ -14140,7 +14140,7 @@ sub_8053D84: @ 8053D84 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _08053E0C @ =gUnknown_202063C + ldr r4, _08053E0C @ =gSprites adds r0, r4 bl DestroySprite ldr r0, [r5] @@ -14183,7 +14183,7 @@ _08053DE6: bx r0 .align 2, 0 _08053E08: .4byte gUnknown_2031DAC -_08053E0C: .4byte gUnknown_202063C +_08053E0C: .4byte gSprites _08053E10: .4byte gUnknown_2031DA4 _08053E14: .4byte 0x0000abcd _08053E18: .4byte sub_8053E1C diff --git a/asm/trainer_see.s b/asm/trainer_see.s index 252600212..59bc4d419 100644 --- a/asm/trainer_see.s +++ b/asm/trainer_see.s @@ -895,7 +895,7 @@ sub_8082184: @ 8082184 movs r1, 0x12 ldrsh r0, [r4, r1] str r0, [r2, 0x4] - ldr r3, _080821D8 @ =gUnknown_202063C + ldr r3, _080821D8 @ =gSprites ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -920,7 +920,7 @@ _080821CA: bx r1 .align 2, 0 _080821D4: .4byte gUnknown_20386E0 -_080821D8: .4byte gUnknown_202063C +_080821D8: .4byte gSprites thumb_func_end sub_8082184 thumb_func_start sub_80821DC @@ -928,7 +928,7 @@ sub_80821DC: @ 80821DC push {r4,r5,lr} adds r5, r1, 0 adds r4, r2, 0 - ldr r2, _0808224C @ =gUnknown_202063C + ldr r2, _0808224C @ =gSprites movs r1, 0x10 ldrsh r0, [r5, r1] lsls r1, r0, 4 @@ -980,7 +980,7 @@ _08082244: pop {r1} bx r1 .align 2, 0 -_0808224C: .4byte gUnknown_202063C +_0808224C: .4byte gSprites thumb_func_end sub_80821DC thumb_func_start sub_8082250 @@ -1375,7 +1375,7 @@ FldEff_ExclamationMarkIcon1: @ 8082544 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08082578 @ =gUnknown_202063C + ldr r1, _08082578 @ =gSprites adds r0, r1 movs r1, 0 movs r2, 0 @@ -1386,7 +1386,7 @@ _0808256C: bx r1 .align 2, 0 _08082574: .4byte gUnknown_83C7388 -_08082578: .4byte gUnknown_202063C +_08082578: .4byte gSprites thumb_func_end FldEff_ExclamationMarkIcon1 thumb_func_start sub_808257C @@ -1404,7 +1404,7 @@ sub_808257C: @ 808257C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080825B0 @ =gUnknown_202063C + ldr r1, _080825B0 @ =gSprites adds r0, r1 movs r1, 0x42 movs r2, 0x1 @@ -1415,7 +1415,7 @@ _080825A4: bx r1 .align 2, 0 _080825AC: .4byte gUnknown_83C7388 -_080825B0: .4byte gUnknown_202063C +_080825B0: .4byte gSprites thumb_func_end sub_808257C thumb_func_start sub_80825B4 @@ -1433,7 +1433,7 @@ sub_80825B4: @ 80825B4 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _080825E8 @ =gUnknown_202063C + ldr r1, _080825E8 @ =gSprites adds r0, r1 movs r1, 0x2E movs r2, 0x2 @@ -1444,7 +1444,7 @@ _080825DC: bx r1 .align 2, 0 _080825E4: .4byte gUnknown_83C7388 -_080825E8: .4byte gUnknown_202063C +_080825E8: .4byte gSprites thumb_func_end sub_80825B4 thumb_func_start sub_80825EC @@ -1462,7 +1462,7 @@ sub_80825EC: @ 80825EC lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08082620 @ =gUnknown_202063C + ldr r1, _08082620 @ =gSprites adds r0, r1 movs r1, 0x40 movs r2, 0x3 @@ -1473,7 +1473,7 @@ _08082614: bx r1 .align 2, 0 _0808261C: .4byte gUnknown_83C7388 -_08082620: .4byte gUnknown_202063C +_08082620: .4byte gSprites thumb_func_end sub_80825EC thumb_func_start sub_8082624 @@ -1491,7 +1491,7 @@ sub_8082624: @ 8082624 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08082658 @ =gUnknown_202063C + ldr r1, _08082658 @ =gSprites adds r0, r1 movs r1, 0x21 movs r2, 0x4 @@ -1502,7 +1502,7 @@ _0808264C: bx r1 .align 2, 0 _08082654: .4byte gUnknown_83C7388 -_08082658: .4byte gUnknown_202063C +_08082658: .4byte gSprites thumb_func_end sub_8082624 thumb_func_start sub_808265C @@ -1590,7 +1590,7 @@ _080826E8: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _08082730 @ =gUnknown_202063C + ldr r0, _08082730 @ =gSprites adds r1, r0 ldrh r3, [r4, 0x34] ldrh r0, [r4, 0x36] @@ -1615,7 +1615,7 @@ _080826E8: b _08082736 .align 2, 0 _0808272C: .4byte gUnknown_2036E38 -_08082730: .4byte gUnknown_202063C +_08082730: .4byte gSprites _08082734: strh r2, [r4, 0x34] _08082736: diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 750563930..b56512278 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -5567,7 +5567,7 @@ sub_812AEC8: @ 812AEC8 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0812AEF8 @ =gUnknown_202063C + ldr r0, _0812AEF8 @ =gSprites adds r1, r0 str r1, [r2] pop {r0} @@ -5575,7 +5575,7 @@ sub_812AEC8: @ 812AEC8 .align 2, 0 _0812AEF0: .4byte gUnknown_845AFC0 _0812AEF4: .4byte gUnknown_203B0E8 -_0812AEF8: .4byte gUnknown_202063C +_0812AEF8: .4byte gSprites thumb_func_end sub_812AEC8 thumb_func_start sub_812AEFC @@ -5773,7 +5773,7 @@ sub_812B048: @ 812B048 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _0812B094 @ =gUnknown_202063C + ldr r4, _0812B094 @ =gSprites adds r1, r4 str r1, [r2, 0x8] ldr r0, _0812B098 @ =gUnknown_845AFF8 @@ -5795,7 +5795,7 @@ sub_812B048: @ 812B048 .align 2, 0 _0812B08C: .4byte gUnknown_845AFE0 _0812B090: .4byte gUnknown_203B0E8 -_0812B094: .4byte gUnknown_202063C +_0812B094: .4byte gSprites _0812B098: .4byte gUnknown_845AFF8 thumb_func_end sub_812B048 @@ -5872,7 +5872,7 @@ sub_812B100: @ 812B100 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r4, _0812B158 @ =gUnknown_202063C + ldr r4, _0812B158 @ =gSprites adds r1, r4 str r1, [r2, 0xC] ldr r0, _0812B15C @ =gUnknown_845B068 @@ -5899,7 +5899,7 @@ sub_812B100: @ 812B100 .align 2, 0 _0812B150: .4byte gUnknown_845B050 _0812B154: .4byte gUnknown_203B0E8 -_0812B158: .4byte gUnknown_202063C +_0812B158: .4byte gSprites _0812B15C: .4byte gUnknown_845B068 thumb_func_end sub_812B100 diff --git a/asm/unk_810C3A4.s b/asm/unk_810C3A4.s index f8957ecb3..a99a6f78e 100644 --- a/asm/unk_810C3A4.s +++ b/asm/unk_810C3A4.s @@ -284,7 +284,7 @@ _0810C59A: lsls r0, 31 cmp r0, 0 beq _0810C5EA - ldr r2, _0810C600 @ =gUnknown_202063C + ldr r2, _0810C600 @ =gSprites ldrb r0, [r4, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -315,7 +315,7 @@ _0810C5EA: bx r0 .align 2, 0 _0810C5FC: .4byte gUnknown_2036E38 -_0810C600: .4byte gUnknown_202063C +_0810C600: .4byte gSprites thumb_func_end sub_810C594 thumb_func_start sub_810C604 diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s index 19ad99da2..aa99e352c 100644 --- a/asm/unk_8147500.s +++ b/asm/unk_8147500.s @@ -330,7 +330,7 @@ _08147748: movs r3, 0xD negs r3, r3 mov r12, r3 - ldr r6, _081477BC @ =gUnknown_202063C + ldr r6, _081477BC @ =gSprites _0814775C: lsls r0, r5, 1 adds r0, r4 @@ -378,7 +378,7 @@ _081477A4: _081477B0: .4byte gUnknown_846B42C _081477B4: .4byte gUnknown_846B43C _081477B8: .4byte gUnknown_846B494 -_081477BC: .4byte gUnknown_202063C +_081477BC: .4byte gSprites thumb_func_end sub_81476E0 thumb_func_start sub_81477C0 @@ -412,7 +412,7 @@ sub_81477C0: @ 81477C0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r5, _08147844 @ =gUnknown_202063C + ldr r5, _08147844 @ =gSprites adds r0, r5 movs r1, 0x4 bl StartSpriteAnim @@ -445,7 +445,7 @@ sub_81477C0: @ 81477C0 bx r0 .align 2, 0 _08147840: .4byte gUnknown_3005098 -_08147844: .4byte gUnknown_202063C +_08147844: .4byte gSprites _08147848: .4byte 0x0000ffe0 thumb_func_end sub_81477C0 @@ -471,7 +471,7 @@ _08147864: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081478B0 @ =gUnknown_202063C + ldr r1, _081478B0 @ =gSprites adds r0, r1 bl DestroySprite adds r0, r5, 0x1 @@ -500,7 +500,7 @@ _08147880: pop {r0} bx r0 .align 2, 0 -_081478B0: .4byte gUnknown_202063C +_081478B0: .4byte gSprites _081478B4: .4byte gUnknown_846B42C _081478B8: .4byte gUnknown_846B43C thumb_func_end sub_814784C @@ -575,7 +575,7 @@ _0814793E: lsrs r1, 24 adds r0, r6, 0 bl StartSpriteAnim - ldr r4, _08147984 @ =gUnknown_202063C + ldr r4, _08147984 @ =gSprites movs r2, 0x1C ldrsh r0, [r5, r2] lsls r1, r0, 4 @@ -601,7 +601,7 @@ _0814793E: strb r2, [r0] b _081479C8 .align 2, 0 -_08147984: .4byte gUnknown_202063C +_08147984: .4byte gSprites _08147988: adds r1, r6, 0 adds r1, 0x3E @@ -609,7 +609,7 @@ _08147988: movs r2, 0x4 orrs r0, r2 strb r0, [r1] - ldr r3, _081479C4 @ =gUnknown_202063C + ldr r3, _081479C4 @ =gSprites movs r0, 0x1C ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -634,7 +634,7 @@ _08147988: strh r0, [r5] b _081479CE .align 2, 0 -_081479C4: .4byte gUnknown_202063C +_081479C4: .4byte gSprites _081479C8: ldrh r0, [r6, 0x32] adds r0, 0x1 @@ -657,7 +657,7 @@ sub_81479D4: @ 81479D4 adds r6, r4, r5 movs r0, 0x31 bl PlaySE - ldr r2, _08147A2C @ =gUnknown_202063C + ldr r2, _08147A2C @ =gSprites movs r0, 0x1A ldrsh r1, [r6, r0] lsls r0, r1, 4 @@ -689,7 +689,7 @@ sub_81479D4: @ 81479D4 bx r0 .align 2, 0 _08147A28: .4byte gUnknown_3005098 -_08147A2C: .4byte gUnknown_202063C +_08147A2C: .4byte gSprites _08147A30: .4byte sub_81478BC thumb_func_end sub_81479D4 diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s index c624b31f4..1352e3223 100644 --- a/asm/unk_8147AA8.s +++ b/asm/unk_8147AA8.s @@ -6937,7 +6937,7 @@ _0814AE2A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0814AEE4 @ =gUnknown_202063C + ldr r1, _0814AEE4 @ =gSprites adds r0, r1 str r0, [r2] ldr r0, _0814AEE8 @ =0x000081fc @@ -6951,7 +6951,7 @@ _0814AE2A: _0814AED8: .4byte gUnknown_82350AC _0814AEDC: .4byte 0xffff0000 _0814AEE0: .4byte 0x000081a8 -_0814AEE4: .4byte gUnknown_202063C +_0814AEE4: .4byte gSprites _0814AEE8: .4byte 0x000081fc _0814AEEC: lsls r0, r6, 2 @@ -6988,7 +6988,7 @@ sub_814AF0C: @ 814AF0C adds r4, r0 adds r4, r6 ldr r1, [r4] - ldr r0, _0814AF6C @ =gUnknown_202063C + ldr r0, _0814AF6C @ =gSprites subs r1, r0 lsls r0, r1, 4 subs r0, r1 @@ -7020,7 +7020,7 @@ sub_814AF0C: @ 814AF0C .align 2, 0 _0814AF64: .4byte 0x000081bc _0814AF68: .4byte 0x000081a8 -_0814AF6C: .4byte gUnknown_202063C +_0814AF6C: .4byte gSprites _0814AF70: .4byte sub_814AF74 thumb_func_end sub_814AF0C @@ -7082,13 +7082,13 @@ _0814AFCE: movs r1, 0x4 orrs r0, r1 strb r0, [r3] - ldr r0, _0814AFE4 @ =nullsub_8 + ldr r0, _0814AFE4 @ =SpriteCallbackDummy str r0, [r2, 0x1C] _0814AFDE: pop {r0} bx r0 .align 2, 0 -_0814AFE4: .4byte nullsub_8 +_0814AFE4: .4byte SpriteCallbackDummy thumb_func_end sub_814AF74 thumb_func_start sub_814AFE8 @@ -7168,14 +7168,14 @@ _0814B064: ble _0814B074 movs r0, 0 strh r0, [r2, 0x26] - ldr r0, _0814B07C @ =nullsub_8 + ldr r0, _0814B07C @ =SpriteCallbackDummy str r0, [r2, 0x1C] _0814B074: pop {r0} bx r0 .align 2, 0 _0814B078: .4byte 0x0000fffe -_0814B07C: .4byte nullsub_8 +_0814B07C: .4byte SpriteCallbackDummy thumb_func_end sub_814B038 thumb_func_start sub_814B080 @@ -7214,7 +7214,7 @@ sub_814B0A8: @ 814B0A8 ldr r1, _0814B0F4 @ =0x000081a8 adds r3, r4, r1 ldr r7, _0814B0F8 @ =sub_814B100 - ldr r6, _0814B0FC @ =nullsub_8 + ldr r6, _0814B0FC @ =SpriteCallbackDummy movs r5, 0xA adds r4, r0, 0 _0814B0CA: @@ -7243,7 +7243,7 @@ _0814B0EC: .align 2, 0 _0814B0F4: .4byte 0x000081a8 _0814B0F8: .4byte sub_814B100 -_0814B0FC: .4byte nullsub_8 +_0814B0FC: .4byte SpriteCallbackDummy thumb_func_end sub_814B0A8 thumb_func_start sub_814B100 @@ -7419,14 +7419,14 @@ _0814B1FE: .align 2, 0 _0814B22C: .4byte gUnknown_825E074 _0814B230: - ldr r0, _0814B23C @ =nullsub_8 + ldr r0, _0814B23C @ =SpriteCallbackDummy str r0, [r5, 0x1C] _0814B234: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0814B23C: .4byte nullsub_8 +_0814B23C: .4byte SpriteCallbackDummy thumb_func_end sub_814B1CC thumb_func_start sub_814B240 @@ -7446,7 +7446,7 @@ sub_814B240: @ 814B240 lsrs r2, r0, 24 cmp r2, 0x40 beq _0814B280 - ldr r0, _0814B28C @ =gUnknown_202063C + ldr r0, _0814B28C @ =gSprites lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -7468,7 +7468,7 @@ _0814B280: bx r0 .align 2, 0 _0814B288: .4byte gUnknown_846E2B4 -_0814B28C: .4byte gUnknown_202063C +_0814B28C: .4byte gSprites _0814B290: .4byte 0x000081bc thumb_func_end sub_814B240 @@ -7502,7 +7502,7 @@ _0814B29E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0814B344 @ =gUnknown_202063C + ldr r1, _0814B344 @ =gSprites adds r0, r1 str r0, [r2] adds r5, 0x1 @@ -7537,7 +7537,7 @@ _0814B2E0: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0814B344 @ =gUnknown_202063C + ldr r1, _0814B344 @ =gSprites adds r0, r1 str r0, [r2] adds r0, 0x3F @@ -7558,7 +7558,7 @@ _0814B334: .4byte gUnknown_846E100 _0814B338: .4byte gUnknown_846E160 _0814B33C: .4byte gUnknown_846E150 _0814B340: .4byte 0x000081d0 -_0814B344: .4byte gUnknown_202063C +_0814B344: .4byte gSprites thumb_func_end sub_814B294 thumb_func_start sub_814B348 diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s index c4c73f3bc..4eccb9200 100644 --- a/asm/unk_814D5C8.s +++ b/asm/unk_814D5C8.s @@ -60,14 +60,14 @@ _0814D63A: lsls r1, 19 ldr r2, _0814D658 @ =0x01000200 bl CpuSet - ldr r0, _0814D65C @ =gUnknown_3003E58 + ldr r0, _0814D65C @ =gReservedSpritePaletteCount strb r4, [r0] movs r0, 0x3 bl sub_815C980 b _0814D878 .align 2, 0 _0814D658: .4byte 0x01000200 -_0814D65C: .4byte gUnknown_3003E58 +_0814D65C: .4byte gReservedSpritePaletteCount _0814D660: bl ResetPaletteFade bl ResetSpriteData @@ -242,7 +242,7 @@ _0814D7F4: bl sub_80FCD74 adds r0, r5, 0 bl sub_814ECE0 - ldr r0, _0814D82C @ =gUnknown_2021BCA + ldr r0, _0814D82C @ =gSpriteCoordOffsetY ldrh r1, [r0] negs r1, r1 lsls r1, 16 @@ -259,7 +259,7 @@ _0814D7F4: bl ChangeBgY b _0814D878 .align 2, 0 -_0814D82C: .4byte gUnknown_2021BCA +_0814D82C: .4byte gSpriteCoordOffsetY _0814D830: ldr r2, _0814D874 @ =gUnknown_2037AB8 ldrb r1, [r2, 0x8] @@ -451,7 +451,7 @@ _0814D9C2: sub_814D9CC: @ 814D9CC push {r4,lr} adds r4, r0, 0 - ldr r0, _0814DA00 @ =gUnknown_2021BCA + ldr r0, _0814DA00 @ =gSpriteCoordOffsetY ldrh r1, [r4, 0x2C] ldrh r2, [r4, 0x2A] adds r1, r2 @@ -475,7 +475,7 @@ _0814D9F8: pop {r1} bx r1 .align 2, 0 -_0814DA00: .4byte gUnknown_2021BCA +_0814DA00: .4byte gSpriteCoordOffsetY thumb_func_end sub_814D9CC thumb_func_start sub_814DA04 @@ -484,15 +484,15 @@ sub_814DA04: @ 814DA04 ldr r2, _0814DA18 @ =0x0000ff98 strh r2, [r0, 0x2A] strh r1, [r0, 0x2C] - ldr r0, _0814DA1C @ =gUnknown_2021BC8 + ldr r0, _0814DA1C @ =gSpriteCoordOffsetX strh r1, [r0] - ldr r0, _0814DA20 @ =gUnknown_2021BCA + ldr r0, _0814DA20 @ =gSpriteCoordOffsetY strh r2, [r0] bx lr .align 2, 0 _0814DA18: .4byte 0x0000ff98 -_0814DA1C: .4byte gUnknown_2021BC8 -_0814DA20: .4byte gUnknown_2021BCA +_0814DA1C: .4byte gSpriteCoordOffsetX +_0814DA20: .4byte gSpriteCoordOffsetY thumb_func_end sub_814DA04 thumb_func_start sub_814DA24 @@ -539,7 +539,7 @@ _0814DA42: lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0814DB78 @ =gUnknown_202063C + ldr r0, _0814DB78 @ =gSprites adds r1, r0 str r1, [r6] ldrb r0, [r1, 0x5] @@ -664,7 +664,7 @@ _0814DB60: .align 2, 0 _0814DB70: .4byte gUnknown_846F2EC _0814DB74: .4byte gUnknown_846F470 -_0814DB78: .4byte gUnknown_202063C +_0814DB78: .4byte gSprites _0814DB7C: .4byte 0x0000fff0 _0814DB80: .4byte 0xffff8000 thumb_func_end sub_814DA24 @@ -736,7 +736,7 @@ _0814DBEA: ands r0, r2 cmp r1, r0 blt _0814DC16 - ldr r0, _0814DC20 @ =nullsub_8 + ldr r0, _0814DC20 @ =SpriteCallbackDummy str r0, [r5, 0x1C] adds r0, r5, 0 bl FreeSpriteOamMatrix @@ -748,7 +748,7 @@ _0814DC16: bx r0 .align 2, 0 _0814DC1C: .4byte 0x00007fff -_0814DC20: .4byte nullsub_8 +_0814DC20: .4byte SpriteCallbackDummy thumb_func_end sub_814DB84 thumb_func_start sub_814DC24 @@ -2837,9 +2837,9 @@ sub_814ECE0: @ 814ECE0 ldr r0, _0814EEE0 @ =0x0000ff98 strh r0, [r6, 0x2A] strh r5, [r6, 0x2C] - ldr r1, _0814EEE4 @ =gUnknown_2021BC8 + ldr r1, _0814EEE4 @ =gSpriteCoordOffsetX strh r5, [r1] - ldr r1, _0814EEE8 @ =gUnknown_2021BCA + ldr r1, _0814EEE8 @ =gSpriteCoordOffsetY strh r0, [r1] ldr r4, _0814EEEC @ =gUnknown_846F2F8 _0814ECF6: @@ -2866,7 +2866,7 @@ _0814ECF6: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, _0814EEF8 @ =gUnknown_202063C + ldr r1, _0814EEF8 @ =gSprites adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -2917,7 +2917,7 @@ _0814ED5A: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 - ldr r0, _0814EEF8 @ =gUnknown_202063C + ldr r0, _0814EEF8 @ =gSprites adds r1, r0 str r1, [r3] ldrb r0, [r1, 0x5] @@ -2978,7 +2978,7 @@ _0814EDD8: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, _0814EEF8 @ =gUnknown_202063C + ldr r1, _0814EEF8 @ =gSprites adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -3027,7 +3027,7 @@ _0814EE3E: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r1, _0814EEF8 @ =gUnknown_202063C + ldr r1, _0814EEF8 @ =gSprites adds r0, r1 str r0, [r3] ldrb r1, [r0, 0x5] @@ -3084,12 +3084,12 @@ _0814EED8: bx r0 .align 2, 0 _0814EEE0: .4byte 0x0000ff98 -_0814EEE4: .4byte gUnknown_2021BC8 -_0814EEE8: .4byte gUnknown_2021BCA +_0814EEE4: .4byte gSpriteCoordOffsetX +_0814EEE8: .4byte gSpriteCoordOffsetY _0814EEEC: .4byte gUnknown_846F2F8 _0814EEF0: .4byte gUnknown_846F320 _0814EEF4: .4byte gUnknown_846F410 -_0814EEF8: .4byte gUnknown_202063C +_0814EEF8: .4byte gSprites _0814EEFC: .4byte gUnknown_846F428 _0814EF00: .4byte gUnknown_846F2D6 _0814EF04: .4byte gUnknown_846F440 @@ -3218,7 +3218,7 @@ sub_814EFFC: @ 814EFFC push {r4,r5,lr} adds r3, r0, 0 movs r1, 0 - ldr r5, _0814F040 @ =nullsub_8 + ldr r5, _0814F040 @ =SpriteCallbackDummy adds r2, r3, 0 adds r2, 0x2E movs r4, 0 @@ -3250,7 +3250,7 @@ _0814F00A: pop {r0} bx r0 .align 2, 0 -_0814F040: .4byte nullsub_8 +_0814F040: .4byte SpriteCallbackDummy thumb_func_end sub_814EFFC thumb_func_start sub_814F044 diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s index c8a5c5373..931236d08 100644 --- a/asm/unk_81507FC.s +++ b/asm/unk_81507FC.s @@ -6746,7 +6746,7 @@ sub_8153AFC: @ 8153AFC ldr r0, _08153B8C @ =gUnknown_8478CE0 str r0, [sp, 0x20] str r3, [sp, 0x24] - ldr r0, _08153B90 @ =gUnknown_8231CFC + ldr r0, _08153B90 @ =gDummySpriteAffineAnimTable str r0, [sp, 0x28] ldr r0, _08153B94 @ =sub_8153B9C str r0, [sp, 0x2C] @@ -6786,7 +6786,7 @@ sub_8153AFC: @ 8153AFC .align 2, 0 _08153B88: .4byte gUnknown_8478C98 _08153B8C: .4byte gUnknown_8478CE0 -_08153B90: .4byte gUnknown_8231CFC +_08153B90: .4byte gDummySpriteAffineAnimTable _08153B94: .4byte sub_8153B9C _08153B98: .4byte gUnknown_203F3E4 thumb_func_end sub_8153AFC @@ -6826,7 +6826,7 @@ sub_8153BC0: @ 8153BC0 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08153BF4 @ =gUnknown_202063C + ldr r1, _08153BF4 @ =gSprites adds r0, r1 movs r2, 0 movs r1, 0x1 @@ -6839,7 +6839,7 @@ sub_8153BC0: @ 8153BC0 bx r0 .align 2, 0 _08153BF0: .4byte gUnknown_203F3E4 -_08153BF4: .4byte gUnknown_202063C +_08153BF4: .4byte gSprites thumb_func_end sub_8153BC0 thumb_func_start sub_8153BF8 @@ -6855,7 +6855,7 @@ sub_8153BF8: @ 8153BF8 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08153C2C @ =gUnknown_202063C + ldr r1, _08153C2C @ =gSprites adds r0, r1 movs r2, 0 movs r1, 0x2 @@ -6868,7 +6868,7 @@ sub_8153BF8: @ 8153BF8 bx r0 .align 2, 0 _08153C28: .4byte gUnknown_203F3E4 -_08153C2C: .4byte gUnknown_202063C +_08153C2C: .4byte gSprites thumb_func_end sub_8153BF8 thumb_func_start sub_8153C30 @@ -7004,7 +7004,7 @@ _08153D16: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08153D44 @ =gUnknown_202063C + ldr r1, _08153D44 @ =gSprites adds r0, r1 cmp r0, 0 beq _08153D30 @@ -7021,7 +7021,7 @@ _08153D3A: bx r0 .align 2, 0 _08153D40: .4byte gUnknown_203F3E4 -_08153D44: .4byte gUnknown_202063C +_08153D44: .4byte gSprites thumb_func_end sub_8153D08 thumb_func_start sub_8153D48 @@ -7029,7 +7029,7 @@ sub_8153D48: @ 8153D48 lsls r0, 24 lsrs r0, 24 lsls r1, 24 - ldr r3, _08153D78 @ =gUnknown_202063C + ldr r3, _08153D78 @ =gSprites ldr r2, _08153D7C @ =gUnknown_203F3E4 lsrs r1, 22 adds r1, r2 @@ -7051,7 +7051,7 @@ sub_8153D48: @ 8153D48 strb r1, [r2] bx lr .align 2, 0 -_08153D78: .4byte gUnknown_202063C +_08153D78: .4byte gSprites _08153D7C: .4byte gUnknown_203F3E4 thumb_func_end sub_8153D48 @@ -7094,14 +7094,14 @@ sub_8153DA8: @ 8153DA8 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _08153DD0 @ =gUnknown_202063C + ldr r2, _08153DD0 @ =gSprites adds r0, r2 bl StartSpriteAnim pop {r0} bx r0 .align 2, 0 _08153DCC: .4byte gUnknown_203F3E4 -_08153DD0: .4byte gUnknown_202063C +_08153DD0: .4byte gSprites thumb_func_end sub_8153DA8 thumb_func_start nullsub_97 @@ -7113,7 +7113,7 @@ nullsub_97: @ 8153DD4 sub_8153DD8: @ 8153DD8 push {r4-r7,lr} movs r4, 0 - ldr r0, _08153E20 @ =gUnknown_202063C + ldr r0, _08153E20 @ =gSprites mov r12, r0 movs r6, 0 ldr r5, _08153E24 @ =gUnknown_203F43C @@ -7149,7 +7149,7 @@ _08153DE4: pop {r0} bx r0 .align 2, 0 -_08153E20: .4byte gUnknown_202063C +_08153E20: .4byte gSprites _08153E24: .4byte gUnknown_203F43C thumb_func_end sub_8153DD8 @@ -7250,7 +7250,7 @@ _08153EDC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08153F18 @ =gUnknown_202063C + ldr r1, _08153F18 @ =gSprites adds r0, r1 cmp r0, 0 beq _08153EFA @@ -7270,7 +7270,7 @@ _08153EFA: bx r0 .align 2, 0 _08153F14: .4byte gUnknown_203F43C -_08153F18: .4byte gUnknown_202063C +_08153F18: .4byte gSprites thumb_func_end sub_8153ED8 thumb_func_start sub_8153F1C @@ -7295,7 +7295,7 @@ _08153F2E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08153FB0 @ =gUnknown_202063C + ldr r1, _08153FB0 @ =gSprites adds r4, r0, r1 adds r0, r2, 0 adds r0, 0x16 @@ -7352,7 +7352,7 @@ _08153F9A: b _08153FBA .align 2, 0 _08153FAC: .4byte gUnknown_203F43C -_08153FB0: .4byte gUnknown_202063C +_08153FB0: .4byte gSprites _08153FB4: .4byte 0x0000fff0 _08153FB8: movs r0, 0 @@ -7384,7 +7384,7 @@ _08153FD4: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08154000 @ =gUnknown_202063C + ldr r1, _08154000 @ =gSprites adds r0, r1 movs r1, 0x1 bl StartSpriteAnim @@ -7396,14 +7396,14 @@ _08153FD4: b _081540CE .align 2, 0 _08153FFC: .4byte gUnknown_203F43C -_08154000: .4byte gUnknown_202063C +_08154000: .4byte gSprites _08154004: movs r4, 0 movs r0, 0xA subs r0, r5 cmp r4, r0 bge _081540CA - ldr r6, _08154034 @ =gUnknown_202063C + ldr r6, _08154034 @ =gSprites _08154010: cmp r5, 0x6 bls _08154078 @@ -7423,7 +7423,7 @@ _08154010: strh r1, [r2, 0x3E] b _08154092 .align 2, 0 -_08154034: .4byte gUnknown_202063C +_08154034: .4byte gSprites _08154038: .4byte gUnknown_203F43C _0815403C: .4byte 0x0000fffa _08154040: @@ -7488,7 +7488,7 @@ _081540A8: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081540D8 @ =gUnknown_202063C + ldr r1, _081540D8 @ =gSprites adds r0, r1 movs r1, 0x1 bl StartSpriteAnim @@ -7504,7 +7504,7 @@ _081540CE: bx r0 .align 2, 0 _081540D4: .4byte gUnknown_203F43C -_081540D8: .4byte gUnknown_202063C +_081540D8: .4byte gSprites thumb_func_end sub_8153FC8 thumb_func_start sub_81540DC @@ -7513,7 +7513,7 @@ sub_81540DC: @ 81540DC lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, _08154120 @ =gUnknown_202063C + ldr r7, _08154120 @ =gSprites movs r1, 0x1 ands r0, r1 lsls r4, r0, 2 @@ -7545,7 +7545,7 @@ _081540F2: pop {r0} bx r0 .align 2, 0 -_08154120: .4byte gUnknown_202063C +_08154120: .4byte gSprites _08154124: .4byte gUnknown_203F43C thumb_func_end sub_81540DC @@ -7685,7 +7685,7 @@ _08154234: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _08154270 @ =gUnknown_202063C + ldr r1, _08154270 @ =gSprites adds r0, r1 adds r1, r5, 0 bl StartSpriteAnim @@ -7704,7 +7704,7 @@ _08154234: pop {r0} bx r0 .align 2, 0 -_08154270: .4byte gUnknown_202063C +_08154270: .4byte gSprites thumb_func_end sub_815417C thumb_func_start sub_8154274 @@ -7720,7 +7720,7 @@ _0815427A: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081542E4 @ =gUnknown_202063C + ldr r1, _081542E4 @ =gSprites adds r0, r1 cmp r0, 0 beq _08154294 @@ -7745,7 +7745,7 @@ _081542AC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081542E4 @ =gUnknown_202063C + ldr r1, _081542E4 @ =gSprites adds r0, r1 cmp r0, 0 beq _081542C6 @@ -7765,7 +7765,7 @@ _081542C6: bx r0 .align 2, 0 _081542E0: .4byte gUnknown_203F400 -_081542E4: .4byte gUnknown_202063C +_081542E4: .4byte gSprites _081542E8: .4byte gUnknown_203F42C thumb_func_end sub_8154274 @@ -7774,7 +7774,7 @@ sub_81542EC: @ 81542EC lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r3, _0815431C @ =gUnknown_202063C + ldr r3, _0815431C @ =gSprites ldr r2, _08154320 @ =gUnknown_203F400 lsrs r0, 22 adds r0, r2 @@ -7796,7 +7796,7 @@ sub_81542EC: @ 81542EC strb r0, [r2] bx lr .align 2, 0 -_0815431C: .4byte gUnknown_202063C +_0815431C: .4byte gSprites _08154320: .4byte gUnknown_203F400 thumb_func_end sub_81542EC @@ -7806,7 +7806,7 @@ sub_8154324: @ 8154324 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, _08154368 @ =gUnknown_202063C + ldr r7, _08154368 @ =gSprites ldr r6, _0815436C @ =gUnknown_203F42C movs r1, 0x1 ands r0, r1 @@ -7837,7 +7837,7 @@ _0815433A: pop {r0} bx r0 .align 2, 0 -_08154368: .4byte gUnknown_202063C +_08154368: .4byte gSprites _0815436C: .4byte gUnknown_203F42C thumb_func_end sub_8154324 @@ -7845,7 +7845,7 @@ _0815436C: .4byte gUnknown_203F42C sub_8154370: @ 8154370 lsls r0, 24 lsls r1, 24 - ldr r3, _08154390 @ =gUnknown_202063C + ldr r3, _08154390 @ =gSprites ldr r2, _08154394 @ =gUnknown_203F400 lsrs r0, 22 adds r0, r2 @@ -7859,7 +7859,7 @@ sub_8154370: @ 8154370 strh r1, [r0, 0x22] bx lr .align 2, 0 -_08154390: .4byte gUnknown_202063C +_08154390: .4byte gSprites _08154394: .4byte gUnknown_203F400 thumb_func_end sub_8154370 @@ -7877,21 +7877,21 @@ sub_8154398: @ 8154398 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 - ldr r2, _081543C0 @ =gUnknown_202063C + ldr r2, _081543C0 @ =gSprites adds r0, r2 bl StartSpriteAnim pop {r0} bx r0 .align 2, 0 _081543BC: .4byte gUnknown_203F400 -_081543C0: .4byte gUnknown_202063C +_081543C0: .4byte gSprites thumb_func_end sub_8154398 thumb_func_start sub_81543C4 sub_81543C4: @ 81543C4 lsls r0, 24 lsrs r0, 24 - ldr r1, _081543E4 @ =gUnknown_202063C + ldr r1, _081543E4 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -7905,7 +7905,7 @@ sub_81543C4: @ 81543C4 strh r0, [r2, 0x22] bx lr .align 2, 0 -_081543E4: .4byte gUnknown_202063C +_081543E4: .4byte gSprites thumb_func_end sub_81543C4 thumb_func_start sub_81543E8 @@ -8048,7 +8048,7 @@ sub_81544F0: @ 81544F0 mov r12, r0 ldr r4, _08154538 @ =gUnknown_8478E0E adds r7, r4, 0x2 - ldr r6, _0815453C @ =gUnknown_202063C + ldr r6, _0815453C @ =gSprites movs r5, 0x1 _08154500: lsls r2, r3, 2 @@ -8080,7 +8080,7 @@ _08154500: .align 2, 0 _08154534: .4byte gUnknown_203F3F8 _08154538: .4byte gUnknown_8478E0E -_0815453C: .4byte gUnknown_202063C +_0815453C: .4byte gSprites thumb_func_end sub_81544F0 thumb_func_start sub_8154540 @@ -8088,7 +8088,7 @@ sub_8154540: @ 8154540 push {r4,r5,lr} movs r2, 0 ldr r5, _08154570 @ =gUnknown_203F3F8 - ldr r4, _08154574 @ =gUnknown_202063C + ldr r4, _08154574 @ =gSprites movs r3, 0 _0815454A: lsls r0, r2, 2 @@ -8111,7 +8111,7 @@ _0815454A: bx r0 .align 2, 0 _08154570: .4byte gUnknown_203F3F8 -_08154574: .4byte gUnknown_202063C +_08154574: .4byte gSprites thumb_func_end sub_8154540 thumb_func_start sub_8154578 @@ -8127,7 +8127,7 @@ _0815457E: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _081545B8 @ =gUnknown_202063C + ldr r1, _081545B8 @ =gSprites adds r0, r1 cmp r0, 0 beq _08154598 @@ -8147,7 +8147,7 @@ _08154598: bx r0 .align 2, 0 _081545B4: .4byte gUnknown_203F3F8 -_081545B8: .4byte gUnknown_202063C +_081545B8: .4byte gSprites thumb_func_end sub_8154578 thumb_func_start sub_81545BC @@ -8156,7 +8156,7 @@ sub_81545BC: @ 81545BC lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r7, _08154600 @ =gUnknown_202063C + ldr r7, _08154600 @ =gSprites ldr r6, _08154604 @ =gUnknown_203F3F8 movs r1, 0x1 ands r0, r1 @@ -8187,7 +8187,7 @@ _081545D2: pop {r0} bx r0 .align 2, 0 -_08154600: .4byte gUnknown_202063C +_08154600: .4byte gSprites _08154604: .4byte gUnknown_203F3F8 thumb_func_end sub_81545BC diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s index 64c60c0c7..3cd82f5fe 100644 --- a/asm/unk_8159F40.s +++ b/asm/unk_8159F40.s @@ -823,7 +823,7 @@ sub_815A540: @ 815A540 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r1, _0815A5B8 @ =gUnknown_202063C + ldr r1, _0815A5B8 @ =gSprites adds r0, r1 bl DestroySprite _0815A5A4: @@ -835,7 +835,7 @@ _0815A5A4: _0815A5AC: .4byte gUnknown_203ADFA _0815A5B0: .4byte gUnknown_2037078 _0815A5B4: .4byte gUnknown_2036E38 -_0815A5B8: .4byte gUnknown_202063C +_0815A5B8: .4byte gSprites thumb_func_end sub_815A540 thumb_func_start sub_815A5BC diff --git a/asm/unk_815F138.s b/asm/unk_815F138.s index 677da0341..f133d4e27 100644 --- a/asm/unk_815F138.s +++ b/asm/unk_815F138.s @@ -139,7 +139,7 @@ _0815F21C: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0815F25C @ =gUnknown_202063C + ldr r4, _0815F25C @ =gSprites adds r0, r4 bl FreeSpriteOamMatrix movs r3, 0xE @@ -155,7 +155,7 @@ _0815F252: strh r0, [r5] b _0815F29E .align 2, 0 -_0815F25C: .4byte gUnknown_202063C +_0815F25C: .4byte gSprites _0815F260: ldrb r0, [r5, 0x10] bl sub_815F444 @@ -166,7 +166,7 @@ _0815F260: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 - ldr r4, _0815F2A8 @ =gUnknown_202063C + ldr r4, _0815F2A8 @ =gSprites adds r0, r4 bl DestroySprite movs r0, 0x12 @@ -188,7 +188,7 @@ _0815F29E: pop {r0} bx r0 .align 2, 0 -_0815F2A8: .4byte gUnknown_202063C +_0815F2A8: .4byte gSprites thumb_func_end sub_815F1AC thumb_func_start sub_815F2AC @@ -199,7 +199,7 @@ sub_815F2AC: @ 815F2AC lsls r1, r0, 4 adds r1, r0 lsls r1, 2 - ldr r0, _0815F2D0 @ =gUnknown_202063C + ldr r0, _0815F2D0 @ =gSprites adds r4, r1, r0 movs r1, 0x2E ldrsh r0, [r4, r1] @@ -213,7 +213,7 @@ _0815F2C6: ldr r0, [r0] mov pc, r0 .align 2, 0 -_0815F2D0: .4byte gUnknown_202063C +_0815F2D0: .4byte gSprites _0815F2D4: .4byte _0815F2D8 .align 2, 0 _0815F2D8: @@ -362,7 +362,7 @@ sub_815F3E0: @ 815F3E0 lsrs r1, 24 lsls r2, 24 lsrs r2, 24 - ldr r0, _0815F438 @ =gUnknown_202063C + ldr r0, _0815F438 @ =gSprites mov r8, r0 lsls r4, r1, 4 adds r4, r1 @@ -400,7 +400,7 @@ sub_815F3E0: @ 815F3E0 pop {r0} bx r0 .align 2, 0 -_0815F438: .4byte gUnknown_202063C +_0815F438: .4byte gSprites _0815F43C: .4byte 0x0000ffd8 _0815F440: .4byte sub_815F470 thumb_func_end sub_815F3E0 @@ -411,7 +411,7 @@ sub_815F444: @ 815F444 lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r2, _0815F468 @ =gUnknown_202063C + ldr r2, _0815F468 @ =gSprites lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -427,7 +427,7 @@ _0815F462: pop {r1} bx r1 .align 2, 0 -_0815F468: .4byte gUnknown_202063C +_0815F468: .4byte gSprites _0815F46C: .4byte sub_815F470 thumb_func_end sub_815F444 @@ -549,14 +549,14 @@ _0815F548: asrs r0, 16 cmp r0, 0x28 ble _0815F55A - ldr r0, _0815F560 @ =nullsub_8 + ldr r0, _0815F560 @ =SpriteCallbackDummy str r0, [r5, 0x1C] _0815F55A: pop {r4,r5} pop {r0} bx r0 .align 2, 0 -_0815F560: .4byte nullsub_8 +_0815F560: .4byte SpriteCallbackDummy thumb_func_end sub_815F470 thumb_func_start sub_815F564 @@ -705,7 +705,7 @@ sub_815F610: @ 815F610 lsrs r0, 24 mov r4, r8 strh r0, [r4] - ldr r2, _0815F6DC @ =gUnknown_202063C + ldr r2, _0815F6DC @ =gSprites mov r5, r9 movs r6, 0 ldrsh r1, [r5, r6] @@ -747,7 +747,7 @@ sub_815F610: @ 815F610 .align 2, 0 _0815F6D4: .4byte gUnknown_847A878 _0815F6D8: .4byte 0xffe00000 -_0815F6DC: .4byte gUnknown_202063C +_0815F6DC: .4byte gSprites thumb_func_end sub_815F610 .align 2, 0 @ Don't pad with nop. diff --git a/asm/util.s b/asm/util.s index f27e3c28f..a3efaa8f2 100644 --- a/asm/util.s +++ b/asm/util.s @@ -16,7 +16,7 @@ CreateInvisibleSpriteWithCallback: @ 8044EF8 bl CreateSprite lsls r0, 24 lsrs r0, 24 - ldr r5, _08044F30 @ =gUnknown_202063C + ldr r5, _08044F30 @ =gSprites lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -34,7 +34,7 @@ CreateInvisibleSpriteWithCallback: @ 8044EF8 bx r1 .align 2, 0 _08044F2C: .4byte gUnknown_825E4DC -_08044F30: .4byte gUnknown_202063C +_08044F30: .4byte gSprites thumb_func_end CreateInvisibleSpriteWithCallback thumb_func_start StoreWordInTwoHalfwords diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s index 425062c28..0bf4faebf 100644 --- a/asm/vs_seeker.s +++ b/asm/vs_seeker.s @@ -1135,7 +1135,7 @@ sub_810CF04: @ 810CF04 ldrb r2, [r1, 0x8] cmp r0, r2 bcc _0810CF4C - ldr r2, _0810CF48 @ =gUnknown_202063C + ldr r2, _0810CF48 @ =gSprites ldrb r1, [r1, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -1150,7 +1150,7 @@ sub_810CF04: @ 810CF04 .align 2, 0 _0810CF40: .4byte gUnknown_2036E38 _0810CF44: .4byte gUnknown_2036DFC -_0810CF48: .4byte gUnknown_202063C +_0810CF48: .4byte gSprites _0810CF4C: movs r0, 0 _0810CF4E: diff --git a/common_syms/sprite.txt b/common_syms/sprite.txt new file mode 100644 index 000000000..627c01c0d --- /dev/null +++ b/common_syms/sprite.txt @@ -0,0 +1,2 @@ +gOamMatrixAllocBitmap +gReservedSpritePaletteCount diff --git a/data/data.s b/data/data.s index d8642571b..900d39994 100644 --- a/data/data.s +++ b/data/data.s @@ -1,129 +1,6 @@ .section .rodata -gDownArrowTiles:: @ 81EA14C - .incbin "baserom.gba", 0x1EA14C, 0x100 - -gDarkDownArrowTiles:: @ 81EA24C - .incbin "baserom.gba", 0x1EA24C, 0x400 - -gDownArrowYCoords:: @ 81EA64C - .incbin "baserom.gba", 0x1EA64C, 0x4 - -gUnknown_81EA650:: @ 81EA650 - .incbin "baserom.gba", 0x1EA650, 0x4 - -gGlyphWidthFuncs:: @ 81EA654 - .incbin "baserom.gba", 0x1EA654, 0x38 - -gUnknown_81EA68C:: @ 81EA68C - .incbin "baserom.gba", 0x1EA68C, 0x18 - -gUnknown_81EA6A4:: @ 81EA6A4 - .incbin "baserom.gba", 0x1EA6A4, 0x10 - -gUnknown_81EA6B4:: @ 81EA6B4 - .incbin "baserom.gba", 0x1EA6B4, 0x18 - -gUnknown_81EA6CC:: @ 81EA6CC - .incbin "baserom.gba", 0x1EA6CC, 0x34 - -gUnknown_81EA700:: @ 81EA700 - .incbin "baserom.gba", 0x1EA700, 0x800 - -gUnknown_81EAF00:: @ 81EAF00 - .incbin "baserom.gba", 0x1EAF00, 0x4000 - -gUnknown_81EEF00:: @ 81EEF00 - .incbin "baserom.gba", 0x1EEF00, 0x200 - -gUnknown_81EF100:: @ 81EF100 - .incbin "baserom.gba", 0x1EF100, 0x4000 - -gUnknown_81F3100:: @ 81F3100 - .incbin "baserom.gba", 0x1F3100, 0x8000 - -gUnknown_81FB100:: @ 81FB100 - .incbin "baserom.gba", 0x1FB100, 0x200 - -gUnknown_81FB300:: @ 81FB300 - .incbin "baserom.gba", 0x1FB300, 0x4000 - -gUnknown_81FF300:: @ 81FF300 - .incbin "baserom.gba", 0x1FF300, 0x8000 - -gUnknown_8207300:: @ 8207300 - .incbin "baserom.gba", 0x207300, 0x200 - -gUnknown_8207500:: @ 8207500 - .incbin "baserom.gba", 0x207500, 0x8000 - -gUnknown_820F500:: @ 820F500 - .incbin "baserom.gba", 0x20F500, 0x118 - -gUnknown_820F618:: @ 820F618 - .incbin "baserom.gba", 0x20F618, 0x8000 - -gUnknown_8217618:: @ 8217618 - .incbin "baserom.gba", 0x217618, 0x200 - -gUnknown_8217818:: @ 8217818 - .incbin "baserom.gba", 0x217818, 0x8000 - -gUnknown_821F818:: @ 821F818 - .incbin "baserom.gba", 0x21F818, 0x118 - -gUnknown_821F930:: @ 821F930 - .incbin "baserom.gba", 0x21F930, 0x8000 - -gUnknown_8227930:: @ 8227930 - .incbin "baserom.gba", 0x227930, 0x200 - -gUnknown_8227B30:: @ 8227B30 - .incbin "baserom.gba", 0x227B30, 0x8000 - -gUnknown_822FB30:: @ 822FB30 - .incbin "baserom.gba", 0x22FB30, 0x118 - -gUnknown_822FC48:: @ 822FC48 - .incbin "baserom.gba", 0x22FC48, 0x2000 - - .incbin "baserom.gba", 0x231C48, 0x3D - -gUnknown_8231C85:: @ 8231C85 - .incbin "baserom.gba", 0x231C85, 0x1B - -gUnknown_8231CA0:: @ 8231CA0 - .incbin "baserom.gba", 0x231CA0, 0x44 - -gUnknown_8231CE4:: @ 8231CE4 - .incbin "baserom.gba", 0x231CE4, 0xC - -gUnknown_8231CF0:: @ 8231CF0 - .incbin "baserom.gba", 0x231CF0, 0xC - -gUnknown_8231CFC:: @ 8231CFC - .incbin "baserom.gba", 0x231CFC, 0x4 - -gUnknown_8231D00:: @ 8231D00 - .incbin "baserom.gba", 0x231D00, 0x18 - -gUnknown_8231D18:: @ 8231D18 - .incbin "baserom.gba", 0x231D18, 0x8 - -gUnknown_8231D20:: @ 8231D20 - .incbin "baserom.gba", 0x231D20, 0x8 - -gUnknown_8231D28:: @ 8231D28 - .incbin "baserom.gba", 0x231D28, 0x10 - -gUnknown_8231D38:: @ 8231D38 - .incbin "baserom.gba", 0x231D38, 0x10 - -gUnknown_8231D48:: @ 8231D48 - .incbin "baserom.gba", 0x231D48, 0x60 - -gUnknown_8231DA8:: @ 8231DA8 - .incbin "baserom.gba", 0x231DA8, 0x68 + .incbin "baserom.gba", 0x231DD8, 0x38 gUnknown_8231E10:: @ 8231E10 .incbin "baserom.gba", 0x231E10, 0x10 diff --git a/data/text.s b/data/text.s new file mode 100644 index 000000000..c9948aef5 --- /dev/null +++ b/data/text.s @@ -0,0 +1,88 @@ + .section .rodata + +gDownArrowTiles:: @ 81EA14C + .incbin "baserom.gba", 0x1EA14C, 0x100 + +gDarkDownArrowTiles:: @ 81EA24C + .incbin "baserom.gba", 0x1EA24C, 0x400 + +gDownArrowYCoords:: @ 81EA64C + .incbin "baserom.gba", 0x1EA64C, 0x4 + +gUnknown_81EA650:: @ 81EA650 + .incbin "baserom.gba", 0x1EA650, 0x4 + +gGlyphWidthFuncs:: @ 81EA654 + .incbin "baserom.gba", 0x1EA654, 0x38 + +gUnknown_81EA68C:: @ 81EA68C + .incbin "baserom.gba", 0x1EA68C, 0x18 + +gUnknown_81EA6A4:: @ 81EA6A4 + .incbin "baserom.gba", 0x1EA6A4, 0x10 + +gUnknown_81EA6B4:: @ 81EA6B4 + .incbin "baserom.gba", 0x1EA6B4, 0x18 + +gUnknown_81EA6CC:: @ 81EA6CC + .incbin "baserom.gba", 0x1EA6CC, 0x34 + +gUnknown_81EA700:: @ 81EA700 + .incbin "baserom.gba", 0x1EA700, 0x800 + +gUnknown_81EAF00:: @ 81EAF00 + .incbin "baserom.gba", 0x1EAF00, 0x4000 + +gUnknown_81EEF00:: @ 81EEF00 + .incbin "baserom.gba", 0x1EEF00, 0x200 + +gUnknown_81EF100:: @ 81EF100 + .incbin "baserom.gba", 0x1EF100, 0x4000 + +gUnknown_81F3100:: @ 81F3100 + .incbin "baserom.gba", 0x1F3100, 0x8000 + +gUnknown_81FB100:: @ 81FB100 + .incbin "baserom.gba", 0x1FB100, 0x200 + +gUnknown_81FB300:: @ 81FB300 + .incbin "baserom.gba", 0x1FB300, 0x4000 + +gUnknown_81FF300:: @ 81FF300 + .incbin "baserom.gba", 0x1FF300, 0x8000 + +gUnknown_8207300:: @ 8207300 + .incbin "baserom.gba", 0x207300, 0x200 + +gUnknown_8207500:: @ 8207500 + .incbin "baserom.gba", 0x207500, 0x8000 + +gUnknown_820F500:: @ 820F500 + .incbin "baserom.gba", 0x20F500, 0x118 + +gUnknown_820F618:: @ 820F618 + .incbin "baserom.gba", 0x20F618, 0x8000 + +gUnknown_8217618:: @ 8217618 + .incbin "baserom.gba", 0x217618, 0x200 + +gUnknown_8217818:: @ 8217818 + .incbin "baserom.gba", 0x217818, 0x8000 + +gUnknown_821F818:: @ 821F818 + .incbin "baserom.gba", 0x21F818, 0x118 + +gUnknown_821F930:: @ 821F930 + .incbin "baserom.gba", 0x21F930, 0x8000 + +gUnknown_8227930:: @ 8227930 + .incbin "baserom.gba", 0x227930, 0x200 + +gUnknown_8227B30:: @ 8227B30 + .incbin "baserom.gba", 0x227B30, 0x8000 + +gUnknown_822FB30:: @ 822FB30 + .incbin "baserom.gba", 0x22FB30, 0x118 + +gUnknown_822FC48:: @ 822FC48 + .incbin "baserom.gba", 0x22FC48, 0x2000 diff --git a/ld_script.txt b/ld_script.txt index c5b23a51d..50127adfe 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -94,7 +94,7 @@ SECTIONS { src/window_8bpp.o(.text); src/text.o(.text); asm/text.o(.text); - asm/sprite.o(.text); + src/sprite.o(.text); asm/string_util.o(.text); asm/link.o(.text); asm/multiboot.o(.text); @@ -399,6 +399,8 @@ SECTIONS { src/text_printer.o(.rodata); src/window.o(.rodata); src/text.o(.rodata); + data/text.o(.rodata); + src/sprite.o(.rodata); data/data.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); diff --git a/src/sprite.c b/src/sprite.c new file mode 100644 index 000000000..60bcd1da4 --- /dev/null +++ b/src/sprite.c @@ -0,0 +1,1844 @@ +#include "global.h" +#include "sprite.h" +#include "main.h" +#include "palette.h" + +#define MAX_SPRITE_COPY_REQUESTS 64 + +#define OAM_MATRIX_COUNT 32 + +#define SET_SPRITE_TILE_RANGE(index, start, count) \ +{ \ + sSpriteTileRanges[index * 2] = start; \ + (sSpriteTileRanges + 1)[index * 2] = count; \ +} + +#define ALLOC_SPRITE_TILE(n) \ +{ \ + gSpriteTileAllocBitmap[(n) / 8] |= (1 << ((n) % 8)); \ +} + +#define FREE_SPRITE_TILE(n) \ +{ \ + gSpriteTileAllocBitmap[(n) / 8] &= ~(1 << ((n) % 8)); \ +} + +#define SPRITE_TILE_IS_ALLOCATED(n) ((gSpriteTileAllocBitmap[(n) / 8] >> ((n) % 8)) & 1) + + +struct SpriteCopyRequest +{ + const u8 *src; + u8 *dest; + u16 size; +}; + +struct OamDimensions +{ + s8 width; + s8 height; +}; + +static void UpdateOamCoords(void); +static void BuildSpritePriorities(void); +static void SortSprites(void); +static void CopyMatricesToOamBuffer(void); +static void AddSpritesToOamBuffer(void); +static u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority); +static void ResetOamMatrices(void); +static void ResetSprite(struct Sprite *sprite); +s16 AllocSpriteTiles(u16 tileCount); +static void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images); +static void ResetAllSprites(void); +static void BeginAnim(struct Sprite *sprite); +static void ContinueAnim(struct Sprite *sprite); +static void AnimCmd_frame(struct Sprite *sprite); +static void AnimCmd_end(struct Sprite *sprite); +static void AnimCmd_jump(struct Sprite *sprite); +static void AnimCmd_loop(struct Sprite *sprite); +static void BeginAnimLoop(struct Sprite *sprite); +static void ContinueAnimLoop(struct Sprite *sprite); +static void JumpToTopOfAnimLoop(struct Sprite *sprite); +static void BeginAffineAnim(struct Sprite *sprite); +static void ContinueAffineAnim(struct Sprite *sprite); +static void AffineAnimDelay(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_loop(u8 matrixNum, struct Sprite *sprite); +static void BeginAffineAnimLoop(u8 matrixNum, struct Sprite *sprite); +static void ContinueAffineAnimLoop(u8 matrixNum, struct Sprite *sprite); +static void JumpToTopOfAffineAnimLoop(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_jump(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_end(u8 matrixNum, struct Sprite *sprite); +static void AffineAnimCmd_frame(u8 matrixNum, struct Sprite *sprite); +static void CopyOamMatrix(u8 destMatrixIndex, struct OamMatrix *srcMatrix); +static u8 GetSpriteMatrixNum(struct Sprite *sprite); +static void SetSpriteOamFlipBits(struct Sprite *sprite, u8 hFlip, u8 vFlip); +static void AffineAnimStateRestartAnim(u8 matrixNum); +static void AffineAnimStateStartAnim(u8 matrixNum, u8 animNum); +static void AffineAnimStateReset(u8 matrixNum); +static void ApplyAffineAnimFrameAbsolute(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd); +static void DecrementAnimDelayCounter(struct Sprite *sprite); +static bool8 DecrementAffineAnimDelayCounter(struct Sprite *sprite, u8 matrixNum); +static void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd); +static s16 ConvertScaleParam(s16 scale); +static void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd); +static void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd); +static u8 IndexOfSpriteTileTag(u16 tag); +static void AllocSpriteTileRange(u16 tag, u16 start, u16 count); +static void DoLoadSpritePalette(const u16 *src, u16 paletteOffset); +static void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2); + +typedef void (*AnimFunc)(struct Sprite *); +typedef void (*AnimCmdFunc)(struct Sprite *); +typedef void (*AffineAnimCmdFunc)(u8 matrixNum, struct Sprite *); + +#define DUMMY_OAM_DATA \ +{ \ + 160, /* Y (off-screen) */ \ + 0, \ + 0, \ + 0, \ + 0, \ + 0, \ + 304, /* X */ \ + 0, \ + 0, \ + 0, \ + 3, /* lowest priority */ \ + 0, \ + 0 \ +} + +#define ANIM_END 0xFFFF +#define AFFINE_ANIM_END 0x7FFF + +// forward declarations +const union AnimCmd * const gDummySpriteAnimTable[]; +const union AffineAnimCmd * const gDummySpriteAffineAnimTable[]; +const struct SpriteTemplate gDummySpriteTemplate; + +// Unreferenced error message. +// It means "The DMA transfer request table has exceeded its limit." +static const u8 sDmaOverErrorMsg[] = + _( + "DMA OVER\n" + "DMAてんそう\n" + "リクエストテーブルが\n" + "オーバーしました" +); + +// Unreferenced data. Also unreferenced in R/S. +static const u8 sUnknownData[24] = +{ + 0x01, 0x04, 0x10, 0x40, + 0x02, 0x04, 0x08, 0x20, + 0x02, 0x04, 0x08, 0x20, + 0x01, 0x04, 0x10, 0x40, + 0x02, 0x04, 0x08, 0x20, + 0x02, 0x04, 0x08, 0x20, +}; + +static const u8 sCenterToCornerVecTable[3][4][2] = +{ + { // square + { -4, -4 }, + { -8, -8 }, + { -16, -16 }, + { -32, -32 }, + }, + { // horizontal rectangle + { -8, -4 }, + { -16, -4 }, + { -16, -8 }, + { -32, -16 }, + }, + { // vertical rectangle + { -4, -8 }, + { -4, -16 }, + { -8, -16 }, + { -16, -32 }, + }, +}; + +static const struct Sprite sDummySprite = +{ + .oam = DUMMY_OAM_DATA, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .template = &gDummySpriteTemplate, + .subspriteTables = NULL, + .callback = SpriteCallbackDummy, + .pos1 = { 304, 160 }, + .pos2 = { 0, 0 }, + .centerToCornerVecX = 0, + .centerToCornerVecY = 0, + .animNum = 0, + .animCmdIndex = 0, + .animDelayCounter = 0, + .animPaused = 0, + .affineAnimPaused = 0, + .animLoopCounter = 0, + .data = {0, 0, 0, 0, 0, 0, 0}, + .inUse = 0, + .coordOffsetEnabled = 0, + .invisible = 0, + .flags_3 = 0, + .flags_4 = 0, + .flags_5 = 0, + .flags_6 = 0, + .flags_7 = 0, + .hFlip = 0, + .vFlip = 0, + .animBeginning = 0, + .affineAnimBeginning = 0, + .animEnded = 0, + .affineAnimEnded = 0, + .usingSheet = 0, + .flags_f = 0, + .sheetTileStart = 0, + .subspriteTableNum = 0, + .subspriteMode = 0, + .subpriority = 0xFF +}; + +const struct OamData gDummyOamData = DUMMY_OAM_DATA; + +static const union AnimCmd sDummyAnim = { ANIM_END }; + +const union AnimCmd * const gDummySpriteAnimTable[] = { &sDummyAnim }; + +static const union AffineAnimCmd sDummyAffineAnim = { AFFINE_ANIM_END }; + +const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffineAnim }; + +const struct SpriteTemplate gDummySpriteTemplate = +{ + .tileTag = 0, + .paletteTag = 0xFFFF, + .oam = &gDummyOamData, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy +}; + +static const AnimFunc sAnimFuncs[] = +{ + ContinueAnim, + BeginAnim, +}; + +static const AnimFunc sAffineAnimFuncs[] = +{ + ContinueAffineAnim, + BeginAffineAnim, +}; + +static const AnimCmdFunc sAnimCmdFuncs[] = +{ + AnimCmd_loop, + AnimCmd_jump, + AnimCmd_end, + AnimCmd_frame, +}; + +static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] = +{ + AffineAnimCmd_loop, + AffineAnimCmd_jump, + AffineAnimCmd_end, + AffineAnimCmd_frame, +}; + +static const s32 gUnknown_082EC6F4[24] = +{ + 8, 8, 0x10, 0x10, 0x20, 0x20, + 0x40, 0x40, 0x10, 8, 0x20, 8, + 0x20, 0x10, 0x40, 0x20, 8, 0x10, + 8, 0x20, 0x10, 0x20, 0x20, 0x40, +}; + +static const struct OamDimensions sOamDimensions[3][4] = +{ + { // square + { 8, 8 }, + { 16, 16 }, + { 32, 32 }, + { 64, 64 }, + }, + { // horizontal rectangle + { 16, 8 }, + { 32, 8 }, + { 32, 16 }, + { 64, 32 }, + }, + { // vertical rectangle + { 8, 16 }, + { 8, 32 }, + { 16, 32 }, + { 32, 64 }, + }, +}; + +static u16 sSpriteTileRangeTags[MAX_SPRITES]; +static u16 sSpriteTileRanges[MAX_SPRITES * 2]; +static struct AffineAnimState sAffineAnimStates[OAM_MATRIX_COUNT]; +static u16 sSpritePaletteTags[16]; + +u32 gOamMatrixAllocBitmap; +u8 gReservedSpritePaletteCount; + +EWRAM_DATA struct Sprite gSprites[MAX_SPRITES + 1] = {0}; +EWRAM_DATA u16 gSpritePriorities[MAX_SPRITES] = {0}; +EWRAM_DATA u8 gSpriteOrder[MAX_SPRITES] = {0}; +EWRAM_DATA bool8 gShouldProcessSpriteCopyRequests = 0; +EWRAM_DATA u8 gSpriteCopyRequestCount = 0; +EWRAM_DATA struct SpriteCopyRequest gSpriteCopyRequests[MAX_SPRITES] = {0}; +EWRAM_DATA u8 gOamLimit = 0; +EWRAM_DATA u16 gReservedSpriteTileCount = 0; +EWRAM_DATA u8 gSpriteTileAllocBitmap[128] = {0}; +EWRAM_DATA s16 gSpriteCoordOffsetX = 0; +EWRAM_DATA s16 gSpriteCoordOffsetY = 0; +EWRAM_DATA struct OamMatrix gOamMatrices[OAM_MATRIX_COUNT] = {0}; +EWRAM_DATA bool8 gAffineAnimsDisabled = 0; + +void ResetSpriteData(void) +{ + ResetOamRange(0, 128); + ResetAllSprites(); + ClearSpriteCopyRequests(); + ResetAffineAnimData(); + FreeSpriteTileRanges(); + gOamLimit = 64; + gReservedSpriteTileCount = 0; + AllocSpriteTiles(0); + gSpriteCoordOffsetX = 0; + gSpriteCoordOffsetY = 0; +} + +void AnimateSprites(void) +{ + u8 i; + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + + if (sprite->inUse) + { + sprite->callback(sprite); + + if (sprite->inUse) + AnimateSprite(sprite); + } + } +} + +void BuildOamBuffer(void) +{ + u8 temp; + UpdateOamCoords(); + BuildSpritePriorities(); + SortSprites(); + temp = gMain.oamLoadDisabled; + gMain.oamLoadDisabled = TRUE; + AddSpritesToOamBuffer(); + CopyMatricesToOamBuffer(); + gMain.oamLoadDisabled = temp; + gShouldProcessSpriteCopyRequests = TRUE; +} + +void UpdateOamCoords(void) +{ + u8 i; + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + if (sprite->inUse && !sprite->invisible) + { + if (sprite->coordOffsetEnabled) + { + sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX; + sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY; + } + else + { + sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX; + sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY; + } + } + } +} + +void BuildSpritePriorities(void) +{ + u16 i; + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + u16 priority = sprite->subpriority | (sprite->oam.priority << 8); + gSpritePriorities[i] = priority; + } +} + +void SortSprites(void) +{ + u8 i; + for (i = 1; i < MAX_SPRITES; i++) + { + u8 j = i; + struct Sprite *sprite1 = &gSprites[gSpriteOrder[i - 1]]; + struct Sprite *sprite2 = &gSprites[gSpriteOrder[i]]; + u16 sprite1Priority = gSpritePriorities[gSpriteOrder[i - 1]]; + u16 sprite2Priority = gSpritePriorities[gSpriteOrder[i]]; + s16 sprite1Y = sprite1->oam.y; + s16 sprite2Y = sprite2->oam.y; + + if (sprite1Y >= DISPLAY_HEIGHT) + sprite1Y = sprite1Y - 256; + + if (sprite2Y >= DISPLAY_HEIGHT) + sprite2Y = sprite2Y - 256; + + if (sprite1->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite1->oam.size == 3) + { + u32 shape = sprite1->oam.shape; + if (shape == ST_OAM_SQUARE || shape == 2) + { + if (sprite1Y > 128) + sprite1Y = sprite1Y - 256; + } + } + + if (sprite2->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite2->oam.size == 3) + { + u32 shape = sprite2->oam.shape; + if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE) + { + if (sprite2Y > 128) + sprite2Y = sprite2Y - 256; + } + } + + while (j > 0 + && ((sprite1Priority > sprite2Priority) + || (sprite1Priority == sprite2Priority && sprite1Y < sprite2Y))) + { + u8 temp = gSpriteOrder[j]; + gSpriteOrder[j] = gSpriteOrder[j - 1]; + gSpriteOrder[j - 1] = temp; + + // UB: If j equals 1, then j-- makes j equal 0. + // Then, gSpriteOrder[-1] gets accessed below. + // Although this doesn't result in a bug in the ROM, + // the behavior is undefined. + j--; + + sprite1 = &gSprites[gSpriteOrder[j - 1]]; + sprite2 = &gSprites[gSpriteOrder[j]]; + sprite1Priority = gSpritePriorities[gSpriteOrder[j - 1]]; + sprite2Priority = gSpritePriorities[gSpriteOrder[j]]; + sprite1Y = sprite1->oam.y; + sprite2Y = sprite2->oam.y; + + if (sprite1Y >= DISPLAY_HEIGHT) + sprite1Y = sprite1Y - 256; + + if (sprite2Y >= DISPLAY_HEIGHT) + sprite2Y = sprite2Y - 256; + + if (sprite1->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite1->oam.size == 3) + { + u32 shape = sprite1->oam.shape; + if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE) + { + if (sprite1Y > 128) + sprite1Y = sprite1Y - 256; + } + } + + if (sprite2->oam.affineMode == ST_OAM_AFFINE_DOUBLE + && sprite2->oam.size == 3) + { + u32 shape = sprite2->oam.shape; + if (shape == ST_OAM_SQUARE || shape == ST_OAM_V_RECTANGLE) + { + if (sprite2Y > 128) + sprite2Y = sprite2Y - 256; + } + } + } + } +} + +void CopyMatricesToOamBuffer(void) +{ + u8 i; + for (i = 0; i < OAM_MATRIX_COUNT; i++) + { + u32 base = 4 * i; + gMain.oamBuffer[base + 0].affineParam = gOamMatrices[i].a; + gMain.oamBuffer[base + 1].affineParam = gOamMatrices[i].b; + gMain.oamBuffer[base + 2].affineParam = gOamMatrices[i].c; + gMain.oamBuffer[base + 3].affineParam = gOamMatrices[i].d; + } +} + +void AddSpritesToOamBuffer(void) +{ + int i = 0; + u8 oamIndex = 0; + + while (i < MAX_SPRITES) + { + struct Sprite *sprite = &gSprites[gSpriteOrder[i]]; + if (sprite->inUse && !sprite->invisible && AddSpriteToOamBuffer(sprite, &oamIndex)) + return; + i++; + } + + while (oamIndex < gOamLimit) + { + gMain.oamBuffer[oamIndex] = gDummyOamData; + oamIndex++; + } +} + +u8 CreateSprite(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + if (!gSprites[i].inUse) + return CreateSpriteAt(i, template, x, y, subpriority); + + return MAX_SPRITES; +} + +u8 CreateSpriteAtEnd(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +{ + s16 i; + + for (i = MAX_SPRITES - 1; i > -1; i--) + if (!gSprites[i].inUse) + return CreateSpriteAt(i, template, x, y, subpriority); + + return MAX_SPRITES; +} + +u8 CreateInvisibleSprite(void (*callback)(struct Sprite *)) +{ + u8 index = CreateSprite(&gDummySpriteTemplate, 0, 0, 31); + + if (index == MAX_SPRITES) + { + return MAX_SPRITES; + } + else + { + gSprites[index].invisible = TRUE; + gSprites[index].callback = callback; + return index; + } +} + +u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +{ + struct Sprite *sprite = &gSprites[index]; + + ResetSprite(sprite); + + sprite->inUse = TRUE; + sprite->animBeginning = TRUE; + sprite->affineAnimBeginning = TRUE; + sprite->usingSheet = TRUE; + + sprite->subpriority = subpriority; + sprite->oam = *template->oam; + sprite->anims = template->anims; + sprite->affineAnims = template->affineAnims; + sprite->template = template; + sprite->callback = template->callback; + sprite->pos1.x = x; + sprite->pos1.y = y; + + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + + if (template->tileTag == 0xFFFF) + { + s16 tileNum; + sprite->images = template->images; + tileNum = AllocSpriteTiles((u8)(sprite->images->size / TILE_SIZE_4BPP)); + if (tileNum == -1) + { + ResetSprite(sprite); + return MAX_SPRITES; + } + sprite->oam.tileNum = tileNum; + sprite->usingSheet = FALSE; + sprite->sheetTileStart = 0; + } + else + { + sprite->sheetTileStart = GetSpriteTileStartByTag(template->tileTag); + SetSpriteSheetFrameTileNum(sprite); + } + + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + InitSpriteAffineAnim(sprite); + + if (template->paletteTag != 0xFFFF) + sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag); + + return index; +} + +u8 CreateSpriteAndAnimate(const struct SpriteTemplate *template, s16 x, s16 y, u8 subpriority) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + struct Sprite *sprite = &gSprites[i]; + + if (!gSprites[i].inUse) + { + u8 index = CreateSpriteAt(i, template, x, y, subpriority); + + if (index == MAX_SPRITES) + return MAX_SPRITES; + + gSprites[i].callback(sprite); + + if (gSprites[i].inUse) + AnimateSprite(sprite); + + return index; + } + } + + return MAX_SPRITES; +} + +void DestroySprite(struct Sprite *sprite) +{ + if (sprite->inUse) + { + if (!sprite->usingSheet) + { + u16 i; + u16 tileEnd = (sprite->images->size / TILE_SIZE_4BPP) + sprite->oam.tileNum; + for (i = sprite->oam.tileNum; i < tileEnd; i++) + FREE_SPRITE_TILE(i); + } + ResetSprite(sprite); + } +} + +void ResetOamRange(u8 a, u8 b) +{ + u8 i; + + for (i = a; i < b; i++) + { + struct OamData *oamBuffer = gMain.oamBuffer; + oamBuffer[i] = *(struct OamData *)&gDummyOamData; + } +} + +void LoadOam(void) +{ + if (!gMain.oamLoadDisabled) + CpuCopy32(gMain.oamBuffer, (void *)OAM, sizeof(gMain.oamBuffer)); +} + +void ClearSpriteCopyRequests(void) +{ + u8 i; + + gShouldProcessSpriteCopyRequests = FALSE; + gSpriteCopyRequestCount = 0; + + for (i = 0; i < MAX_SPRITE_COPY_REQUESTS; i++) + { + gSpriteCopyRequests[i].src = 0; + gSpriteCopyRequests[i].dest = 0; + gSpriteCopyRequests[i].size = 0; + } +} + +void ResetOamMatrices(void) +{ + u8 i; + for (i = 0; i < OAM_MATRIX_COUNT; i++) + { + // set to identity matrix + gOamMatrices[i].a = 0x0100; + gOamMatrices[i].b = 0x0000; + gOamMatrices[i].c = 0x0000; + gOamMatrices[i].d = 0x0100; + } +} + +void SetOamMatrix(u8 matrixNum, u16 a, u16 b, u16 c, u16 d) +{ + gOamMatrices[matrixNum].a = a; + gOamMatrices[matrixNum].b = b; + gOamMatrices[matrixNum].c = c; + gOamMatrices[matrixNum].d = d; +} + +void ResetSprite(struct Sprite *sprite) +{ + *sprite = sDummySprite; +} + +void CalcCenterToCornerVec(struct Sprite *sprite, u8 shape, u8 size, u8 affineMode) +{ + u8 x = sCenterToCornerVecTable[shape][size][0]; + u8 y = sCenterToCornerVecTable[shape][size][1]; + + if (affineMode & ST_OAM_AFFINE_DOUBLE_MASK) + { + x *= 2; + y *= 2; + } + + sprite->centerToCornerVecX = x; + sprite->centerToCornerVecY = y; +} + +s16 AllocSpriteTiles(u16 tileCount) +{ + u16 i; + s16 start; + u16 numTilesFound; + + if (tileCount == 0) + { + // Free all unreserved tiles if the tile count is 0. + for (i = gReservedSpriteTileCount; i < TOTAL_OBJ_TILE_COUNT; i++) + FREE_SPRITE_TILE(i); + + return 0; + } + + i = gReservedSpriteTileCount; + + for (;;) + { + while (SPRITE_TILE_IS_ALLOCATED(i)) + { + i++; + + if (i == TOTAL_OBJ_TILE_COUNT) + return -1; + } + + start = i; + numTilesFound = 1; + + while (numTilesFound != tileCount) + { + i++; + + if (i == TOTAL_OBJ_TILE_COUNT) + return -1; + + if (!SPRITE_TILE_IS_ALLOCATED(i)) + numTilesFound++; + else + break; + } + + if (numTilesFound == tileCount) + break; + } + + for (i = start; i < tileCount + start; i++) + ALLOC_SPRITE_TILE(i); + + return start; +} + +u8 SpriteTileAllocBitmapOp(u16 bit, u8 op) +{ + u8 index = bit / 8; + u8 shift = bit % 8; + u8 val = bit % 8; + u8 retVal = 0; + + if (op == 0) + { + val = ~(1 << val); + gSpriteTileAllocBitmap[index] &= val; + } + else if (op == 1) + { + val = (1 << val); + gSpriteTileAllocBitmap[index] |= val; + } + else + { + retVal = 1 << shift; + retVal &= gSpriteTileAllocBitmap[index]; + } + + return retVal; +} + +void sub_80075C0(struct Sprite *sprite) +{ + if (!sprite->usingSheet) + { + int i; + int end = (sprite->images[0].size / TILE_SIZE_4BPP) + sprite->oam.tileNum; + + for (i = sprite->oam.tileNum; i < end; i++) + gSpriteTileAllocBitmap[i >> 3] &= ~(1 << (i & 7)); + } +} + +void SpriteCallbackDummy(struct Sprite *sprite) +{ +} + +void ProcessSpriteCopyRequests(void) +{ + if (gShouldProcessSpriteCopyRequests) + { + u8 i = 0; + + while (gSpriteCopyRequestCount > 0) + { + CpuCopy16(gSpriteCopyRequests[i].src, gSpriteCopyRequests[i].dest, gSpriteCopyRequests[i].size); + gSpriteCopyRequestCount--; + i++; + } + + gShouldProcessSpriteCopyRequests = FALSE; + } +} + +void RequestSpriteFrameImageCopy(u16 index, u16 tileNum, const struct SpriteFrameImage *images) +{ + if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) + { + gSpriteCopyRequests[gSpriteCopyRequestCount].src = images[index].data; + gSpriteCopyRequests[gSpriteCopyRequestCount].dest = (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileNum; + gSpriteCopyRequests[gSpriteCopyRequestCount].size = images[index].size; + gSpriteCopyRequestCount++; + } +} + +void RequestSpriteCopy(const u8 *src, u8 *dest, u16 size) +{ + if (gSpriteCopyRequestCount < MAX_SPRITE_COPY_REQUESTS) + { + gSpriteCopyRequests[gSpriteCopyRequestCount].src = src; + gSpriteCopyRequests[gSpriteCopyRequestCount].dest = dest; + gSpriteCopyRequests[gSpriteCopyRequestCount].size = size; + gSpriteCopyRequestCount++; + } +} + +void CopyFromSprites(u8 *dest) +{ + u32 i; + u8 *src = (u8 *)gSprites; + for (i = 0; i < sizeof(struct Sprite) * MAX_SPRITES; i++) + { + *dest = *src; + dest++; + src++; + } +} + +void CopyToSprites(u8 *src) +{ + u32 i; + u8 *dest = (u8 *)gSprites; + for (i = 0; i < sizeof(struct Sprite) * MAX_SPRITES; i++) + { + *dest = *src; + src++; + dest++; + } +} + +void ResetAllSprites(void) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + ResetSprite(&gSprites[i]); + gSpriteOrder[i] = i; + } + + ResetSprite(&gSprites[i]); +} + +void FreeSpriteTiles(struct Sprite *sprite) +{ + if (sprite->template->tileTag != 0xFFFF) + FreeSpriteTilesByTag(sprite->template->tileTag); +} + +void FreeSpritePalette(struct Sprite *sprite) +{ + FreeSpritePaletteByTag(sprite->template->paletteTag); +} + +void FreeSpriteOamMatrix(struct Sprite *sprite) +{ + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + { + FreeOamMatrix(sprite->oam.matrixNum); + sprite->oam.affineMode = ST_OAM_AFFINE_OFF; + } +} + +void DestroySpriteAndFreeResources(struct Sprite *sprite) +{ + FreeSpriteTiles(sprite); + FreeSpritePalette(sprite); + FreeSpriteOamMatrix(sprite); + DestroySprite(sprite); +} + +void AnimateSprite(struct Sprite *sprite) +{ + sAnimFuncs[sprite->animBeginning](sprite); + + if (!gAffineAnimsDisabled) + sAffineAnimFuncs[sprite->affineAnimBeginning](sprite); +} + +void BeginAnim(struct Sprite *sprite) +{ + s16 imageValue; + u8 duration; + u8 hFlip; + u8 vFlip; + + sprite->animCmdIndex = 0; + sprite->animEnded = FALSE; + sprite->animLoopCounter = 0; + imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + + if (imageValue != -1) + { + sprite->animBeginning = FALSE; + duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + + if (duration) + duration--; + + sprite->animDelayCounter = duration; + + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + + if (sprite->usingSheet) + sprite->oam.tileNum = sprite->sheetTileStart + imageValue; + else + RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); + } +} + +void ContinueAnim(struct Sprite *sprite) +{ + if (sprite->animDelayCounter) + { + u8 hFlip; + u8 vFlip; + DecrementAnimDelayCounter(sprite); + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + } + else if (!sprite->animPaused) + { + s16 type; + s16 funcIndex; + sprite->animCmdIndex++; + type = sprite->anims[sprite->animNum][sprite->animCmdIndex].type; + funcIndex = 3; + if (type < 0) + funcIndex = type + 3; + sAnimCmdFuncs[funcIndex](sprite); + } +} + +void AnimCmd_frame(struct Sprite *sprite) +{ + s16 imageValue; + u8 duration; + u8 hFlip; + u8 vFlip; + + imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + + if (duration) + duration--; + + sprite->animDelayCounter = duration; + + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + + if (sprite->usingSheet) + sprite->oam.tileNum = sprite->sheetTileStart + imageValue; + else + RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); +} + +void AnimCmd_end(struct Sprite *sprite) +{ + sprite->animCmdIndex--; + sprite->animEnded = TRUE; +} + +void AnimCmd_jump(struct Sprite *sprite) +{ + s16 imageValue; + u8 duration; + u8 hFlip; + u8 vFlip; + + sprite->animCmdIndex = sprite->anims[sprite->animNum][sprite->animCmdIndex].jump.target; + + imageValue = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + duration = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.duration; + hFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.hFlip; + vFlip = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.vFlip; + + if (duration) + duration--; + + sprite->animDelayCounter = duration; + + if (!(sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)) + SetSpriteOamFlipBits(sprite, hFlip, vFlip); + + if (sprite->usingSheet) + sprite->oam.tileNum = sprite->sheetTileStart + imageValue; + else + RequestSpriteFrameImageCopy(imageValue, sprite->oam.tileNum, sprite->images); +} + +void AnimCmd_loop(struct Sprite *sprite) +{ + if (sprite->animLoopCounter) + ContinueAnimLoop(sprite); + else + BeginAnimLoop(sprite); +} + +void BeginAnimLoop(struct Sprite *sprite) +{ + sprite->animLoopCounter = sprite->anims[sprite->animNum][sprite->animCmdIndex].loop.count; + JumpToTopOfAnimLoop(sprite); + ContinueAnim(sprite); +} + +void ContinueAnimLoop(struct Sprite *sprite) +{ + sprite->animLoopCounter--; + JumpToTopOfAnimLoop(sprite); + ContinueAnim(sprite); +} + +void JumpToTopOfAnimLoop(struct Sprite *sprite) +{ + if (sprite->animLoopCounter) + { + sprite->animCmdIndex--; + + while (sprite->anims[sprite->animNum][sprite->animCmdIndex - 1].type != -3) + { + if (sprite->animCmdIndex == 0) + break; + sprite->animCmdIndex--; + } + + sprite->animCmdIndex--; + } +} + +void BeginAffineAnim(struct Sprite *sprite) +{ + if ((sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) && sprite->affineAnims[0][0].type != 32767) + { + struct AffineAnimFrameCmd frameCmd; + u8 matrixNum = GetSpriteMatrixNum(sprite); + AffineAnimStateRestartAnim(matrixNum); + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + sprite->affineAnimBeginning = FALSE; + sprite->affineAnimEnded = FALSE; + ApplyAffineAnimFrame(matrixNum, &frameCmd); + sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration; + if (sprite->flags_f) + obj_update_pos2(sprite, sprite->data[6], sprite->data[7]); + } +} + +void ContinueAffineAnim(struct Sprite *sprite) +{ + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + { + u8 matrixNum = GetSpriteMatrixNum(sprite); + + if (sAffineAnimStates[matrixNum].delayCounter) + AffineAnimDelay(matrixNum, sprite); + else if (sprite->affineAnimPaused) + return; + else + { + s16 type; + s16 funcIndex; + sAffineAnimStates[matrixNum].animCmdIndex++; + type = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].type; + funcIndex = 3; + if (type >= 32765) + funcIndex = type - 32765; + sAffineAnimCmdFuncs[funcIndex](matrixNum, sprite); + } + if (sprite->flags_f) + obj_update_pos2(sprite, sprite->data[6], sprite->data[7]); + } +} + +void AffineAnimDelay(u8 matrixNum, struct Sprite *sprite) +{ + if (!DecrementAffineAnimDelayCounter(sprite, matrixNum)) + { + struct AffineAnimFrameCmd frameCmd; + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &frameCmd); + } +} + +void AffineAnimCmd_loop(u8 matrixNum, struct Sprite *sprite) +{ + if (sAffineAnimStates[matrixNum].loopCounter) + ContinueAffineAnimLoop(matrixNum, sprite); + else + BeginAffineAnimLoop(matrixNum, sprite); +} + +void BeginAffineAnimLoop(u8 matrixNum, struct Sprite *sprite) +{ + sAffineAnimStates[matrixNum].loopCounter = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].loop.count; + JumpToTopOfAffineAnimLoop(matrixNum, sprite); + ContinueAffineAnim(sprite); +} + +void ContinueAffineAnimLoop(u8 matrixNum, struct Sprite *sprite) +{ + sAffineAnimStates[matrixNum].loopCounter--; + JumpToTopOfAffineAnimLoop(matrixNum, sprite); + ContinueAffineAnim(sprite); +} + +void JumpToTopOfAffineAnimLoop(u8 matrixNum, struct Sprite *sprite) +{ + if (sAffineAnimStates[matrixNum].loopCounter) + { + sAffineAnimStates[matrixNum].animCmdIndex--; + + while (sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex - 1].type != 32765) + { + if (sAffineAnimStates[matrixNum].animCmdIndex == 0) + break; + sAffineAnimStates[matrixNum].animCmdIndex--; + } + + sAffineAnimStates[matrixNum].animCmdIndex--; + } +} + +void AffineAnimCmd_jump(u8 matrixNum, struct Sprite *sprite) +{ + struct AffineAnimFrameCmd frameCmd; + sAffineAnimStates[matrixNum].animCmdIndex = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].jump.target; + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + ApplyAffineAnimFrame(matrixNum, &frameCmd); + sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration; +} + +void AffineAnimCmd_end(u8 matrixNum, struct Sprite *sprite) +{ + struct AffineAnimFrameCmd dummyFrameCmd = {0}; + sprite->affineAnimEnded = TRUE; + sAffineAnimStates[matrixNum].animCmdIndex--; + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &dummyFrameCmd); +} + +void AffineAnimCmd_frame(u8 matrixNum, struct Sprite *sprite) +{ + struct AffineAnimFrameCmd frameCmd; + GetAffineAnimFrame(matrixNum, sprite, &frameCmd); + ApplyAffineAnimFrame(matrixNum, &frameCmd); + sAffineAnimStates[matrixNum].delayCounter = frameCmd.duration; +} + +void CopyOamMatrix(u8 destMatrixIndex, struct OamMatrix *srcMatrix) +{ + gOamMatrices[destMatrixIndex].a = srcMatrix->a; + gOamMatrices[destMatrixIndex].b = srcMatrix->b; + gOamMatrices[destMatrixIndex].c = srcMatrix->c; + gOamMatrices[destMatrixIndex].d = srcMatrix->d; +} + +u8 GetSpriteMatrixNum(struct Sprite *sprite) +{ + u8 matrixNum = 0; + if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK) + matrixNum = sprite->oam.matrixNum; + return matrixNum; +} + +void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3) +{ + sprite->data[6] = a2; + sprite->data[7] = a3; + sprite->flags_f = 1; +} + +s32 sub_800800C(s32 a0, s32 a1, s32 a2) +{ + s32 subResult, var1; + + subResult = a1 - a0; + if (subResult < 0) + var1 = -(subResult) >> 9; + else + var1 = -(subResult >> 9); + return a2 - ((u32)(a2 * a1) / (u32)(a0) + var1); +} + +#ifdef NONMATCHING +void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2) +{ + s32 var0, var1, var2; + u8 matrixNum = sprite->oam.matrixNum; + if (a1 != 0x800) + { + var0 = gUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32]; + var1 = var0 << 8; + var2 = (var0 << 16) / gOamMatrices[matrixNum].a; + sprite->pos2.x = sub_800800C(var1, var2, a1); + } + if (a2 != 0x800) + { + var0 = gUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)]; + var1 = var0 << 8; + var2 = (var0 << 16) / gOamMatrices[matrixNum].d; + sprite->pos2.y = sub_800800C(var1, var2, a2); + } +} +#else +__attribute__((naked)) +void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2) +{ + asm(".syntax unified\n\ + push {r4-r7,lr}\n\ + mov r7, r9\n\ + mov r6, r8\n\ + push {r6,r7}\n\ + adds r5, r0, 0\n\ + adds r6, r1, 0\n\ + mov r8, r2\n\ + ldrb r1, [r5, 0x3]\n\ + lsls r0, r1, 26\n\ + lsrs r7, r0, 27\n\ + movs r0, 0x80\n\ + lsls r0, 4\n\ + mov r9, r0\n\ + cmp r6, r9\n\ + beq _08007EA2\n\ + ldr r2, =gUnknown_082EC6F4\n\ + lsrs r1, 6\n\ + lsls r1, 3\n\ + ldrb r0, [r5, 0x1]\n\ + lsrs r0, 6\n\ + lsls r0, 5\n\ + adds r1, r0\n\ + adds r1, r2\n\ + ldr r0, [r1]\n\ + lsls r4, r0, 8\n\ + lsls r0, 16\n\ + ldr r2, =gOamMatrices\n\ + lsls r1, r7, 3\n\ + adds r1, r2\n\ + movs r2, 0\n\ + ldrsh r1, [r1, r2]\n\ + bl __divsi3\n\ + adds r1, r0, 0\n\ + adds r0, r4, 0\n\ + adds r2, r6, 0\n\ + bl sub_800800C\n\ + strh r0, [r5, 0x24]\n\ +_08007EA2:\n\ + cmp r8, r9\n\ + beq _08007EDA\n\ + ldr r2, =gUnknown_082EC6F4\n\ + ldrb r1, [r5, 0x3]\n\ + lsrs r1, 6\n\ + lsls r1, 3\n\ + ldrb r0, [r5, 0x1]\n\ + lsrs r0, 6\n\ + lsls r0, 5\n\ + adds r1, r0\n\ + adds r2, 0x4\n\ + adds r1, r2\n\ + ldr r0, [r1]\n\ + lsls r4, r0, 8\n\ + lsls r0, 16\n\ + ldr r2, =gOamMatrices\n\ + lsls r1, r7, 3\n\ + adds r1, r2\n\ + movs r2, 0x6\n\ + ldrsh r1, [r1, r2]\n\ + bl __divsi3\n\ + adds r1, r0, 0\n\ + adds r0, r4, 0\n\ + mov r2, r8\n\ + bl sub_800800C\n\ + strh r0, [r5, 0x26]\n\ +_08007EDA:\n\ + pop {r3,r4}\n\ + mov r8, r3\n\ + mov r9, r4\n\ + pop {r4-r7}\n\ + pop {r0}\n\ + bx r0\n\ + .pool\n\ + .syntax divided"); +} +#endif // NONMATCHING + +void SetSpriteOamFlipBits(struct Sprite *sprite, u8 hFlip, u8 vFlip) +{ + sprite->oam.matrixNum &= 0x7; + sprite->oam.matrixNum |= (((hFlip ^ sprite->hFlip) & 1) << 3); + sprite->oam.matrixNum |= (((vFlip ^ sprite->vFlip) & 1) << 4); +} + +void AffineAnimStateRestartAnim(u8 matrixNum) +{ + sAffineAnimStates[matrixNum].animCmdIndex = 0; + sAffineAnimStates[matrixNum].delayCounter = 0; + sAffineAnimStates[matrixNum].loopCounter = 0; +} + +void AffineAnimStateStartAnim(u8 matrixNum, u8 animNum) +{ + sAffineAnimStates[matrixNum].animNum = animNum; + sAffineAnimStates[matrixNum].animCmdIndex = 0; + sAffineAnimStates[matrixNum].delayCounter = 0; + sAffineAnimStates[matrixNum].loopCounter = 0; + sAffineAnimStates[matrixNum].xScale = 0x0100; + sAffineAnimStates[matrixNum].yScale = 0x0100; + sAffineAnimStates[matrixNum].rotation = 0; +} + +void AffineAnimStateReset(u8 matrixNum) +{ + sAffineAnimStates[matrixNum].animNum = 0; + sAffineAnimStates[matrixNum].animCmdIndex = 0; + sAffineAnimStates[matrixNum].delayCounter = 0; + sAffineAnimStates[matrixNum].loopCounter = 0; + sAffineAnimStates[matrixNum].xScale = 0x0100; + sAffineAnimStates[matrixNum].yScale = 0x0100; + sAffineAnimStates[matrixNum].rotation = 0; +} + +void ApplyAffineAnimFrameAbsolute(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd) +{ + sAffineAnimStates[matrixNum].xScale = frameCmd->xScale; + sAffineAnimStates[matrixNum].yScale = frameCmd->yScale; + sAffineAnimStates[matrixNum].rotation = frameCmd->rotation << 8; +} + +void DecrementAnimDelayCounter(struct Sprite *sprite) +{ + if (!sprite->animPaused) + sprite->animDelayCounter--; +} + +bool8 DecrementAffineAnimDelayCounter(struct Sprite *sprite, u8 matrixNum) +{ + if (!sprite->affineAnimPaused) + --sAffineAnimStates[matrixNum].delayCounter; + return sprite->affineAnimPaused; +} + +void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd) +{ + struct ObjAffineSrcData srcData; + struct OamMatrix matrix; + sAffineAnimStates[matrixNum].xScale += frameCmd->xScale; + sAffineAnimStates[matrixNum].yScale += frameCmd->yScale; + sAffineAnimStates[matrixNum].rotation = (sAffineAnimStates[matrixNum].rotation + (frameCmd->rotation << 8)) & ~0xFF; + srcData.xScale = ConvertScaleParam(sAffineAnimStates[matrixNum].xScale); + srcData.yScale = ConvertScaleParam(sAffineAnimStates[matrixNum].yScale); + srcData.rotation = sAffineAnimStates[matrixNum].rotation; + ObjAffineSet(&srcData, &matrix, 1, 2); + CopyOamMatrix(matrixNum, &matrix); +} + +s16 ConvertScaleParam(s16 scale) +{ + s32 val = 0x10000; + return val / scale; +} + +void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd) +{ + frameCmd->xScale = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.xScale; + frameCmd->yScale = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.yScale; + frameCmd->rotation = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.rotation; + frameCmd->duration = sprite->affineAnims[sAffineAnimStates[matrixNum].animNum][sAffineAnimStates[matrixNum].animCmdIndex].frame.duration; +} + +void ApplyAffineAnimFrame(u8 matrixNum, struct AffineAnimFrameCmd *frameCmd) +{ + struct AffineAnimFrameCmd dummyFrameCmd = {0}; + + if (frameCmd->duration) + { + frameCmd->duration--; + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, frameCmd); + } + else + { + ApplyAffineAnimFrameAbsolute(matrixNum, frameCmd); + ApplyAffineAnimFrameRelativeAndUpdateMatrix(matrixNum, &dummyFrameCmd); + } +} + +void StartSpriteAnim(struct Sprite *sprite, u8 animNum) +{ + sprite->animNum = animNum; + sprite->animBeginning = TRUE; + sprite->animEnded = FALSE; +} + +void StartSpriteAnimIfDifferent(struct Sprite *sprite, u8 animNum) +{ + if (sprite->animNum != animNum) + StartSpriteAnim(sprite, animNum); +} + +void SeekSpriteAnim(struct Sprite *sprite, u8 animCmdIndex) +{ + u8 temp = sprite->animPaused; + sprite->animCmdIndex = animCmdIndex - 1; + sprite->animDelayCounter = 0; + sprite->animBeginning = FALSE; + sprite->animEnded = FALSE; + sprite->animPaused = FALSE; + ContinueAnim(sprite); + if (sprite->animDelayCounter) + sprite->animDelayCounter++; + sprite->animPaused = temp; +} + +void StartSpriteAffineAnim(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + AffineAnimStateStartAnim(matrixNum, animNum); + sprite->affineAnimBeginning = TRUE; + sprite->affineAnimEnded = FALSE; +} + +void StartSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + if (sAffineAnimStates[matrixNum].animNum != animNum) + StartSpriteAffineAnim(sprite, animNum); +} + +void ChangeSpriteAffineAnim(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + sAffineAnimStates[matrixNum].animNum = animNum; + sprite->affineAnimBeginning = TRUE; + sprite->affineAnimEnded = FALSE; +} + +void ChangeSpriteAffineAnimIfDifferent(struct Sprite *sprite, u8 animNum) +{ + u8 matrixNum = GetSpriteMatrixNum(sprite); + if (sAffineAnimStates[matrixNum].animNum != animNum) + ChangeSpriteAffineAnim(sprite, animNum); +} + +void SetSpriteSheetFrameTileNum(struct Sprite *sprite) +{ + if (sprite->usingSheet) + { + s16 tileOffset = sprite->anims[sprite->animNum][sprite->animCmdIndex].frame.imageValue; + if (tileOffset < 0) + tileOffset = 0; + sprite->oam.tileNum = sprite->sheetTileStart + tileOffset; + } +} + +void ResetAffineAnimData(void) +{ + u8 i; + + gAffineAnimsDisabled = 0; + gOamMatrixAllocBitmap = 0; + + ResetOamMatrices(); + + for (i = 0; i < OAM_MATRIX_COUNT; i++) + AffineAnimStateReset(i); +} + +u8 AllocOamMatrix(void) +{ + u8 i = 0; + u32 bit = 1; + u32 bitmap = gOamMatrixAllocBitmap; + + while (i < OAM_MATRIX_COUNT) + { + if (!(bitmap & bit)) + { + gOamMatrixAllocBitmap |= bit; + return i; + } + + i++; + bit <<= 1; + } + + return 0xFF; +} + +void FreeOamMatrix(u8 matrixNum) +{ + u8 i = 0; + u32 bit = 1; + + while (i < matrixNum) + { + i++; + bit <<= 1; + } + + gOamMatrixAllocBitmap &= ~bit; + SetOamMatrix(matrixNum, 0x100, 0, 0, 0x100); +} + +void InitSpriteAffineAnim(struct Sprite *sprite) +{ + u8 matrixNum = AllocOamMatrix(); + if (matrixNum != 0xFF) + { + CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); + sprite->oam.matrixNum = matrixNum; + sprite->affineAnimBeginning = TRUE; + AffineAnimStateReset(matrixNum); + } +} + +void SetOamMatrixRotationScaling(u8 matrixNum, s16 xScale, s16 yScale, u16 rotation) +{ + struct ObjAffineSrcData srcData; + struct OamMatrix matrix; + srcData.xScale = ConvertScaleParam(xScale); + srcData.yScale = ConvertScaleParam(yScale); + srcData.rotation = rotation; + ObjAffineSet(&srcData, &matrix, 1, 2); + CopyOamMatrix(matrixNum, &matrix); +} + +u16 LoadSpriteSheet(const struct SpriteSheet *sheet) +{ + s16 tileStart = AllocSpriteTiles(sheet->size / TILE_SIZE_4BPP); + + if (tileStart < 0) + { + return 0; + } + else + { + AllocSpriteTileRange(sheet->tag, (u16)tileStart, sheet->size / TILE_SIZE_4BPP); + CpuCopy16(sheet->data, (u8 *)OBJ_VRAM0 + TILE_SIZE_4BPP * tileStart, sheet->size); + return (u16)tileStart; + } +} + +void LoadSpriteSheets(const struct SpriteSheet *sheets) +{ + u8 i; + for (i = 0; sheets[i].data != NULL; i++) + LoadSpriteSheet(&sheets[i]); +} + +void FreeSpriteTilesByTag(u16 tag) +{ + u8 index = IndexOfSpriteTileTag(tag); + if (index != 0xFF) + { + u16 i; + u16 *rangeStarts; + u16 *rangeCounts; + u16 start; + u16 count; + rangeStarts = sSpriteTileRanges; + start = rangeStarts[index * 2]; + rangeCounts = sSpriteTileRanges + 1; + count = rangeCounts[index * 2]; + + for (i = start; i < start + count; i++) + FREE_SPRITE_TILE(i); + + sSpriteTileRangeTags[index] = 0xFFFF; + } +} + +void FreeSpriteTileRanges(void) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + sSpriteTileRangeTags[i] = 0xFFFF; + SET_SPRITE_TILE_RANGE(i, 0, 0); + } +} + +u16 GetSpriteTileStartByTag(u16 tag) +{ + u8 index = IndexOfSpriteTileTag(tag); + if (index == 0xFF) + return 0xFFFF; + return sSpriteTileRanges[index * 2]; +} + +u8 IndexOfSpriteTileTag(u16 tag) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + if (sSpriteTileRangeTags[i] == tag) + return i; + + return 0xFF; +} + +u16 GetSpriteTileTagByTileStart(u16 start) +{ + u8 i; + + for (i = 0; i < MAX_SPRITES; i++) + { + if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start) + return sSpriteTileRangeTags[i]; + } + + return 0xFFFF; +} + +void AllocSpriteTileRange(u16 tag, u16 start, u16 count) +{ + u8 freeIndex = IndexOfSpriteTileTag(0xFFFF); + sSpriteTileRangeTags[freeIndex] = tag; + SET_SPRITE_TILE_RANGE(freeIndex, start, count); +} + +void FreeAllSpritePalettes(void) +{ + u8 i; + gReservedSpritePaletteCount = 0; + for (i = 0; i < 16; i++) + sSpritePaletteTags[i] = 0xFFFF; +} + +u8 LoadSpritePalette(const struct SpritePalette *palette) +{ + u8 index = IndexOfSpritePaletteTag(palette->tag); + + if (index != 0xFF) + return index; + + index = IndexOfSpritePaletteTag(0xFFFF); + + if (index == 0xFF) + { + return 0xFF; + } + else + { + sSpritePaletteTags[index] = palette->tag; + DoLoadSpritePalette(palette->data, index * 16); + return index; + } +} + +void LoadSpritePalettes(const struct SpritePalette *palettes) +{ + u8 i; + for (i = 0; palettes[i].data != NULL; i++) + if (LoadSpritePalette(&palettes[i]) == 0xFF) + break; +} + +void DoLoadSpritePalette(const u16 *src, u16 paletteOffset) +{ + LoadPalette(src, paletteOffset + 0x100, 32); +} + +u8 AllocSpritePalette(u16 tag) +{ + u8 index = IndexOfSpritePaletteTag(0xFFFF); + if (index == 0xFF) + { + return 0xFF; + } + else + { + sSpritePaletteTags[index] = tag; + return index; + } +} + +u8 IndexOfSpritePaletteTag(u16 tag) +{ + u8 i; + for (i = gReservedSpritePaletteCount; i < 16; i++) + if (sSpritePaletteTags[i] == tag) + return i; + + return 0xFF; +} + +u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum) +{ + return sSpritePaletteTags[paletteNum]; +} + +void FreeSpritePaletteByTag(u16 tag) +{ + u8 index = IndexOfSpritePaletteTag(tag); + if (index != 0xFF) + sSpritePaletteTags[index] = 0xFFFF; +} + +void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables) +{ + sprite->subspriteTables = subspriteTables; + sprite->subspriteTableNum = 0; + sprite->subspriteMode = SUBSPRITES_ON; +} + +bool8 AddSpriteToOamBuffer(struct Sprite *sprite, u8 *oamIndex) +{ + if (*oamIndex >= gOamLimit) + return 1; + + if (!sprite->subspriteTables || sprite->subspriteMode == SUBSPRITES_OFF) + { + gMain.oamBuffer[*oamIndex] = sprite->oam; + (*oamIndex)++; + return 0; + } + else + { + return AddSubspritesToOamBuffer(sprite, &gMain.oamBuffer[*oamIndex], oamIndex); + } +} + +bool8 AddSubspritesToOamBuffer(struct Sprite *sprite, struct OamData *destOam, u8 *oamIndex) +{ + const struct SubspriteTable *subspriteTable; + struct OamData *oam; + + if (*oamIndex >= gOamLimit) + return 1; + + subspriteTable = &sprite->subspriteTables[sprite->subspriteTableNum]; + oam = &sprite->oam; + + if (!subspriteTable || !subspriteTable->subsprites) + { + *destOam = *oam; + (*oamIndex)++; + return 0; + } + else + { + u16 tileNum; + u16 baseX; + u16 baseY; + u8 subspriteCount; + u8 hFlip; + u8 vFlip; + u8 i; + + tileNum = oam->tileNum; + subspriteCount = subspriteTable->subspriteCount; + hFlip = ((s32)oam->matrixNum >> 3) & 1; + vFlip = ((s32)oam->matrixNum >> 4) & 1; + baseX = oam->x - sprite->centerToCornerVecX; + baseY = oam->y - sprite->centerToCornerVecY; + + for (i = 0; i < subspriteCount; i++, (*oamIndex)++) + { + u16 x; + u16 y; + + if (*oamIndex >= gOamLimit) + return 1; + + x = subspriteTable->subsprites[i].x; + y = subspriteTable->subsprites[i].y; + + if (hFlip) + { + s8 width = sOamDimensions[subspriteTable->subsprites[i].shape][subspriteTable->subsprites[i].size].width; + s16 right = x; + right += width; + x = right; + x = ~x + 1; + } + + if (vFlip) + { + s8 height = sOamDimensions[subspriteTable->subsprites[i].shape][subspriteTable->subsprites[i].size].height; + s16 bottom = y; + bottom += height; + y = bottom; + y = ~y + 1; + } + + destOam[i] = *oam; + destOam[i].shape = subspriteTable->subsprites[i].shape; + destOam[i].size = subspriteTable->subsprites[i].size; + destOam[i].x = (s16)baseX + (s16)x; + destOam[i].y = baseY + y; + destOam[i].tileNum = tileNum + subspriteTable->subsprites[i].tileOffset; + + if (sprite->subspriteMode != SUBSPRITES_IGNORE_PRIORITY) + destOam[i].priority = subspriteTable->subsprites[i].priority; + } + } + + return 0; +} diff --git a/sym_bss.txt b/sym_bss.txt index 12da192c1..4014026ab 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -9,20 +9,9 @@ .include "src/bg.o" .include "src/malloc.o" .include "src/text_printer.o" + .include "src/sprite.o" - .align 2 -gUnknown_3000AE8: @ 3000AE8 - .space 0x80 - -gUnknown_3000B68: @ 3000B68 - .space 0x100 - -gUnknown_3000C68: @ 3000C68 - .space 0x180 - -gUnknown_3000DE8: @ 3000DE8 - .space 0x20 - + .align 2 gUnknown_3000E08: @ 3000E08 .space 0x10 diff --git a/sym_common.txt b/sym_common.txt index 260414be4..56298064a 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -11,12 +11,9 @@ gWindowBgTilemapBuffers: @ 3003E40 gTextFlags: @ 3003E50 .space 0x4 -gUnknown_3003E54: @ 3003E54 - .space 0x4 - -gUnknown_3003E58: @ 3003E58 - .space 0x8 + .include "sprite.o" + .align 4 gUnknown_3003E60: @ 3003E60 .space 0xC diff --git a/sym_ewram.txt b/sym_ewram.txt index 487c32137..818810c14 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -32,50 +32,9 @@ gTrainerId: @ 2020000 .include "src/text_printer.o" .include "src/window.o" .include "src/window_8bpp.o" + .include "src/sprite.o" .align 2 -gUnknown_202063C: @ 202063C - .space 0x1C - -gUnknown_2020658: @ 2020658 - .space 0x1128 - -gUnknown_2021780: @ 2021780 - .space 0x80 - -gUnknown_2021800: @ 2021800 - .space 0x40 - -gUnknown_2021840: @ 2021840 - .space 0x1 - -gUnknown_2021841: @ 2021841 - .space 0x3 - -gUnknown_2021844: @ 2021844 - .space 0x300 - -gUnknown_2021B44: @ 2021B44 - .space 0x2 - -gUnknown_2021B46: @ 2021B46 - .space 0x2 - -gUnknown_2021B48: @ 2021B48 - .space 0x80 - -gUnknown_2021BC8: @ 2021BC8 - .space 0x2 - -gUnknown_2021BCA: @ 2021BCA - .space 0x2 - -gUnknown_2021BCC: @ 2021BCC - .space 0x100 - -gUnknown_2021CCC: @ 2021CCC - .space 0x4 - gStringVar1: @ 2021CD0 .space 0x20 |