summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-12-16 16:29:12 -0500
committergarak <garakmon@gmail.com>2019-12-17 15:05:23 -0500
commit4668d17866013fe4bfd147c7ba1cacefe790d5bd (patch)
tree735392da584ffe4a3033aba999c36e1089c4a717
parente278ebaa55cfabadd5a7d12686ec0ddc23418008 (diff)
dump leftover subsprite tables
-rw-r--r--asm/event_object_movement.s4
-rw-r--r--asm/field_effect.s16
-rw-r--r--asm/field_effect_helpers.s108
-rw-r--r--data/event_object_movement.s290
-rw-r--r--include/event_object_movement.h2
-rw-r--r--src/teachy_tv.c2
6 files changed, 340 insertions, 82 deletions
diff --git a/asm/event_object_movement.s b/asm/event_object_movement.s
index 1b3de3fcb..25c35b1a0 100644
--- a/asm/event_object_movement.s
+++ b/asm/event_object_movement.s
@@ -65,7 +65,7 @@ sub_805DE8C: @ 805DE8C
mov r5, r9
mov r4, r8
push {r4-r6}
- ldr r0, _0805DF28 @ =gUnknown_83A0010
+ ldr r0, _0805DF28 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x54]
mov r9, r0
movs r1, 0
@@ -133,7 +133,7 @@ sub_805DE8C: @ 805DE8C
pop {r0}
bx r0
.align 2, 0
-_0805DF28: .4byte gUnknown_83A0010
+_0805DF28: .4byte gFieldEffectObjectTemplatePointers
_0805DF2C: .4byte gSprites
thumb_func_end sub_805DE8C
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 5959e076c..757f612b8 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -4116,7 +4116,7 @@ FldEff_LavaridgeGymWarp: @ 808534C
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080853A8 @ =gUnknown_83A0010
+ ldr r0, _080853A8 @ =gFieldEffectObjectTemplatePointers
adds r0, 0x84
ldr r0, [r0]
movs r2, 0
@@ -4152,7 +4152,7 @@ FldEff_LavaridgeGymWarp: @ 808534C
bx r1
.align 2, 0
_080853A4: .4byte gFieldEffectArguments
-_080853A8: .4byte gUnknown_83A0010
+_080853A8: .4byte gFieldEffectObjectTemplatePointers
_080853AC: .4byte gSprites
thumb_func_end FldEff_LavaridgeGymWarp
@@ -4420,7 +4420,7 @@ FldEff_PopOutOfAsh: @ 80855A0
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080855FC @ =gUnknown_83A0010
+ ldr r0, _080855FC @ =gFieldEffectObjectTemplatePointers
adds r0, 0x80
ldr r0, [r0]
movs r2, 0
@@ -4456,7 +4456,7 @@ FldEff_PopOutOfAsh: @ 80855A0
bx r1
.align 2, 0
_080855F8: .4byte gFieldEffectArguments
-_080855FC: .4byte gUnknown_83A0010
+_080855FC: .4byte gFieldEffectObjectTemplatePointers
_08085600: .4byte gSprites
thumb_func_end FldEff_PopOutOfAsh
@@ -7431,7 +7431,7 @@ _08086D34: .4byte sub_8086BD0
thumb_func_start sub_8086D38
sub_8086D38: @ 8086D38
push {r4,lr}
- ldr r0, _08086D84 @ =gUnknown_83A0010
+ ldr r0, _08086D84 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x68]
movs r1, 0x78
movs r2, 0
@@ -7466,7 +7466,7 @@ sub_8086D38: @ 8086D38
pop {r1}
bx r1
.align 2, 0
-_08086D84: .4byte gUnknown_83A0010
+_08086D84: .4byte gFieldEffectObjectTemplatePointers
_08086D88: .4byte gSprites
_08086D8C: .4byte sub_8086D94
_08086D90: .4byte gFieldEffectArguments
@@ -7967,7 +7967,7 @@ _08087164: .4byte sub_8086E40
thumb_func_start sub_8087168
sub_8087168: @ 8087168
push {lr}
- ldr r0, _080871A0 @ =gUnknown_83A0010
+ ldr r0, _080871A0 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x68]
movs r1, 0xFF
movs r2, 0xB4
@@ -7994,7 +7994,7 @@ sub_8087168: @ 8087168
pop {r1}
bx r1
.align 2, 0
-_080871A0: .4byte gUnknown_83A0010
+_080871A0: .4byte gFieldEffectObjectTemplatePointers
_080871A4: .4byte gSprites
_080871A8: .4byte sub_8087220
thumb_func_end sub_8087168
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 735720be1..3f2cf04d1 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -432,7 +432,7 @@ _080DB0C0: .4byte 0xfffffc00
thumb_func_start sub_80DB0C4
sub_80DB0C4: @ 80DB0C4
push {r4,lr}
- ldr r0, _080DB10C @ =gUnknown_83A0010
+ ldr r0, _080DB10C @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x20]
movs r1, 0
movs r2, 0
@@ -467,7 +467,7 @@ _080DB102:
pop {r1}
bx r1
.align 2, 0
-_080DB10C: .4byte gUnknown_83A0010
+_080DB10C: .4byte gFieldEffectObjectTemplatePointers
_080DB110: .4byte gSprites
thumb_func_end sub_80DB0C4
@@ -595,7 +595,7 @@ oei_shadow: @ 80DB1DC
ldrb r0, [r1, 0x5]
bl GetObjectEventGraphicsInfo
adds r4, r0, 0
- ldr r2, _080DB270 @ =gUnknown_83A0010
+ ldr r2, _080DB270 @ =gFieldEffectObjectTemplatePointers
ldr r1, _080DB274 @ =gUnknown_83FECD2
ldrb r0, [r4, 0xC]
lsls r0, 26
@@ -650,7 +650,7 @@ _080DB260:
.align 2, 0
_080DB268: .4byte gFieldEffectArguments
_080DB26C: .4byte gObjectEvents
-_080DB270: .4byte gUnknown_83A0010
+_080DB270: .4byte gFieldEffectObjectTemplatePointers
_080DB274: .4byte gUnknown_83FECD2
_080DB278: .4byte gSprites
_080DB27C: .4byte gUnknown_83FECD6
@@ -770,7 +770,7 @@ oei_grass_normal: @ 80DB348
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DB3E4 @ =gUnknown_83A0010
+ ldr r0, _080DB3E4 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x10]
mov r1, sp
movs r2, 0
@@ -830,7 +830,7 @@ _080DB3D4:
bx r1
.align 2, 0
_080DB3E0: .4byte gFieldEffectArguments
-_080DB3E4: .4byte gUnknown_83A0010
+_080DB3E4: .4byte gFieldEffectObjectTemplatePointers
_080DB3E8: .4byte gSprites
thumb_func_end oei_grass_normal
@@ -978,7 +978,7 @@ FldEff_JumpTallGrass: @ 80DB4F4
movs r2, 0x8
movs r3, 0xC
bl sub_8063BC4
- ldr r0, _080DB55C @ =gUnknown_83A0010
+ ldr r0, _080DB55C @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x28]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -1022,7 +1022,7 @@ _080DB550:
bx r1
.align 2, 0
_080DB558: .4byte gFieldEffectArguments
-_080DB55C: .4byte gUnknown_83A0010
+_080DB55C: .4byte gFieldEffectObjectTemplatePointers
_080DB560: .4byte gSprites
thumb_func_end FldEff_JumpTallGrass
@@ -1120,7 +1120,7 @@ FldEff_LongGrass: @ 80DB5F4
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DB694 @ =gUnknown_83A0010
+ ldr r0, _080DB694 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x3C]
mov r1, sp
movs r2, 0
@@ -1181,7 +1181,7 @@ _080DB684:
bx r1
.align 2, 0
_080DB690: .4byte gFieldEffectArguments
-_080DB694: .4byte gUnknown_83A0010
+_080DB694: .4byte gFieldEffectObjectTemplatePointers
_080DB698: .4byte gSprites
thumb_func_end FldEff_LongGrass
@@ -1321,7 +1321,7 @@ FldEff_JumpLongGrass: @ 80DB798
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DB800 @ =gUnknown_83A0010
+ ldr r0, _080DB800 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x40]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -1365,7 +1365,7 @@ _080DB7F4:
bx r1
.align 2, 0
_080DB7FC: .4byte gFieldEffectArguments
-_080DB800: .4byte gUnknown_83A0010
+_080DB800: .4byte gFieldEffectObjectTemplatePointers
_080DB804: .4byte gSprites
thumb_func_end FldEff_JumpLongGrass
@@ -1384,7 +1384,7 @@ sub_80DB808: @ 80DB808
lsls r1, 2
ldr r0, _080DB8A0 @ =gObjectEvents
adds r5, r1, r0
- ldr r0, _080DB8A4 @ =gUnknown_83A0010
+ ldr r0, _080DB8A4 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x78]
movs r1, 0
movs r2, 0
@@ -1447,7 +1447,7 @@ _080DB894:
.align 2, 0
_080DB89C: .4byte gFieldEffectArguments
_080DB8A0: .4byte gObjectEvents
-_080DB8A4: .4byte gUnknown_83A0010
+_080DB8A4: .4byte gFieldEffectObjectTemplatePointers
_080DB8A8: .4byte gSprites
thumb_func_end sub_80DB808
@@ -1585,7 +1585,7 @@ FldEff_SandFootprints: @ 80DB9A0
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DBA0C @ =gUnknown_83A0010
+ ldr r0, _080DBA0C @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x2C]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -1629,7 +1629,7 @@ _080DB9FE:
bx r1
.align 2, 0
_080DBA08: .4byte gFieldEffectArguments
-_080DBA0C: .4byte gUnknown_83A0010
+_080DBA0C: .4byte gFieldEffectObjectTemplatePointers
_080DBA10: .4byte gSprites
thumb_func_end FldEff_SandFootprints
@@ -1642,7 +1642,7 @@ FldEff_DeepSandFootprints: @ 80DBA14
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DBA80 @ =gUnknown_83A0010
+ ldr r0, _080DBA80 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x5C]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -1687,7 +1687,7 @@ _080DBA74:
bx r1
.align 2, 0
_080DBA7C: .4byte gFieldEffectArguments
-_080DBA80: .4byte gUnknown_83A0010
+_080DBA80: .4byte gFieldEffectObjectTemplatePointers
_080DBA84: .4byte gSprites
thumb_func_end FldEff_DeepSandFootprints
@@ -1700,7 +1700,7 @@ FldEff_BikeTireTracks: @ 80DBA88
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DBAF4 @ =gUnknown_83A0010
+ ldr r0, _080DBAF4 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x6C]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -1745,7 +1745,7 @@ _080DBAE8:
bx r1
.align 2, 0
_080DBAF0: .4byte gFieldEffectArguments
-_080DBAF4: .4byte gUnknown_83A0010
+_080DBAF4: .4byte gFieldEffectObjectTemplatePointers
_080DBAF8: .4byte gSprites
thumb_func_end FldEff_BikeTireTracks
@@ -1841,7 +1841,7 @@ FldEff_Splash: @ 80DBB88
lsls r1, 2
ldr r0, _080DBC20 @ =gObjectEvents
adds r5, r1, r0
- ldr r0, _080DBC24 @ =gUnknown_83A0010
+ ldr r0, _080DBC24 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
movs r1, 0
movs r2, 0
@@ -1901,7 +1901,7 @@ _080DBC12:
.align 2, 0
_080DBC1C: .4byte gFieldEffectArguments
_080DBC20: .4byte gObjectEvents
-_080DBC24: .4byte gUnknown_83A0010
+_080DBC24: .4byte gFieldEffectObjectTemplatePointers
_080DBC28: .4byte gSprites
thumb_func_end FldEff_Splash
@@ -1986,7 +1986,7 @@ FldEff_JumpSmallSplash: @ 80DBCB8
movs r2, 0x8
movs r3, 0xC
bl sub_8063BC4
- ldr r0, _080DBD20 @ =gUnknown_83A0010
+ ldr r0, _080DBD20 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x38]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -2030,7 +2030,7 @@ _080DBD14:
bx r1
.align 2, 0
_080DBD1C: .4byte gFieldEffectArguments
-_080DBD20: .4byte gUnknown_83A0010
+_080DBD20: .4byte gFieldEffectObjectTemplatePointers
_080DBD24: .4byte gSprites
thumb_func_end FldEff_JumpSmallSplash
@@ -2043,7 +2043,7 @@ oei_water_drop_tall: @ 80DBD28
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DBD90 @ =gUnknown_83A0010
+ ldr r0, _080DBD90 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x30]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -2087,7 +2087,7 @@ _080DBD84:
bx r1
.align 2, 0
_080DBD8C: .4byte gFieldEffectArguments
-_080DBD90: .4byte gUnknown_83A0010
+_080DBD90: .4byte gFieldEffectObjectTemplatePointers
_080DBD94: .4byte gSprites
thumb_func_end oei_water_drop_tall
@@ -2106,7 +2106,7 @@ FldEff_FeetInFlowingWater: @ 80DBD98
lsls r1, 2
ldr r0, _080DBE3C @ =gObjectEvents
adds r6, r1, r0
- ldr r0, _080DBE40 @ =gUnknown_83A0010
+ ldr r0, _080DBE40 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x34]
movs r1, 0
movs r2, 0
@@ -2172,7 +2172,7 @@ _080DBE2E:
.align 2, 0
_080DBE38: .4byte gFieldEffectArguments
_080DBE3C: .4byte gObjectEvents
-_080DBE40: .4byte gUnknown_83A0010
+_080DBE40: .4byte gFieldEffectObjectTemplatePointers
_080DBE44: .4byte gSprites
_080DBE48: .4byte sub_80DBE50
_080DBE4C: .4byte 0x0000ffff
@@ -2263,7 +2263,7 @@ _080DBEEC: .4byte gSprites
thumb_func_start oei_ripples
oei_ripples: @ 80DBEF0
push {r4,lr}
- ldr r0, _080DBF44 @ =gUnknown_83A0010
+ ldr r0, _080DBF44 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14]
ldr r4, _080DBF48 @ =gFieldEffectArguments
movs r2, 0
@@ -2305,7 +2305,7 @@ _080DBF3C:
pop {r1}
bx r1
.align 2, 0
-_080DBF44: .4byte gUnknown_83A0010
+_080DBF44: .4byte gFieldEffectObjectTemplatePointers
_080DBF48: .4byte gFieldEffectArguments
_080DBF4C: .4byte gSprites
thumb_func_end oei_ripples
@@ -2325,7 +2325,7 @@ sub_80DBF50: @ 80DBF50
lsls r1, 2
ldr r0, _080DBFE8 @ =gObjectEvents
adds r5, r1, r0
- ldr r0, _080DBFEC @ =gUnknown_83A0010
+ ldr r0, _080DBFEC @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x7C]
movs r1, 0
movs r2, 0
@@ -2388,7 +2388,7 @@ _080DBFDC:
.align 2, 0
_080DBFE4: .4byte gFieldEffectArguments
_080DBFE8: .4byte gObjectEvents
-_080DBFEC: .4byte gUnknown_83A0010
+_080DBFEC: .4byte gFieldEffectObjectTemplatePointers
_080DBFF0: .4byte gSprites
thumb_func_end sub_80DBF50
@@ -2480,7 +2480,7 @@ FldEff_Unknown19: @ 80DC08C
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DC0F0 @ =gUnknown_83A0010
+ ldr r0, _080DC0F0 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x44]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -2522,7 +2522,7 @@ _080DC0E4:
bx r1
.align 2, 0
_080DC0EC: .4byte gFieldEffectArguments
-_080DC0F0: .4byte gUnknown_83A0010
+_080DC0F0: .4byte gFieldEffectObjectTemplatePointers
_080DC0F4: .4byte gSprites
thumb_func_end FldEff_Unknown19
@@ -2535,7 +2535,7 @@ FldEff_Unknown20: @ 80DC0F8
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DC15C @ =gUnknown_83A0010
+ ldr r0, _080DC15C @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x48]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -2577,7 +2577,7 @@ _080DC150:
bx r1
.align 2, 0
_080DC158: .4byte gFieldEffectArguments
-_080DC15C: .4byte gUnknown_83A0010
+_080DC15C: .4byte gFieldEffectObjectTemplatePointers
_080DC160: .4byte gSprites
thumb_func_end FldEff_Unknown20
@@ -2590,7 +2590,7 @@ FldEff_Unknown21: @ 80DC164
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DC1C8 @ =gUnknown_83A0010
+ ldr r0, _080DC1C8 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x4C]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -2632,7 +2632,7 @@ _080DC1BC:
bx r1
.align 2, 0
_080DC1C4: .4byte gFieldEffectArguments
-_080DC1C8: .4byte gUnknown_83A0010
+_080DC1C8: .4byte gFieldEffectObjectTemplatePointers
_080DC1CC: .4byte gSprites
thumb_func_end FldEff_Unknown21
@@ -2645,7 +2645,7 @@ FldEff_Unknown22: @ 80DC1D0
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DC234 @ =gUnknown_83A0010
+ ldr r0, _080DC234 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x50]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -2687,7 +2687,7 @@ _080DC228:
bx r1
.align 2, 0
_080DC230: .4byte gFieldEffectArguments
-_080DC234: .4byte gUnknown_83A0010
+_080DC234: .4byte gFieldEffectObjectTemplatePointers
_080DC238: .4byte gSprites
thumb_func_end FldEff_Unknown22
@@ -2737,7 +2737,7 @@ oei_ash: @ 80DC270
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DC2F4 @ =gUnknown_83A0010
+ ldr r0, _080DC2F4 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x18]
mov r1, sp
movs r2, 0
@@ -2787,7 +2787,7 @@ _080DC2E6:
bx r1
.align 2, 0
_080DC2F0: .4byte gFieldEffectArguments
-_080DC2F4: .4byte gUnknown_83A0010
+_080DC2F4: .4byte gFieldEffectObjectTemplatePointers
_080DC2F8: .4byte gSprites
thumb_func_end oei_ash
@@ -2915,7 +2915,7 @@ sub_80DC3D0: @ 80DC3D0
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DC440 @ =gUnknown_83A0010
+ ldr r0, _080DC440 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x1C]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -2961,7 +2961,7 @@ _080DC42C:
bx r1
.align 2, 0
_080DC43C: .4byte gFieldEffectArguments
-_080DC440: .4byte gUnknown_83A0010
+_080DC440: .4byte gFieldEffectObjectTemplatePointers
_080DC444: .4byte gSprites
_080DC448: .4byte 0x0000ffff
thumb_func_end sub_80DC3D0
@@ -3393,7 +3393,7 @@ FldEff_Dust: @ 80DC740
movs r2, 0x8
movs r3, 0xC
bl sub_8063BC4
- ldr r0, _080DC7A8 @ =gUnknown_83A0010
+ ldr r0, _080DC7A8 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x24]
movs r2, 0
ldrsh r1, [r4, r2]
@@ -3437,7 +3437,7 @@ _080DC79C:
bx r1
.align 2, 0
_080DC7A4: .4byte gFieldEffectArguments
-_080DC7A8: .4byte gUnknown_83A0010
+_080DC7A8: .4byte gFieldEffectObjectTemplatePointers
_080DC7AC: .4byte gSprites
thumb_func_end FldEff_Dust
@@ -3456,7 +3456,7 @@ FldEff_SandPile: @ 80DC7B0
lsls r1, 2
ldr r0, _080DC860 @ =gObjectEvents
adds r6, r1, r0
- ldr r0, _080DC864 @ =gUnknown_83A0010
+ ldr r0, _080DC864 @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x74]
movs r1, 0
movs r2, 0
@@ -3529,7 +3529,7 @@ _080DC854:
.align 2, 0
_080DC85C: .4byte gFieldEffectArguments
_080DC860: .4byte gObjectEvents
-_080DC864: .4byte gUnknown_83A0010
+_080DC864: .4byte gFieldEffectObjectTemplatePointers
_080DC868: .4byte gSprites
thumb_func_end FldEff_SandPile
@@ -3647,7 +3647,7 @@ FldEff_Bubbles: @ 80DC938
movs r2, 0x8
movs r3, 0
bl sub_8063BC4
- ldr r0, _080DC994 @ =gUnknown_83A0010
+ ldr r0, _080DC994 @ =gFieldEffectObjectTemplatePointers
adds r0, 0x88
ldr r0, [r0]
movs r2, 0
@@ -3685,7 +3685,7 @@ _080DC988:
bx r1
.align 2, 0
_080DC990: .4byte gFieldEffectArguments
-_080DC994: .4byte gUnknown_83A0010
+_080DC994: .4byte gFieldEffectObjectTemplatePointers
_080DC998: .4byte gSprites
thumb_func_end FldEff_Bubbles
@@ -3791,7 +3791,7 @@ ShowDisguiseFieldEffect: @ 80DCA10
.align 2, 0
_080DCA44: .4byte gFieldEffectArguments
_080DCA48:
- ldr r1, _080DCAC0 @ =gUnknown_83A0010
+ ldr r1, _080DCAC0 @ =gFieldEffectObjectTemplatePointers
lsls r0, r6, 2
adds r0, r1
ldr r0, [r0]
@@ -3853,7 +3853,7 @@ _080DCAB4:
pop {r1}
bx r1
.align 2, 0
-_080DCAC0: .4byte gUnknown_83A0010
+_080DCAC0: .4byte gFieldEffectObjectTemplatePointers
_080DCAC4: .4byte gSprites
thumb_func_end ShowDisguiseFieldEffect
@@ -4055,7 +4055,7 @@ FldEff_Sparkle: @ 80DCC1C
movs r2, 0x8
movs r3, 0x8
bl sub_8063BC4
- ldr r0, _080DCC88 @ =gUnknown_83A0010
+ ldr r0, _080DCC88 @ =gFieldEffectObjectTemplatePointers
adds r0, 0x8C
ldr r0, [r0]
movs r2, 0
@@ -4095,7 +4095,7 @@ _080DCC7C:
bx r1
.align 2, 0
_080DCC84: .4byte gFieldEffectArguments
-_080DCC88: .4byte gUnknown_83A0010
+_080DCC88: .4byte gFieldEffectObjectTemplatePointers
_080DCC8C: .4byte gSprites
thumb_func_end FldEff_Sparkle
diff --git a/data/event_object_movement.s b/data/event_object_movement.s
index 813c134df..61545db8d 100644
--- a/data/event_object_movement.s
+++ b/data/event_object_movement.s
@@ -1496,8 +1496,43 @@ gObjectEventGraphicsInfoPointers:: @ 839FDB0
.4byte gObjectEventGraphicsInfo_83A4E40
.4byte gObjectEventGraphicsInfo_83A5134
-gUnknown_83A0010:: @ 83A0010
- .incbin "baserom.gba", 0x3A0010, 0x90
+gFieldEffectObjectTemplatePointers:: @ 83A0010
+ .4byte gUnknown_83A537C
+ .4byte gUnknown_83A5394
+ .4byte gUnknown_83A53AC
+ .4byte gUnknown_83A53C4
+ .4byte gUnknown_83A5420
+ .4byte gUnknown_83A5488
+ .4byte gUnknown_83A54E4
+ .4byte gUnknown_83A556C
+ .4byte gUnknown_83A5604
+ .4byte gUnknown_83A5648
+ .4byte gUnknown_83A5698
+ .4byte gUnknown_83A56F4
+ .4byte gUnknown_83A583C
+ .4byte gUnknown_83A589C
+ .4byte gUnknown_83A58E0
+ .4byte gUnknown_83A593C
+ .4byte gUnknown_83A59A4
+ .4byte gUnknown_83A5A30
+ .4byte gUnknown_83A5A88
+ .4byte gUnknown_83A5AD8
+ .4byte gUnknown_83A5B74
+ .4byte gUnknown_83A5C34
+ .4byte NULL
+ .4byte gUnknown_83A5750
+ .4byte gUnknown_83A5CB4
+ .4byte gUnknown_83A5D34
+ .4byte gUnknown_83A5E00
+ .4byte gUnknown_83A57EC
+ .4byte gUnknown_83A5D84
+ .4byte gUnknown_83A5B1C
+ .4byte gUnknown_83A5E38
+ .4byte gUnknown_83A5E64
+ .4byte gUnknown_83A5EC0
+ .4byte gUnknown_83A5F24
+ .4byte gUnknown_83A5FA4
+ .4byte gUnknown_83A5FE0
gSpriteImages_83A00A0:: @ 83A00A0
obj_frame_tiles gUnknown_835BB68, 0x100
@@ -3950,7 +3985,22 @@ gAnimCmd_83A3298:: @ 83A3298
obj_image_anim_frame 3, 30, 0x40
obj_image_anim_jump 0
- .incbin "baserom.gba", 0x3A32AC, 0x68
+gUnknown_83A32AC:: @ 83A32AC
+ obj_rot_scal_anim_frame 0, 0, 1, 1
+ obj_rot_scal_anim_frame 0, 0, 0, 1
+ obj_rot_scal_anim_frame 0, 0, 0, 1
+ obj_rot_scal_anim_frame 0, 0, 0, 1
+ obj_rot_scal_anim_loop 7
+ obj_rot_scal_anim_jump 0
+
+gUnknown_83A32DC:: @ 83A32DC
+ obj_rot_scal_anim_frame 0, 0, -1, 1
+ obj_rot_scal_anim_frame 0, 0, 0, 1
+ obj_rot_scal_anim_loop 15
+ obj_rot_scal_anim_frame 0, 0, 1, 1
+ obj_rot_scal_anim_frame 0, 0, 0, 1
+ obj_rot_scal_anim_loop 15
+ obj_rot_scal_anim_jump 0
gAnimTable_83A3314:: @ 83A3314
.4byte gAnimCmd_83A2950
@@ -4363,19 +4413,70 @@ gSubspriteTables_83A37F0:: @ 83A37F0
.4byte gSubsprites_83A37E8
gUnknown_83A3820:: @ 83A3820
- .incbin "baserom.gba", 0x3A3820, 0x60
+ subsprite 232, 232, 2, 0, 32x8
+ subsprite 8, 232, 2, 4, 16x8
+ subsprite 232, 240, 2, 6, 32x8
+ subsprite 8, 240, 2, 10, 16x8
+ subsprite 232, 248, 2, 12, 32x8
+ subsprite 8, 248, 2, 16, 16x8
+ subsprite 232, 0, 2, 18, 32x8
+ subsprite 8, 0, 2, 22, 16x8
+ subsprite 232, 8, 2, 24, 32x8
+ subsprite 8, 8, 2, 28, 16x8
+ subsprite 232, 16, 2, 30, 32x8
+ subsprite 8, 16, 2, 34, 16x8
+
+gUnknown_83A3850:: @ 83A3850
+ .byte 0xC
+ .align 2
+ .4byte gUnknown_83A3820
+ .byte 0xC
+ .align 2
+ .4byte gUnknown_83A3820
+ .byte 0xC
+ .align 2
+ .4byte gUnknown_83A3820
+ .byte 0xC
+ .align 2
+ .4byte gUnknown_83A3820
+ .byte 0xC
+ .align 2
+ .4byte gUnknown_83A3820
+ .byte 0xC
+ .align 2
+ .4byte gUnknown_83A3820
gUnknown_83A3880:: @ 83A3880
- .incbin "baserom.gba", 0x3A3880, 0x4
+ subsprite 224, 240, 2, 0, 64x32
gUnknown_83A3884:: @ 83A3884
- .incbin "baserom.gba", 0x3A3884, 0x4
+ subsprite 224, 240, 1, 0, 64x32
gUnknown_83A3888:: @ 83A3888
- .incbin "baserom.gba", 0x3A3888, 0x4
+ subsprite 224, 240, 2, 0, 64x32
gUnknown_83A388C:: @ 83A388C
- .incbin "baserom.gba", 0x3A388C, 0x34
+ subsprite 224, 240, 2, 0, 64x32
+
+gUnknown_83A3890:: @ 83A3890
+ .byte 0x0
+ .align 2
+ .4byte NULL
+ .byte 1
+ .align 2
+ .4byte gUnknown_83A3880
+ .byte 1
+ .align 2
+ .4byte gUnknown_83A3884
+ .byte 1
+ .align 2
+ .4byte gUnknown_83A3888
+ .byte 1
+ .align 2
+ .4byte gUnknown_83A388C
+ .byte 1
+ .align 2
+ .4byte gUnknown_83A388C
gSubsprites_83A38C0:: @ 83A38C0
subsprite 224, 224, 2, 0x0000, 64x64
@@ -4410,16 +4511,92 @@ gSubspriteTables_83A38D0:: @ 83A38D0
.4byte gSubsprites_83A38CC
gUnknown_83A3900:: @ 83A3900
- .incbin "baserom.gba", 0x3A3900, 0x3C
+ subsprite 208, 236, 2, 0, 32x8
+ subsprite 240, 236, 2, 4, 32x8
+ subsprite 16, 236, 2, 8, 32x8
+ subsprite 208, 244, 2, 12, 32x8
+ subsprite 240, 244, 2, 16, 32x8
+ subsprite 16, 244, 2, 20, 32x8
+ subsprite 208, 252, 2, 24, 32x8
+ subsprite 240, 252, 2, 28, 32x8
+ subsprite 16, 252, 2, 32, 32x8
+ subsprite 208, 4, 2, 36, 32x8
+ subsprite 240, 4, 2, 40, 32x8
+ subsprite 16, 4, 2, 44, 32x8
+ subsprite 208, 12, 2, 48, 32x8
+ subsprite 240, 12, 2, 52, 32x8
+ subsprite 16, 12, 2, 56, 32x8
gUnknown_83A393C:: @ 83A393C
- .incbin "baserom.gba", 0x3A393C, 0x3C
+ subsprite 208, 236, 1, 0, 32x8
+ subsprite 240, 236, 1, 4, 32x8
+ subsprite 16, 236, 1, 8, 32x8
+ subsprite 208, 244, 1, 12, 32x8
+ subsprite 240, 244, 1, 16, 32x8
+ subsprite 16, 244, 1, 20, 32x8
+ subsprite 208, 252, 1, 24, 32x8
+ subsprite 240, 252, 1, 28, 32x8
+ subsprite 16, 252, 1, 32, 32x8
+ subsprite 208, 4, 1, 36, 32x8
+ subsprite 240, 4, 1, 40, 32x8
+ subsprite 16, 4, 1, 44, 32x8
+ subsprite 208, 12, 1, 48, 32x8
+ subsprite 240, 12, 1, 52, 32x8
+ subsprite 16, 12, 1, 56, 32x8
gUnknown_83A3978:: @ 83A3978
- .incbin "baserom.gba", 0x3A3978, 0x3C
+ subsprite 208, 236, 2, 0, 32x8
+ subsprite 240, 236, 2, 4, 32x8
+ subsprite 16, 236, 2, 8, 32x8
+ subsprite 208, 244, 2, 12, 32x8
+ subsprite 240, 244, 2, 16, 32x8
+ subsprite 16, 244, 2, 20, 32x8
+ subsprite 208, 252, 2, 24, 32x8
+ subsprite 240, 252, 2, 28, 32x8
+ subsprite 16, 252, 2, 32, 32x8
+ subsprite 208, 4, 2, 36, 32x8
+ subsprite 240, 4, 2, 40, 32x8
+ subsprite 16, 4, 2, 44, 32x8
+ subsprite 208, 12, 2, 48, 32x8
+ subsprite 240, 12, 2, 52, 32x8
+ subsprite 16, 12, 2, 56, 32x8
gUnknown_83A39B4:: @ 83A39B4
- .incbin "baserom.gba", 0x3A39B4, 0x6C
+ subsprite 208, 236, 1, 0, 32x8
+ subsprite 240, 236, 1, 4, 32x8
+ subsprite 16, 236, 1, 8, 32x8
+ subsprite 208, 244, 1, 12, 32x8
+ subsprite 240, 244, 1, 16, 32x8
+ subsprite 16, 244, 1, 20, 32x8
+ subsprite 208, 252, 2, 24, 32x8
+ subsprite 240, 252, 2, 28, 32x8
+ subsprite 16, 252, 2, 32, 32x8
+ subsprite 208, 4, 2, 36, 32x8
+ subsprite 240, 4, 2, 40, 32x8
+ subsprite 16, 4, 2, 44, 32x8
+ subsprite 208, 12, 2, 48, 32x8
+ subsprite 240, 12, 2, 52, 32x8
+ subsprite 16, 12, 2, 56, 32x8
+
+gUnknown_83A39F0:: @ 83A39F0
+ .byte 0xF
+ .align 2
+ .4byte gUnknown_83A3900
+ .byte 0xF
+ .align 2
+ .4byte gUnknown_83A3900
+ .byte 0xF
+ .align 2
+ .4byte gUnknown_83A393C
+ .byte 0xF
+ .align 2
+ .4byte gUnknown_83A3978
+ .byte 0xF
+ .align 2
+ .4byte gUnknown_83A39B4
+ .byte 0xF
+ .align 2
+ .4byte gUnknown_83A39B4
gSubsprites_83A3A20:: @ 83A3A20
subsprite 224, 240, 2, 0x0000, 64x32
@@ -4460,16 +4637,96 @@ gSubspriteTables_83A3A50:: @ 83A3A50
.4byte gSubsprites_83A3A40
gUnknown_83A3A80:: @ 83A3A80
- .incbin "baserom.gba", 0x3A3A80, 0x40
+ subsprite 208, 236, 2, 0, 32x8
+ subsprite 240, 236, 2, 4, 32x8
+ subsprite 16, 236, 2, 8, 16x8
+ subsprite 32, 236, 2, 10, 8x8
+ subsprite 208, 244, 2, 11, 32x8
+ subsprite 240, 244, 2, 15, 32x8
+ subsprite 16, 244, 2, 19, 16x8
+ subsprite 32, 244, 2, 21, 8x8
+ subsprite 208, 252, 2, 22, 32x8
+ subsprite 240, 252, 2, 26, 32x8
+ subsprite 16, 252, 2, 30, 16x8
+ subsprite 32, 252, 2, 32, 8x8
+ subsprite 208, 4, 2, 33, 32x8
+ subsprite 240, 4, 2, 37, 32x8
+ subsprite 16, 4, 2, 41, 16x8
+ subsprite 32, 4, 2, 43, 8x8
gUnknown_83A3AC0:: @ 83A3AC0
- .incbin "baserom.gba", 0x3A3AC0, 0x40
+ subsprite 208, 236, 1, 0, 32x8
+ subsprite 240, 236, 1, 4, 32x8
+ subsprite 16, 236, 1, 8, 16x8
+ subsprite 32, 236, 1, 10, 8x8
+ subsprite 208, 244, 1, 11, 32x8
+ subsprite 240, 244, 1, 15, 32x8
+ subsprite 16, 244, 1, 19, 16x8
+ subsprite 32, 244, 1, 21, 8x8
+ subsprite 208, 252, 1, 22, 32x8
+ subsprite 240, 252, 1, 26, 32x8
+ subsprite 16, 252, 1, 30, 16x8
+ subsprite 32, 252, 1, 32, 8x8
+ subsprite 208, 4, 1, 33, 32x8
+ subsprite 240, 4, 1, 37, 32x8
+ subsprite 16, 4, 1, 41, 16x8
+ subsprite 32, 4, 1, 43, 8x8
gUnknown_83A3B00:: @ 83A3B00
- .incbin "baserom.gba", 0x3A3B00, 0x40
+ subsprite 208, 236, 2, 0, 32x8
+ subsprite 240, 236, 2, 4, 32x8
+ subsprite 16, 236, 2, 8, 16x8
+ subsprite 32, 236, 2, 10, 8x8
+ subsprite 208, 244, 2, 11, 32x8
+ subsprite 240, 244, 2, 15, 32x8
+ subsprite 16, 244, 2, 19, 16x8
+ subsprite 32, 244, 2, 21, 8x8
+ subsprite 208, 252, 2, 22, 32x8
+ subsprite 240, 252, 2, 26, 32x8
+ subsprite 16, 252, 2, 30, 16x8
+ subsprite 32, 252, 2, 32, 8x8
+ subsprite 208, 4, 2, 33, 32x8
+ subsprite 240, 4, 2, 37, 32x8
+ subsprite 16, 4, 2, 41, 16x8
+ subsprite 32, 4, 2, 43, 8x8
gUnknown_83A3B40:: @ 83A3B40
- .incbin "baserom.gba", 0x3A3B40, 0x70
+ subsprite 208, 236, 1, 0, 32x8
+ subsprite 240, 236, 1, 4, 32x8
+ subsprite 16, 236, 1, 8, 16x8
+ subsprite 32, 236, 1, 10, 8x8
+ subsprite 208, 244, 1, 11, 32x8
+ subsprite 240, 244, 1, 15, 32x8
+ subsprite 16, 244, 1, 19, 16x8
+ subsprite 32, 244, 1, 21, 8x8
+ subsprite 208, 252, 2, 22, 32x8
+ subsprite 240, 252, 2, 26, 32x8
+ subsprite 16, 252, 2, 30, 16x8
+ subsprite 32, 252, 2, 32, 8x8
+ subsprite 208, 4, 2, 33, 32x8
+ subsprite 240, 4, 2, 37, 32x8
+ subsprite 16, 4, 2, 41, 16x8
+ subsprite 32, 4, 2, 43, 8x8
+
+gUnknown_83A3B80:: @ 83A3B80
+ .byte 0x10
+ .align 2
+ .4byte gUnknown_83A3A80
+ .byte 0x10
+ .align 2
+ .4byte gUnknown_83A3A80
+ .byte 0x10
+ .align 2
+ .4byte gUnknown_83A3AC0
+ .byte 0x10
+ .align 2
+ .4byte gUnknown_83A3B00
+ .byte 0x10
+ .align 2
+ .4byte gUnknown_83A3B40
+ .byte 0x10
+ .align 2
+ .4byte gUnknown_83A3B40
gObjectEventGraphicsInfo_83A3BB0:: @ 83A3BB0
.2byte 0xFFFF, 0x1100, 0x1102, 0x200, 16, 32
@@ -6435,6 +6692,7 @@ gUnknown_83A536C:: @ 83A536C
gUnknown_83A5374:: @ 83A5374
.incbin "baserom.gba", 0x3A5374, 0x8
+@ this is a field effect object template
gUnknown_83A537C:: @ 83A537C
.incbin "baserom.gba", 0x3A537C, 0x18
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index d89800535..38e7dc42b 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -103,6 +103,6 @@ void sub_8069058(u8, u8);
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
extern const struct SpritePalette gUnknown_83A5348;
-extern const struct SpriteTemplate * const gUnknown_83A0010[];
+extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[];
#endif // GUARD_EVENT_OBJECT_MOVEMENT_H
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index bd0198a64..449e75f09 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -1125,7 +1125,7 @@ static void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority,
if (sResources->grassAnimDisabled != 1 && TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(x - 0x10, y))
{
- spriteId = CreateSprite(gUnknown_83A0010[4], 0, 0, subpriority);
+ spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[4], 0, 0, subpriority);
obj = &gSprites[spriteId];
obj->pos2.x = x;
obj->pos2.y = y + 8;