diff options
Diffstat (limited to 'asm')
-rw-r--r-- | asm/macros.s | 6 | ||||
-rw-r--r-- | asm/rom3.s | 86 | ||||
-rw-r--r-- | asm/rom4.s | 10 | ||||
-rw-r--r-- | asm/rom5.s | 518 | ||||
-rw-r--r-- | asm/rom_8074BAC.s | 6 |
5 files changed, 315 insertions, 311 deletions
diff --git a/asm/macros.s b/asm/macros.s index 65b795722..698a639e5 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -23,7 +23,11 @@ .macro obj_pal address, tag .4byte \address .2byte \tag - .2byte 0@ padding + .2byte 0 @ padding + .endm + + .macro null_obj_pal + obj_pal 0, 0 .endm @ For object animation frames. diff --git a/asm/rom3.s b/asm/rom3.s index da13f5102..095eb41e8 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -8287,7 +8287,7 @@ unref_sub_800D684: @ 800D684 pop {r0} bx r0 .align 2, 0 -_0800D6B8: .4byte gUnknown_081F96D0 +_0800D6B8: .4byte gSpriteTemplate_81F96D0 _0800D6BC: .4byte 0x02020004 _0800D6C0: .4byte sub_800D6C4 thumb_func_end unref_sub_800D684 @@ -9374,10 +9374,10 @@ _0800E014: .4byte 0x0202eac8 _0800E018: .4byte 0x0000021e _0800E01C: .4byte 0x0202eec8 _0800E020: .4byte 0x00007fff -_0800E024: .4byte gUnknown_081F9574 +_0800E024: .4byte gSpriteTemplate_81F9574 _0800E028: .4byte 0x02000000 _0800E02C: .4byte 0x0001608a -_0800E030: .4byte gUnknown_081F958C +_0800E030: .4byte gSpriteTemplate_81F958C _0800E034: .4byte 0x0001608b _0800E038: .4byte 0x02020004 _0800E03C: @@ -81311,7 +81311,7 @@ _0803288A: bx r0 .align 2, 0 _08032894: .4byte gUnknown_081FAF24 -_08032898: .4byte gUnknown_081FAF34 +_08032898: .4byte gSpriteTemplate_81FAF34 _0803289C: .4byte 0x02017810 _080328A0: .4byte 0x02020004 thumb_func_end sub_80327CC @@ -110373,7 +110373,7 @@ object_new_hidden_with_callback: @ 8040EB4 pop {r1} bx r1 .align 2, 0 -_08040EE8: .4byte gUnknown_082087AC +_08040EE8: .4byte gSpriteTemplate_82087AC _08040EEC: .4byte 0x02020004 thumb_func_end object_new_hidden_with_callback @@ -114463,7 +114463,7 @@ _08042E40: adds r1, r2 b _08042F0A .align 2, 0 -_08042E64: .4byte gUnknown_0820A3C8 +_08042E64: .4byte gSpriteTemplate_820A3C8 _08042E68: .4byte 0x0300481c _08042E6C: .4byte 0x03001770 _08042E70: .4byte 0x0000043c @@ -115507,7 +115507,7 @@ sub_8043654: @ 8043654 pop {r0} bx r0 .align 2, 0 -_080436CC: .4byte gUnknown_0820A418 +_080436CC: .4byte gSpriteTemplate_820A418 _080436D0: .4byte 0x02020004 thumb_func_end sub_8043654 @@ -115893,7 +115893,7 @@ battle_make_oam_normal_battle: @ 8043914 strh r0, [r2, 0x4] b _080439F2 .align 2, 0 -_0804399C: .4byte gUnknown_0820A4EC +_0804399C: .4byte gSpriteTemplate_820A4EC _080439A0: .4byte 0x02020004 _080439A4: .4byte 0x000003ff _080439A8: .4byte 0xfffffc00 @@ -115949,7 +115949,7 @@ _080439F2: str r1, [r0] b _08043B50 .align 2, 0 -_08043A14: .4byte gUnknown_0820A51C +_08043A14: .4byte gSpriteTemplate_820A51C _08043A18: .4byte 0x02020004 _08043A1C: .4byte 0x000003ff _08043A20: .4byte 0xfffffc00 @@ -116023,7 +116023,7 @@ _08043A28: movs r0, 0x1 b _08043B4E .align 2, 0 -_08043AB8: .4byte gUnknown_0820A4EC +_08043AB8: .4byte gSpriteTemplate_820A4EC _08043ABC: .4byte 0x02020004 _08043AC0: .4byte 0x000003ff _08043AC4: .4byte 0xfffffc00 @@ -116187,13 +116187,13 @@ _08043B50: pop {r1} bx r1 .align 2, 0 -_08043C14: .4byte gUnknown_0820A51C +_08043C14: .4byte gSpriteTemplate_820A51C _08043C18: .4byte 0x02020004 _08043C1C: .4byte 0x000003ff _08043C20: .4byte 0xfffffc00 _08043C24: .4byte sub_8043D5C _08043C28: .4byte 0x02024a72 -_08043C2C: .4byte gUnknown_0820A56C +_08043C2C: .4byte gSpriteTemplate_820A56C _08043C30: .4byte gUnknown_0820A684 _08043C34: .4byte 0x06010000 _08043C38: .4byte 0x04000010 @@ -116269,7 +116269,7 @@ battle_make_oam_safari_battle: @ 8043C3C pop {r1} bx r1 .align 2, 0 -_08043CC8: .4byte gUnknown_0820A54C +_08043CC8: .4byte gSpriteTemplate_820A54C _08043CCC: .4byte 0x02020004 _08043CD0: .4byte 0x000003ff _08043CD4: .4byte 0xfffffc00 @@ -117856,7 +117856,7 @@ _08044938: .4byte 0x0000ffff _0804493C: .4byte gUnknown_0820A784 _08044940: .4byte gUnknown_0820A764 _08044944: .4byte gUnknown_0820A774 -_08044948: .4byte gUnknown_0820A7A4 +_08044948: .4byte gSpriteTemplate_820A7A4 _0804494C: .4byte 0x02020004 _08044950: .4byte gUnknown_0820A6E4 _08044954: @@ -117952,7 +117952,7 @@ _080449BE: b _08044A56 .align 2, 0 _08044A04: .4byte 0x02020004 -_08044A08: .4byte gUnknown_0820A7D4 +_08044A08: .4byte gSpriteTemplate_820A7D4 _08044A0C: .4byte 0xfffc0000 _08044A10: .4byte 0x02020020 _08044A14: .4byte sub_8045180 @@ -121210,7 +121210,7 @@ _08046370: .4byte 0xffff0000 _08046374: .4byte gUnknown_081FAEAC _08046378: .4byte sub_8046388 _0804637C: .4byte 0x02020004 -_08046380: .4byte gUnknown_081FAF0C +_08046380: .4byte gSpriteTemplate_81FAF0C _08046384: .4byte 0xfff00000 thumb_func_end sub_8046234 @@ -121439,7 +121439,7 @@ _080464D6: .align 2, 0 _08046544: .4byte 0x02024a6a _08046548: .4byte 0x03004360 -_0804654C: .4byte gUnknown_0820AAB4 +_0804654C: .4byte gSpriteTemplate_820AAB4 _08046550: .4byte 0x02020004 _08046554: .4byte 0x02024c08 _08046558: .4byte sub_8047074 @@ -123261,7 +123261,7 @@ AddTextPrinterForMessage: @ 80472F0 .align 2, 0 _080473BC: .4byte gUnknown_0820A92C _080473C0: .4byte gUnknown_0820A98C -_080473C4: .4byte gUnknown_0820AAB4 +_080473C4: .4byte gSpriteTemplate_820AAB4 _080473C8: .4byte 0x02020004 _080473CC: .4byte sub_80473D0 thumb_func_end AddTextPrinterForMessage @@ -123574,7 +123574,7 @@ sub_8047580: @ 8047580 .align 2, 0 _08047624: .4byte gUnknown_0820A92C _08047628: .4byte gUnknown_0820A98C -_0804762C: .4byte gUnknown_0820AAB4 +_0804762C: .4byte gSpriteTemplate_820AAB4 _08047630: .4byte 0x02020004 _08047634: .4byte sub_8047638 thumb_func_end sub_8047580 @@ -124662,7 +124662,7 @@ _08047DEE: .align 2, 0 _08047E30: .4byte 0x02024ea4 _08047E34: .4byte gUnknown_0820C2E6 -_08047E38: .4byte gUnknown_0820C0EC +_08047E38: .4byte gSpriteTemplate_820C0EC _08047E3C: .4byte 0x03002978 _08047E40: .4byte gUnknown_0820C2E9 thumb_func_end sub_8047D58 @@ -124729,7 +124729,7 @@ _08047E84: pop {r0} bx r0 .align 2, 0 -_08047EBC: .4byte gUnknown_0820C0EC +_08047EBC: .4byte gSpriteTemplate_820C0EC thumb_func_end sub_8047E44 thumb_func_start sub_8047EC0 @@ -125283,7 +125283,7 @@ _08048360: bl nullsub_5 b _080484C6 .align 2, 0 -_080483A4: .4byte gUnknown_0820C134 +_080483A4: .4byte gSpriteTemplate_820C134 _080483A8: .4byte gUnknown_0820C29C _080483AC: .4byte 0x03004824 _080483B0: .4byte 0x03001770 @@ -125881,7 +125881,7 @@ _080488B8: bl nullsub_5 b _080489CA .align 2, 0 -_08048900: .4byte gUnknown_0820C134 +_08048900: .4byte gSpriteTemplate_820C134 _08048904: .4byte gUnknown_0820C29C _08048908: .4byte 0x03004824 _0804890C: .4byte 0x03001770 @@ -133501,7 +133501,7 @@ _0804C7D2: .align 2, 0 _0804C810: .4byte 0x02020004 _0804C814: .4byte SpriteCallbackDummy -_0804C818: .4byte gUnknown_0821595C +_0804C818: .4byte gSpriteTemplate_821595C _0804C81C: .4byte 0x00000103 _0804C820: .4byte sub_804D738 _0804C824: @@ -133627,7 +133627,7 @@ _0804C906: ldr r1, [r6] bl _0804D53C .align 2, 0 -_0804C928: .4byte gUnknown_08215A80 +_0804C928: .4byte gSpriteTemplate_8215A80 _0804C92C: ldr r2, _0804C96C ldr r0, [r6] @@ -133701,7 +133701,7 @@ _0804C9AE: strb r0, [r1] bl _0804D570 .align 2, 0 -_0804C9C4: .4byte gUnknown_08215A30 +_0804C9C4: .4byte gSpriteTemplate_8215A30 _0804C9C8: ldr r0, _0804CA0C movs r1, 0x80 @@ -133733,9 +133733,9 @@ _0804C9C8: ldr r1, [r4] bl _0804D53C .align 2, 0 -_0804CA0C: .4byte gUnknown_082159BC +_0804CA0C: .4byte gSpriteTemplate_82159BC _0804CA10: .4byte 0x03004828 -_0804CA14: .4byte gUnknown_082159FC +_0804CA14: .4byte gSpriteTemplate_82159FC _0804CA18: .4byte 0x02020004 _0804CA1C: ldr r2, [r6] @@ -133892,7 +133892,7 @@ _0804CB24: ldr r1, [r4] bl _0804D53C .align 2, 0 -_0804CB68: .4byte gUnknown_082159FC +_0804CB68: .4byte gSpriteTemplate_82159FC _0804CB6C: .4byte 0x03004828 _0804CB70: ldr r0, _0804CBC0 @@ -134373,8 +134373,8 @@ _0804CEFA: b _0804D570 .align 2, 0 _0804CF58: .4byte 0x0202f388 -_0804CF5C: .4byte gUnknown_082159BC -_0804CF60: .4byte gUnknown_082159FC +_0804CF5C: .4byte gSpriteTemplate_82159BC +_0804CF60: .4byte gSpriteTemplate_82159FC _0804CF64: .4byte 0x02020004 _0804CF68: movs r1, 0x1 @@ -134557,7 +134557,7 @@ _0804D0B0: str r1, [r0] b _0804D570 .align 2, 0 -_0804D0C8: .4byte gUnknown_08215A30 +_0804D0C8: .4byte gSpriteTemplate_8215A30 _0804D0CC: .4byte 0x02020004 _0804D0D0: .4byte sub_804B0E0 _0804D0D4: @@ -134576,7 +134576,7 @@ _0804D0D4: strh r1, [r0] b _0804D570 .align 2, 0 -_0804D0F4: .4byte gUnknown_08215A80 +_0804D0F4: .4byte gSpriteTemplate_8215A80 _0804D0F8: .4byte 0x03004828 _0804D0FC: ldr r2, _0804D138 @@ -134781,7 +134781,7 @@ _0804D1F4: str r0, [r1] b _0804D570 .align 2, 0 -_0804D290: .4byte gUnknown_0821595C +_0804D290: .4byte gSpriteTemplate_821595C _0804D294: .4byte 0x03004828 _0804D298: .4byte 0x00000103 _0804D29C: .4byte 0x02020004 @@ -137085,7 +137085,7 @@ _0804E626: .align 2, 0 _0804E668: .4byte gUnknown_082162E4 _0804E66C: .4byte 0x03004854 -_0804E670: .4byte gUnknown_082163F4 +_0804E670: .4byte gSpriteTemplate_82163F4 _0804E674: .4byte 0x02020004 _0804E678: .4byte sub_804E2BC _0804E67C: @@ -137793,7 +137793,7 @@ _0804EC9A: .align 2, 0 _0804ECD8: .4byte gUnknown_082162E4 _0804ECDC: .4byte 0x03004854 -_0804ECE0: .4byte gUnknown_082163F4 +_0804ECE0: .4byte gSpriteTemplate_82163F4 _0804ECE4: .4byte 0x02020004 _0804ECE8: movs r0, 0x1 @@ -138198,7 +138198,7 @@ _0804F00C: bl CreateSprite b _0804F0AA .align 2, 0 -_0804F01C: .4byte gUnknown_08216548 +_0804F01C: .4byte gSpriteTemplate_8216548 _0804F020: mov r0, r8 b _0804F0AC @@ -138791,7 +138791,7 @@ _0804F49A: .align 2, 0 _0804F4DC: .4byte gUnknown_082162E4 _0804F4E0: .4byte 0x03004854 -_0804F4E4: .4byte gUnknown_082163F4 +_0804F4E4: .4byte gSpriteTemplate_82163F4 _0804F4E8: .4byte 0x02020004 _0804F4EC: movs r0, 0x1 @@ -139088,7 +139088,7 @@ _0804F720: ldr r1, [r0] b _0804F74C .align 2, 0 -_0804F734: .4byte gUnknown_08216548 +_0804F734: .4byte gSpriteTemplate_8216548 _0804F738: .4byte 0x03004854 _0804F73C: mov r5, r8 @@ -139785,7 +139785,7 @@ sub_804FC48: @ 804FC48 bl audio_play b _0804FD18 .align 2, 0 -_0804FCBC: .4byte gUnknown_0821645C +_0804FCBC: .4byte gSpriteTemplate_821645C _0804FCC0: .4byte gUnknown_082162E4 _0804FCC4: .4byte gUnknown_082162CC _0804FCC8: .4byte 0x00004523 @@ -143040,7 +143040,7 @@ _08051628: _08051638: .4byte gUnknown_08208344 _0805163C: .4byte 0x02020004 _08051640: .4byte 0x03004854 -_08051644: .4byte gUnknown_082164FC +_08051644: .4byte gSpriteTemplate_82164FC _08051648: .4byte 0x02020020 _0805164C: .4byte sub_8051524 thumb_func_end sub_805156C @@ -143352,7 +143352,7 @@ _08051872: bl CreateSprite b _080518BE .align 2, 0 -_080518A8: .4byte gUnknown_0821657C +_080518A8: .4byte gSpriteTemplate_821657C _080518AC: movs r0, 0 strh r0, [r4, 0x2E] @@ -144736,7 +144736,7 @@ _080522B6: b _0805243C .align 2, 0 _0805236C: .4byte gUnknown_0842D4CB -_08052370: .4byte gUnknown_0821645C +_08052370: .4byte gSpriteTemplate_821645C _08052374: .4byte 0x03004854 _08052378: .4byte 0x02020004 _0805237C: .4byte SpriteCallbackDummy diff --git a/asm/rom4.s b/asm/rom4.s index 2b9802c49..17b1d199f 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -20853,7 +20853,7 @@ AddCameraObject: @ 805C284 pop {r1} bx r1 .align 2, 0 -_0805C2C0: .4byte gUnknown_0830FD24 +_0805C2C0: .4byte gSpriteTemplate_830FD24 _0805C2C4: .4byte 0x02020004 thumb_func_end AddCameraObject @@ -52469,7 +52469,7 @@ sub_806A69C: @ 806A69C bx r0 .align 2, 0 _0806A70C: .4byte gUnknown_083764BC -_0806A710: .4byte gUnknown_083764E8 +_0806A710: .4byte gSpriteTemplate_83764E8 _0806A714: .4byte 0x02020004 _0806A718: .4byte sub_806A480 _0806A71C: .4byte 0x0000ffff @@ -59191,7 +59191,7 @@ sub_806DB0C: @ 806DB0C bx r0 .align 2, 0 _0806DB84: .4byte 0x02020004 -_0806DB88: .4byte gUnknown_0837660C +_0806DB88: .4byte gSpriteTemplate_837660C _0806DB8C: .4byte sub_806DAB4 thumb_func_end sub_806DB0C @@ -59357,7 +59357,7 @@ _0806DCB0: .align 2, 0 _0806DCC8: .4byte 0x02020004 _0806DCCC: .4byte 0x03004360 -_0806DCD0: .4byte gUnknown_0837660C +_0806DCD0: .4byte gSpriteTemplate_837660C thumb_func_end sub_806DC34 thumb_func_start sub_806DCD4 @@ -59405,7 +59405,7 @@ sub_806DCD4: @ 806DCD4 strb r1, [r0] b _0806DD5C .align 2, 0 -_0806DD2C: .4byte gUnknown_0837660C +_0806DD2C: .4byte gSpriteTemplate_837660C _0806DD30: .4byte 0x02020004 _0806DD34: adds r0, r7, 0 diff --git a/asm/rom5.s b/asm/rom5.s index d4ad0be1d..cc5a19bca 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -1181,7 +1181,7 @@ _0807B748: .4byte gBattleAnimPicTable + (136 * 8) _0807B74C: .4byte gBattleAnimPaletteTable + (136 * 8) _0807B750: .4byte 0x03004b20 _0807B754: .4byte 0x02020004 -_0807B758: .4byte gUnknown_083931F8 +_0807B758: .4byte gSpriteTemplate_83931F8 _0807B75C: movs r0, 0xF8 lsls r0, 7 @@ -1248,7 +1248,7 @@ _0807B7BC: bx r1 .align 2, 0 _0807B7D8: .4byte 0x02020004 -_0807B7DC: .4byte gUnknown_083931F8 +_0807B7DC: .4byte gSpriteTemplate_83931F8 thumb_func_end unref_sub_807B69C thumb_func_start sub_807B7E0 @@ -1498,7 +1498,7 @@ _0807B9B4: .4byte 0xffe00000 _0807B9B8: .4byte 0xffdc0000 _0807B9BC: .4byte 0xfffa0000 _0807B9C0: .4byte 0x04000050 -_0807B9C4: .4byte gUnknown_083931E0 +_0807B9C4: .4byte gSpriteTemplate_83931E0 _0807B9C8: .4byte 0x02020004 _0807B9CC: .4byte gUnknown_083931D8 _0807B9D0: .4byte 0x03004b20 @@ -2251,7 +2251,7 @@ _0807BF36: bx r0 .align 2, 0 _0807BF78: .4byte 0xffe00000 -_0807BF7C: .4byte gUnknown_08393F74 +_0807BF7C: .4byte gSpriteTemplate_8393F74 _0807BF80: .4byte 0x02020004 thumb_func_end sub_807BF28 @@ -2297,7 +2297,7 @@ _0807BF92: bx r0 .align 2, 0 _0807BFD4: .4byte 0xffc00000 -_0807BFD8: .4byte gUnknown_08393F74 +_0807BFD8: .4byte gSpriteTemplate_8393F74 _0807BFDC: .4byte 0x02020004 thumb_func_end sub_807BF84 @@ -2429,7 +2429,7 @@ sub_807C088: @ 807C088 pop {r0} bx r0 .align 2, 0 -_0807C0C0: .4byte gUnknown_08393FC0 +_0807C0C0: .4byte gSpriteTemplate_8393FC0 _0807C0C4: .4byte 0x02020004 thumb_func_end sub_807C088 @@ -2951,9 +2951,9 @@ _0807C560: .4byte 0x00001441 _0807C564: .4byte 0x04000048 _0807C568: .4byte 0x00003f50 _0807C56C: .4byte 0x04000054 -_0807C570: .4byte gUnknown_08393ECC +_0807C570: .4byte gSpriteTemplate_8393ECC _0807C574: .4byte 0x02020004 -_0807C578: .4byte gUnknown_08393EE4 +_0807C578: .4byte gSpriteTemplate_8393EE4 _0807C57C: .4byte sub_807C580 thumb_func_end sub_807C46C @@ -6500,7 +6500,7 @@ _0807E04C: .4byte gUnknown_08396FC4 _0807E050: .4byte 0x000006de _0807E054: .4byte gUnknown_0839A9D4 _0807E058: .4byte gUnknown_08397108 -_0807E05C: .4byte gUnknown_0839A9F0 +_0807E05C: .4byte gSpriteTemplate_839A9F0 _0807E060: .4byte 0x02020004 _0807E064: .4byte gUnknown_0839A9C8 _0807E068: @@ -7550,7 +7550,7 @@ _0807E832: .align 2, 0 _0807E860: .4byte gUnknown_08396FC4 _0807E864: .4byte 0x000006da -_0807E868: .4byte gUnknown_0839AAA4 +_0807E868: .4byte gSpriteTemplate_839AAA4 _0807E86C: .4byte gUnknown_0839AA08 _0807E870: .4byte 0x02020004 _0807E874: .4byte 0x00000257 @@ -8021,7 +8021,7 @@ snowflake_add: @ 807EBA0 movs r0, 0x1 b _0807EC06 .align 2, 0 -_0807EBF4: .4byte gUnknown_0839AB04 +_0807EBF4: .4byte gSpriteTemplate_839AB04 _0807EBF8: .4byte 0x02020004 _0807EBFC: .4byte gUnknown_08396FC4 _0807EC00: .4byte 0x000006e4 @@ -9463,7 +9463,7 @@ _0807F70C: _0807F75C: .4byte gUnknown_08396FC4 _0807F760: .4byte 0x000006fb _0807F764: .4byte gUnknown_0839ABA8 -_0807F768: .4byte gUnknown_0839AB90 +_0807F768: .4byte gSpriteTemplate_839AB90 _0807F76C: .4byte 0x02020004 _0807F770: ldr r2, _0807F79C @@ -9825,7 +9825,7 @@ _0807F9C0: b _0807FA32 .align 2, 0 _0807FA18: .4byte gUnknown_08396FC4 -_0807FA1C: .4byte gUnknown_0839ABD0 +_0807FA1C: .4byte gSpriteTemplate_839ABD0 _0807FA20: .4byte 0x02020004 _0807FA24: ldr r2, _0807FA50 @@ -10292,7 +10292,7 @@ _0807FD54: _0807FD9C: .4byte gUnknown_08396FC4 _0807FDA0: .4byte 0x00000724 _0807FDA4: .4byte gUnknown_0839ABE8 -_0807FDA8: .4byte gUnknown_0839AC04 +_0807FDA8: .4byte gSpriteTemplate_839AC04 _0807FDAC: .4byte 0x02020004 _0807FDB0: ldr r2, _0807FDE0 @@ -10852,7 +10852,7 @@ _080801E8: .4byte gUnknown_08396FC4 _080801EC: .4byte 0x00000716 _080801F0: .4byte gUnknown_0839AC54 _080801F4: .4byte gUnknown_08397128 -_080801F8: .4byte gUnknown_0839AC3C +_080801F8: .4byte gSpriteTemplate_839AC3C _080801FC: .4byte 0x02020004 _08080200: ldr r2, _08080230 @@ -10971,7 +10971,7 @@ _08080258: .align 2, 0 _080802E0: .4byte gUnknown_08396FC4 _080802E4: .4byte 0x00000717 -_080802E8: .4byte gUnknown_0839AC3C +_080802E8: .4byte gSpriteTemplate_839AC3C _080802EC: .4byte 0x02020004 _080802F0: .4byte 0x00006730 _080802F4: .4byte gUnknown_0839AC5C @@ -11388,7 +11388,7 @@ _080805F0: .align 2, 0 _080805F8: .4byte gUnknown_0839AC78 _080805FC: .4byte 0x030027e0 -_08080600: .4byte gUnknown_0839ACBC +_08080600: .4byte gSpriteTemplate_839ACBC _08080604: .4byte 0x02020004 _08080608: .4byte gUnknown_08396FC4 _0808060C: .4byte 0x0000072c @@ -11425,7 +11425,7 @@ _08080630: bx r0 .align 2, 0 _08080648: .4byte 0x02020004 -_0808064C: .4byte gUnknown_0839ACBC +_0808064C: .4byte gSpriteTemplate_839ACBC _08080650: .4byte 0x00001205 thumb_func_end sub_8080610 @@ -20017,7 +20017,7 @@ _08084814: pop {r1} bx r1 .align 2, 0 -_0808481C: .4byte gUnknown_0839B510 +_0808481C: .4byte gSpriteTemplate_839B510 _08084820: .4byte 0x02020004 thumb_func_end oei_exclamation_mark @@ -20046,7 +20046,7 @@ _0808484C: pop {r1} bx r1 .align 2, 0 -_08084854: .4byte gUnknown_0839B510 +_08084854: .4byte gSpriteTemplate_839B510 _08084858: .4byte 0x02020004 thumb_func_end sub_8084824 @@ -20075,7 +20075,7 @@ _08084884: pop {r1} bx r1 .align 2, 0 -_0808488C: .4byte gUnknown_0839B528 +_0808488C: .4byte gSpriteTemplate_839B528 _08084890: .4byte 0x02020004 thumb_func_end sub_808485C @@ -22552,7 +22552,7 @@ AddNewGameBirchObject: @ 8085A94 bx r1 .align 2, 0 _08085ACC: .4byte gUnknown_0839F114 -_08085AD0: .4byte gUnknown_0839F128 +_08085AD0: .4byte gSpriteTemplate_839F128 thumb_func_end AddNewGameBirchObject thumb_func_start sub_8085AD4 @@ -23397,7 +23397,7 @@ _08086142: pop {r0} bx r0 .align 2, 0 -_08086148: .4byte gUnknown_0839F208 +_08086148: .4byte gSpriteTemplate_839F208 _0808614C: .4byte gUnknown_0839F2A8 _08086150: .4byte 0x02020004 thumb_func_end sub_80860BC @@ -23813,7 +23813,7 @@ sub_8086430: @ 8086430 pop {r1} bx r1 .align 2, 0 -_08086480: .4byte gUnknown_0839F220 +_08086480: .4byte gSpriteTemplate_839F220 _08086484: .4byte 0x02020004 _08086488: .4byte gUnknown_0839F1A0 thumb_func_end sub_8086430 @@ -23883,7 +23883,7 @@ sub_80864CC: @ 80864CC bl SetSubspriteTables b _08086528 .align 2, 0 -_08086508: .4byte gUnknown_0839F238 +_08086508: .4byte gSpriteTemplate_839F238 _0808650C: .4byte 0x02020004 _08086510: .4byte gUnknown_0839F1C8 _08086514: @@ -23913,7 +23913,7 @@ _08086528: pop {r0} bx r0 .align 2, 0 -_08086548: .4byte gUnknown_0839F250 +_08086548: .4byte gSpriteTemplate_839F250 _0808654C: .4byte 0x02020004 thumb_func_end sub_80864CC @@ -40760,13 +40760,13 @@ _0808EAC8: mov r8, r0 b _0808EB6C .align 2, 0 -_0808EB3C: .4byte gUnknown_083A053C +_0808EB3C: .4byte gSpriteTemplate_83A053C _0808EB40: .4byte 0x02020004 -_0808EB44: .4byte gUnknown_083A0524 -_0808EB48: .4byte gUnknown_083A0554 -_0808EB4C: .4byte gUnknown_083A056C -_0808EB50: .4byte gUnknown_083A0584 -_0808EB54: .4byte gUnknown_083A059C +_0808EB44: .4byte gSpriteTemplate_83A0524 +_0808EB48: .4byte gSpriteTemplate_83A0554 +_0808EB4C: .4byte gSpriteTemplate_83A056C +_0808EB50: .4byte gSpriteTemplate_83A0584 +_0808EB54: .4byte gSpriteTemplate_83A059C _0808EB58: .4byte 0x0202ffb4 _0808EB5C: .4byte 0x0000061a _0808EB60: @@ -40813,7 +40813,7 @@ _0808EBA4: bl StartSpriteAnim b _0808EBDC .align 2, 0 -_0808EBB8: .4byte gUnknown_083A059C +_0808EBB8: .4byte gSpriteTemplate_83A059C _0808EBBC: .4byte 0x0202ffb4 _0808EBC0: .4byte 0x0000061a _0808EBC4: .4byte 0x02020004 @@ -40889,7 +40889,7 @@ _0808EBDC: b _0808EC80 .align 2, 0 _0808EC60: .4byte 0x02020004 -_0808EC64: .4byte gUnknown_083A059C +_0808EC64: .4byte gSpriteTemplate_83A059C _0808EC68: .4byte 0x0202ffb4 _0808EC6C: .4byte 0x0000061a _0808EC70: .4byte 0x0000061c @@ -40937,7 +40937,7 @@ _0808ECB8: bl StartSpriteAnim b _0808ECF0 .align 2, 0 -_0808ECCC: .4byte gUnknown_083A059C +_0808ECCC: .4byte gSpriteTemplate_83A059C _0808ECD0: .4byte 0x0202ffb4 _0808ECD4: .4byte 0x0000061c _0808ECD8: .4byte 0x02020004 @@ -40994,10 +40994,10 @@ _0808ECF0: b _0808ED74 .align 2, 0 _0808ED48: .4byte 0x02020004 -_0808ED4C: .4byte gUnknown_083A059C +_0808ED4C: .4byte gSpriteTemplate_83A059C _0808ED50: .4byte 0x0202ffb4 _0808ED54: .4byte 0x0000061c -_0808ED58: .4byte gUnknown_083A05B4 +_0808ED58: .4byte gSpriteTemplate_83A05B4 _0808ED5C: ldr r0, _0808ED8C movs r1, 0x8C @@ -41024,7 +41024,7 @@ _0808ED74: pop {r0} bx r0 .align 2, 0 -_0808ED8C: .4byte gUnknown_083A05B4 +_0808ED8C: .4byte gSpriteTemplate_83A05B4 thumb_func_end sub_808E978 thumb_func_start nullsub_58 @@ -49445,7 +49445,7 @@ sub_809308C: @ 809308C pop {r0} bx r0 .align 2, 0 -_08093104: .4byte gUnknown_083A053C +_08093104: .4byte gSpriteTemplate_83A053C _08093108: .4byte 0x02020004 _0809310C: .4byte sub_8092FD8 thumb_func_end sub_809308C @@ -59426,7 +59426,7 @@ _08097FD0: .align 2, 0 _0809800C: .4byte gUnknown_083B6DC4 _08098010: .4byte 0x020012b0 -_08098014: .4byte gUnknown_083B6EFC +_08098014: .4byte gSpriteTemplate_83B6EFC _08098018: .4byte 0x02020004 thumb_func_end sub_8097FB8 @@ -59596,7 +59596,7 @@ _08098116: .align 2, 0 _08098150: .4byte gUnknown_083B6DCC _08098154: .4byte gUnknown_083B6DD4 -_08098158: .4byte gUnknown_083B6DDC +_08098158: .4byte gSpriteTemplate_83B6DDC _0809815C: .4byte 0x02002784 _08098160: .4byte 0x000007ff _08098164: .4byte 0x02002704 @@ -62985,7 +62985,7 @@ sub_8099AFC: @ 8099AFC strh r1, [r0, 0x2E] b _08099BD0 .align 2, 0 -_08099BAC: .4byte gUnknown_083B6F14 +_08099BAC: .4byte gSpriteTemplate_83B6F14 _08099BB0: .4byte gMonIconPaletteIndices _08099BB4: .4byte 0x0000dac0 _08099BB8: .4byte 0x0000ffff @@ -64009,7 +64009,7 @@ _0809A3B4: .4byte 0x00000cec _0809A3B8: .4byte 0x0000dac9 _0809A3BC: .4byte 0x00000cee _0809A3C0: .4byte 0x00008344 -_0809A3C4: .4byte gUnknown_083BB2B8 +_0809A3C4: .4byte gSpriteTemplate_83BB2B8 _0809A3C8: .4byte 0x02020004 _0809A3CC: .4byte 0x00000cca thumb_func_end sub_809A23C @@ -64075,7 +64075,7 @@ _0809A43C: .4byte gUnknown_083B6DB4 _0809A440: .4byte 0x000008ca _0809A444: .4byte 0x0000ffff _0809A448: .4byte 0x00030200 -_0809A44C: .4byte gUnknown_083BB2B8 +_0809A44C: .4byte gSpriteTemplate_83BB2B8 _0809A450: .4byte 0x00000cca _0809A454: .4byte 0x00000cec _0809A458: @@ -64469,7 +64469,7 @@ _0809A758: .align 2, 0 _0809A760: .4byte gUnknown_083BB288 _0809A764: .4byte gUnknown_083BB290 -_0809A768: .4byte gUnknown_083BB2F0 +_0809A768: .4byte gSpriteTemplate_83BB2F0 _0809A76C: .4byte 0x02020004 _0809A770: .4byte gUnknown_083B6DB4 thumb_func_end sub_809A6DC @@ -64827,7 +64827,7 @@ sub_809A9A0: @ 809A9A0 adds r0, r6, 0 b _0809AA1A .align 2, 0 -_0809AA0C: .4byte gUnknown_083BB2F0 +_0809AA0C: .4byte gSpriteTemplate_83BB2F0 _0809AA10: .4byte 0x02020004 _0809AA14: .4byte SpriteCallbackDummy _0809AA18: @@ -69271,7 +69271,7 @@ _0809CCC4: .4byte 0x0000dad1 _0809CCC8: .4byte 0x000011e5 _0809CCCC: .4byte 0x020384e4 _0809CCD0: .4byte 0x020384e5 -_0809CCD4: .4byte gUnknown_083BBC70 +_0809CCD4: .4byte gSpriteTemplate_83BBC70 _0809CCD8: .4byte 0x02020004 _0809CCDC: .4byte 0x020384e9 _0809CCE0: .4byte 0x020384e6 @@ -69336,7 +69336,7 @@ _0809CD08: strb r1, [r0] b _0809CD78 .align 2, 0 -_0809CD58: .4byte gUnknown_083BBC88 +_0809CD58: .4byte gSpriteTemplate_83BBC88 _0809CD5C: .4byte gUnknown_083B6DB4 _0809CD60: .4byte 0x000011c4 _0809CD64: .4byte 0x02020004 @@ -78932,7 +78932,7 @@ _080A196C: bx r0 .align 2, 0 _080A1984: .4byte 0x0201a000 -_080A1988: .4byte gUnknown_083C11C0 +_080A1988: .4byte gSpriteTemplate_83C11C0 thumb_func_end sub_80A1950 thumb_func_start sub_80A198C @@ -79072,7 +79072,7 @@ _080A1A60: .align 2, 0 _080A1A98: .4byte 0x02018000 _080A1A9C: .4byte 0x02020004 -_080A1AA0: .4byte gUnknown_083C1280 +_080A1AA0: .4byte gSpriteTemplate_83C1280 _080A1AA4: cmp r5, 0x9 bne _080A1AC0 @@ -79447,7 +79447,7 @@ sub_80A1D18: @ 80A1D18 b _080A1D60 .align 2, 0 _080A1D50: .4byte 0x0201a01d -_080A1D54: .4byte gUnknown_083C1304 +_080A1D54: .4byte gSpriteTemplate_83C1304 _080A1D58: movs r0, 0x1D bl sub_80A18E4 @@ -79571,7 +79571,7 @@ sub_80A1DE8: @ 80A1DE8 pop {r0} bx r0 .align 2, 0 -_080A1E48: .4byte gUnknown_0820AAB4 +_080A1E48: .4byte gSpriteTemplate_820AAB4 _080A1E4C: .4byte 0x02018000 _080A1E50: .4byte 0x02020004 _080A1E54: .4byte SpriteCallbackDummy @@ -91463,7 +91463,7 @@ _080A7AA6: strh r0, [r4, 0x36] b _080A7ADC .align 2, 0 -_080A7AC4: .4byte gUnknown_083C1CC4 +_080A7AC4: .4byte gSpriteAffineAnimTable_83C1CC4 _080A7AC8: ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -91515,7 +91515,7 @@ sub_80A7B10: @ 80A7B10 pop {r0} bx r0 .align 2, 0 -_080A7B24: .4byte gUnknown_083C1CE0 +_080A7B24: .4byte gSpriteTemplate_83C1CE0 thumb_func_end sub_80A7B10 thumb_func_start sub_80A7B28 @@ -91585,7 +91585,7 @@ _080A7B86: ldr r0, _080A7B9C b _080A7BA2 .align 2, 0 -_080A7B9C: .4byte gUnknown_083C1D20 +_080A7B9C: .4byte gSpriteAffineAnimTable_83C1D20 _080A7BA0: ldr r0, _080A7BD0 _080A7BA2: @@ -91610,7 +91610,7 @@ _080A7BA2: bl sub_80A7B48 b _080A7C16 .align 2, 0 -_080A7BD0: .4byte gUnknown_083C1D24 +_080A7BD0: .4byte gSpriteAffineAnimTable_83C1D20 + 0x4 _080A7BD4: ldrh r0, [r4, 0x2E] adds r0, 0x1 @@ -91678,7 +91678,7 @@ sub_80A7C20: @ 80A7C20 bx r0 .align 2, 0 _080A7C54: .4byte gUnknown_083C1D30 -_080A7C58: .4byte gUnknown_083C1D38 +_080A7C58: .4byte gSpriteTemplate_83C1D38 _080A7C5C: .4byte 0x02038568 _080A7C60: .4byte 0x02020004 thumb_func_end sub_80A7C20 @@ -91855,7 +91855,7 @@ sub_80A7D8C: @ 80A7D8C pop {r1} bx r1 .align 2, 0 -_080A7DC0: .4byte gUnknown_083C1D74 +_080A7DC0: .4byte gSpriteTemplate_83C1D74 thumb_func_end sub_80A7D8C thumb_func_start sub_80A7DC4 @@ -91932,7 +91932,7 @@ _080A7E42: bx r1 .align 2, 0 _080A7E50: .4byte 0x00007544 -_080A7E54: .4byte gUnknown_083C1E04 +_080A7E54: .4byte gSpriteTemplate_83C1E04 _080A7E58: .4byte 0x02020004 thumb_func_end sub_80A7DEC @@ -91951,7 +91951,7 @@ sub_80A7E5C: @ 80A7E5C pop {r1} bx r1 .align 2, 0 -_080A7E78: .4byte gUnknown_083C1F98 +_080A7E78: .4byte gSpriteTemplate_83C1F98 thumb_func_end sub_80A7E5C thumb_func_start sub_80A7E7C @@ -96732,7 +96732,7 @@ _080AA260: .4byte gUnknown_083C9337 _080AA264: .4byte gUnknown_083C933B _080AA268: .4byte gUnknown_083C92B4 _080AA26C: .4byte gUnknown_083C92BC -_080AA270: .4byte gUnknown_083C92CC +_080AA270: .4byte gSpriteTemplate_83C92CC _080AA274: .4byte gUnknown_083C9296 _080AA278: .4byte gUnknown_083C92A8 _080AA27C: .4byte 0x02020004 @@ -105409,7 +105409,7 @@ sub_80AE858: @ 80AE858 .align 2, 0 _080AE8A0: .4byte gUnknown_083CA4BC _080AE8A4: .4byte gUnknown_08D1CA1C -_080AE8A8: .4byte gUnknown_083CA4A4 +_080AE8A8: .4byte gSpriteTemplate_83CA4A4 _080AE8AC: .4byte 0x02020004 _080AE8B0: .4byte SpriteCallbackDummy thumb_func_end sub_80AE858 @@ -108290,7 +108290,7 @@ _080AFE3C: _080AFE64: .4byte gUnknown_083CA350 _080AFE68: .4byte gUnknown_083CA338 _080AFE6C: .4byte 0x02038696 -_080AFE70: .4byte gUnknown_083CA3AC +_080AFE70: .4byte gSpriteTemplate_83CA3AC _080AFE74: .4byte 0x02019338 thumb_func_end sub_80AFE30 @@ -108606,7 +108606,7 @@ _080B00A8: .4byte gUnknown_083CA3E4 _080B00AC: .4byte gUnknown_083CA33C _080B00B0: .4byte 0x02020004 _080B00B4: .4byte gUnknown_083CA3C4 -_080B00B8: .4byte gUnknown_083CA3F4 +_080B00B8: .4byte gSpriteTemplate_83CA3F4 _080B00BC: .4byte 0x02038696 _080B00C0: .4byte 0x02019338 _080B00C4: .4byte gUnknown_083CA464 @@ -108644,7 +108644,7 @@ sub_80B00C8: @ 80B00C8 .align 2, 0 _080B0104: .4byte gUnknown_083CA46C _080B0108: .4byte gUnknown_083CA474 -_080B010C: .4byte gUnknown_083CA484 +_080B010C: .4byte gSpriteTemplate_83CA484 _080B0110: .4byte 0x02020004 _080B0114: .4byte 0x02019204 thumb_func_end sub_80B00C8 @@ -108723,7 +108723,7 @@ _080B019C: .4byte gUnknown_083CC3B4 _080B01A0: .4byte gUnknown_083CA330 _080B01A4: .4byte 0x02020004 _080B01A8: .4byte 0x0201920d -_080B01AC: .4byte gUnknown_083CC454 +_080B01AC: .4byte gSpriteTemplate_83CC454 thumb_func_end unref_sub_80B011C thumb_func_start unref_sub_80B01B0 @@ -110002,7 +110002,7 @@ sub_80B09E4: @ 80B09E4 _080B0B2C: .4byte 0x02038696 _080B0B30: .4byte gUnknown_083CC4B4 _080B0B34: .4byte gUnknown_083CC4D4 -_080B0B38: .4byte gUnknown_083CC53C +_080B0B38: .4byte gSpriteTemplate_83CC53C _080B0B3C: .4byte 0x02020004 _080B0B40: .4byte 0x000003ff _080B0B44: .4byte 0xfffffc00 @@ -122019,7 +122019,7 @@ sub_80B6774: @ 80B6774 pop {r0} bx r0 .align 2, 0 -_080B67E0: .4byte gUnknown_083CE640 +_080B67E0: .4byte gSpriteTemplate_83CE640 _080B67E4: .4byte 0x02000000 _080B67E8: .4byte 0x02020004 thumb_func_end sub_80B6774 @@ -122436,13 +122436,13 @@ sub_80B6A80: @ 80B6A80 pop {r0} bx r0 .align 2, 0 -_080B6AF8: .4byte gUnknown_083CE5C8 +_080B6AF8: .4byte gSpriteTemplate_83CE5C8 _080B6AFC: .4byte 0x02000000 _080B6B00: .4byte 0x02020004 _080B6B04: .4byte gUnknown_083CE558 -_080B6B08: .4byte gUnknown_083CE5F8 +_080B6B08: .4byte gSpriteTemplate_83CE5F8 _080B6B0C: .4byte gUnknown_083CE560 -_080B6B10: .4byte gUnknown_083CE5E0 +_080B6B10: .4byte gSpriteTemplate_83CE5E0 thumb_func_end sub_80B6A80 thumb_func_start sub_80B6B14 @@ -122704,10 +122704,10 @@ sub_80B6CA8: @ 80B6CA8 pop {r0} bx r0 .align 2, 0 -_080B6CF4: .4byte gUnknown_083CE610 +_080B6CF4: .4byte gSpriteTemplate_83CE610 _080B6CF8: .4byte 0x02020004 _080B6CFC: .4byte gUnknown_083CE578 -_080B6D00: .4byte gUnknown_083CE628 +_080B6D00: .4byte gSpriteTemplate_83CE628 thumb_func_end sub_80B6CA8 thumb_func_start sub_80B6D04 @@ -122782,9 +122782,9 @@ _080B6D86: bx r0 .align 2, 0 _080B6D8C: .4byte 0x02000000 -_080B6D90: .4byte gUnknown_083CE658 +_080B6D90: .4byte gSpriteTemplate_83CE658 _080B6D94: .4byte 0x02020004 -_080B6D98: .4byte gUnknown_083CE670 +_080B6D98: .4byte gSpriteTemplate_83CE670 thumb_func_end sub_80B6D04 thumb_func_start sub_80B6D9C @@ -122969,7 +122969,7 @@ sub_80B6EBC: @ 80B6EBC pop {r0} bx r0 .align 2, 0 -_080B6EF0: .4byte gUnknown_083CE688 +_080B6EF0: .4byte gSpriteTemplate_83CE688 _080B6EF4: .4byte 0x02020004 _080B6EF8: .4byte gUnknown_083CE580 thumb_func_end sub_80B6EBC @@ -124865,7 +124865,7 @@ sub_80B7C14: @ 80B7C14 .align 2, 0 _080B7C88: .4byte gUnknown_083CF584 _080B7C8C: .4byte gUnknown_083CF58C -_080B7C90: .4byte gUnknown_083CF56C +_080B7C90: .4byte gSpriteTemplate_83CF56C _080B7C94: .4byte 0x02038734 thumb_func_end sub_80B7C14 @@ -148132,7 +148132,7 @@ _080C340A: pop {r0} bx r0 .align 2, 0 -_080C3498: .4byte gUnknown_083D174C +_080C3498: .4byte gSpriteTemplate_83D174C _080C349C: .4byte gUnknown_083D1764 _080C34A0: .4byte gUnknown_083D17A4 _080C34A4: .4byte 0x02020004 @@ -149344,7 +149344,7 @@ _080C3DCC: .align 2, 0 _080C3DD8: .4byte 0x03004b20 _080C3DDC: .4byte 0x02018000 -_080C3DE0: .4byte gUnknown_083D17B4 +_080C3DE0: .4byte gSpriteTemplate_83D17B4 _080C3DE4: .4byte 0x02020004 _080C3DE8: .4byte 0x000003ff _080C3DEC: .4byte 0xfffffc00 @@ -153482,7 +153482,7 @@ _080C5D58: .align 2, 0 _080C5D64: .4byte gUnknown_083D1898 _080C5D68: .4byte gUnknown_083D18A0 -_080C5D6C: .4byte gUnknown_083D18A8 +_080C5D6C: .4byte gSpriteTemplate_83D18A8 _080C5D70: .4byte 0xffff0000 _080C5D74: .4byte 0x020387ec _080C5D78: .4byte 0x02020004 @@ -153661,7 +153661,7 @@ _080C5EBC: .align 2, 0 _080C5EC8: .4byte gUnknown_083D1898 _080C5ECC: .4byte gUnknown_083D18A0 -_080C5ED0: .4byte gUnknown_083D18C0 +_080C5ED0: .4byte gSpriteTemplate_83D18C0 _080C5ED4: .4byte 0xffff0000 _080C5ED8: .4byte 0x020387ec _080C5EDC: .4byte 0x02020004 @@ -154361,7 +154361,7 @@ sub_80C63FC: @ 80C63FC pop {r1} bx r1 .align 2, 0 -_080C643C: .4byte gUnknown_083D2614 +_080C643C: .4byte gSpriteTemplate_83D2614 _080C6440: .4byte 0x02020004 _080C6444: .4byte 0x0202e858 _080C6448: .4byte 0x0202ff84 @@ -154539,7 +154539,7 @@ _080C6576: _080C6580: .4byte 0x0203923c _080C6584: .4byte 0x00000fff _080C6588: .4byte 0x0202ff84 -_080C658C: .4byte gUnknown_083D262C +_080C658C: .4byte gSpriteTemplate_83D262C _080C6590: .4byte 0x02020004 _080C6594: .4byte 0x0202e858 thumb_func_end sub_80C6508 @@ -154693,7 +154693,7 @@ sub_80C666C: @ 80C666C pop {r1} bx r1 .align 2, 0 -_080C66AC: .4byte gUnknown_083D2644 +_080C66AC: .4byte gSpriteTemplate_83D2644 _080C66B0: .4byte 0x02020004 _080C66B4: .4byte 0x0202e858 _080C66B8: .4byte 0x0202ff84 @@ -155552,7 +155552,7 @@ _080C6D86: bl CreateSprite b _080C6E4C .align 2, 0 -_080C6DB0: .4byte gUnknown_083D26A0 +_080C6DB0: .4byte gSpriteTemplate_83D26A0 _080C6DB4: .4byte 0x02020004 _080C6DB8: .4byte 0x0202e858 _080C6DBC: @@ -155574,7 +155574,7 @@ _080C6DBC: ldrb r2, [r2] b _080C6E0C .align 2, 0 -_080C6DE0: .4byte gUnknown_083D26A0 +_080C6DE0: .4byte gSpriteTemplate_83D26A0 _080C6DE4: .4byte 0x02020004 _080C6DE8: .4byte 0x0202e858 _080C6DEC: @@ -155599,7 +155599,7 @@ _080C6E0C: bl CreateSprite b _080C6E4C .align 2, 0 -_080C6E14: .4byte gUnknown_083D26A0 +_080C6E14: .4byte gSpriteTemplate_83D26A0 _080C6E18: .4byte 0x02020004 _080C6E1C: .4byte 0x0202e858 _080C6E20: .4byte 0xfff80000 @@ -155630,7 +155630,7 @@ _080C6E4C: pop {r1} bx r1 .align 2, 0 -_080C6E58: .4byte gUnknown_083D26A0 +_080C6E58: .4byte gSpriteTemplate_83D26A0 _080C6E5C: .4byte 0x02020004 _080C6E60: .4byte 0x0202e858 thumb_func_end sub_80C6D3C @@ -156121,7 +156121,7 @@ sub_80C71D8: @ 80C71D8 b _080C723A .align 2, 0 _080C722C: .4byte gUnknown_083D2878 -_080C7230: .4byte gUnknown_083D2894 +_080C7230: .4byte gSpriteTemplate_83D2894 _080C7234: .4byte 0x02020004 _080C7238: movs r0, 0x40 @@ -156161,7 +156161,7 @@ _080C7264: bx r0 .align 2, 0 _080C7274: .4byte 0x02020004 -_080C7278: .4byte gUnknown_083D2894 +_080C7278: .4byte gSpriteTemplate_83D2894 thumb_func_end sub_80C7240 thumb_func_start sub_80C727C @@ -157363,7 +157363,7 @@ _080C7BD4: b _080C7BE8 .align 2, 0 _080C7BDC: .4byte 0x02038800 -_080C7BE0: .4byte gUnknown_083D60A4 +_080C7BE0: .4byte gSpriteTemplate_83D60A4 _080C7BE4: mov r1, sp ldr r0, _080C7C7C @@ -157438,7 +157438,7 @@ _080C7BE8: adds r0, r5, 0 b _080C7C86 .align 2, 0 -_080C7C7C: .4byte gUnknown_083D608C +_080C7C7C: .4byte gSpriteTemplate_83D608C _080C7C80: .4byte 0x02020004 _080C7C84: movs r0, 0x40 @@ -163287,7 +163287,7 @@ _080CA990: .align 2, 0 _080CA998: .4byte 0x03004b20 _080CA99C: .4byte 0x03004b00 -_080CA9A0: .4byte gUnknown_083D631C +_080CA9A0: .4byte gSpriteTemplate_83D631C _080CA9A4: .4byte 0x0202f7c9 thumb_func_end sub_80CA928 @@ -166114,7 +166114,7 @@ _080CBE94: .align 2, 0 _080CBF48: .4byte 0x03004b20 _080CBF4C: .4byte 0x0202f7c9 -_080CBF50: .4byte gUnknown_083D6884 +_080CBF50: .4byte gSpriteTemplate_83D6884 _080CBF54: .4byte 0x02020004 _080CBF58: .4byte sub_80CBF5C thumb_func_end sub_80CBDF4 @@ -166717,7 +166717,7 @@ _080CC3EE: bx r0 .align 2, 0 _080CC3F8: .4byte 0x02020004 -_080CC3FC: .4byte gUnknown_083D6884 +_080CC3FC: .4byte gSpriteTemplate_83D6884 _080CC400: .4byte 0x03004b20 _080CC404: .4byte sub_80CC408 thumb_func_end sub_80CC358 @@ -173899,7 +173899,7 @@ sub_80CFA20: @ 80CFA20 b _080CFAA4 .align 2, 0 _080CFA74: .4byte 0x03004b20 -_080CFA78: .4byte gUnknown_083D74BC +_080CFA78: .4byte gSpriteTemplate_83D74BC _080CFA7C: .4byte 0x02020004 _080CFA80: ldrb r2, [r6, 0x3] @@ -174352,7 +174352,7 @@ sub_80CFDFC: @ 80CFDFC pop {r0} bx r0 .align 2, 0 -_080CFE24: .4byte gUnknown_083D75AC +_080CFE24: .4byte gSpriteTemplate_83D75AC _080CFE28: .4byte sub_80CFE2C thumb_func_end sub_80CFDFC @@ -178020,7 +178020,7 @@ _080D19C6: strh r0, [r4, 0x8] b _080D1A6A .align 2, 0 -_080D1A50: .4byte gUnknown_083D79E8 +_080D1A50: .4byte gSpriteTemplate_83D79E8 _080D1A54: .4byte 0x02020004 _080D1A58: .4byte gUnknown_083D7A00 _080D1A5C: @@ -181008,7 +181008,7 @@ _080D3172: .align 2, 0 _080D3178: .4byte 0x03004b20 _080D317C: .4byte 0x03004b00 -_080D3180: .4byte gUnknown_083D9130 +_080D3180: .4byte gSpriteTemplate_83D9130 thumb_func_end sub_80D30F0 thumb_func_start sub_80D3184 @@ -183529,7 +183529,7 @@ _080D44EA: bx r0 .align 2, 0 _080D4520: .4byte 0x0202f7c8 -_080D4524: .4byte gUnknown_083D9378 +_080D4524: .4byte gSpriteTemplate_83D9378 _080D4528: .4byte 0x02020004 thumb_func_end sub_80D4418 @@ -183871,7 +183871,7 @@ _080D4786: bx r0 .align 2, 0 _080D47B8: .4byte gUnknown_08208344 -_080D47BC: .4byte gUnknown_083D9378 +_080D47BC: .4byte gSpriteTemplate_83D9378 _080D47C0: .4byte 0x02020004 _080D47C4: .4byte sub_80D47D0 _080D47C8: .4byte 0x41c64e6d @@ -184314,7 +184314,7 @@ _080D4B2A: pop {r0} bx r0 .align 2, 0 -_080D4B30: .4byte gUnknown_083D9378 +_080D4B30: .4byte gSpriteTemplate_83D9378 _080D4B34: .4byte 0x02020004 _080D4B38: .4byte sub_80D4B3C thumb_func_end sub_80D4AD0 @@ -184705,7 +184705,7 @@ _080D4DF2: strh r1, [r4, 0x32] b _080D4E42 .align 2, 0 -_080D4E34: .4byte gUnknown_083D9420 +_080D4E34: .4byte gSpriteTemplate_83D9420 _080D4E38: .4byte 0x02020004 _080D4E3C: .4byte 0x0202f7c8 _080D4E40: @@ -184763,7 +184763,7 @@ _080D4E68: strh r1, [r4, 0x32] b _080D4EBA .align 2, 0 -_080D4EAC: .4byte gUnknown_083D9420 +_080D4EAC: .4byte gSpriteTemplate_83D9420 _080D4EB0: .4byte 0x02020004 _080D4EB4: .4byte 0x0202f7c8 _080D4EB8: @@ -186096,7 +186096,7 @@ _080D58C6: bx r0 .align 2, 0 _080D58E0: .4byte gUnknown_083D96DC -_080D58E4: .4byte gUnknown_083D96C4 +_080D58E4: .4byte gSpriteTemplate_83D96C4 _080D58E8: .4byte 0x02020004 _080D58EC: .4byte 0x000003ff _080D58F0: .4byte 0xfffffc00 @@ -188218,7 +188218,7 @@ _080D6910: lsls r3, r4, 16 b _080D6992 .align 2, 0 -_080D6920: .4byte gUnknown_083D9938 +_080D6920: .4byte gSpriteTemplate_83D9938 _080D6924: mov r0, r12 lsls r3, r0, 17 @@ -188234,7 +188234,7 @@ _080D6924: asrs r2, 16 b _080D6992 .align 2, 0 -_080D6940: .4byte gUnknown_083D9938 +_080D6940: .4byte gSpriteTemplate_83D9938 _080D6944: mov r3, r12 lsls r0, r3, 16 @@ -188263,7 +188263,7 @@ _080D695A: asrs r2, 16 b _080D6992 .align 2, 0 -_080D6978: .4byte gUnknown_083D9938 +_080D6978: .4byte gSpriteTemplate_83D9938 _080D697C: mov r1, r12 lsls r0, r1, 16 @@ -188291,7 +188291,7 @@ _080D6992: lsrs r7, r0, 24 b _080D69B8 .align 2, 0 -_080D69AC: .4byte gUnknown_083D9938 +_080D69AC: .4byte gSpriteTemplate_83D9938 _080D69B0: mov r0, r9 bl move_anim_task_del @@ -188677,7 +188677,7 @@ _080D6C92: b _080D6CC6 .align 2, 0 _080D6CA0: .4byte 0x03004b20 -_080D6CA4: .4byte gUnknown_083D99B8 +_080D6CA4: .4byte gSpriteTemplate_83D99B8 _080D6CA8: .4byte 0x02020004 _080D6CAC: .4byte gUnknown_083D9968 _080D6CB0: .4byte sub_80D6D00 @@ -189401,7 +189401,7 @@ _080D721C: movs r0, 0x1 b _080D722A .align 2, 0 -_080D7220: .4byte gUnknown_083D9B10 +_080D7220: .4byte gSpriteTemplate_83D9B10 _080D7224: .4byte 0x02020004 _080D7228: movs r0, 0 @@ -189812,7 +189812,7 @@ _080D7524: movs r0, 0x1 b _080D7554 .align 2, 0 -_080D7538: .4byte gUnknown_083D9B40 +_080D7538: .4byte gSpriteTemplate_83D9B40 _080D753C: .4byte 0x02020004 _080D7540: .4byte 0x000003ff _080D7544: .4byte 0xfffffc00 @@ -192850,7 +192850,7 @@ _080D8CA6: movs r0, 0x1 b _080D8D0A .align 2, 0 -_080D8D00: .4byte gUnknown_083D9E3C +_080D8D00: .4byte gSpriteTemplate_83D9E3C _080D8D04: .4byte 0x02020004 _080D8D08: movs r0, 0 @@ -199379,7 +199379,7 @@ _080DBEDE: beq _080DBF2A b _080DBF82 .align 2, 0 -_080DBF1C: .4byte gUnknown_083DA8DC +_080DBF1C: .4byte gSpriteTemplate_83DA8DC _080DBF20: cmp r0, 0x2 beq _080DBF54 @@ -199817,7 +199817,7 @@ _080DC274: strh r0, [r5, 0x8] b _080DC2A8 .align 2, 0 -_080DC28C: .4byte gUnknown_083DA9AC +_080DC28C: .4byte gSpriteTemplate_83DA9AC _080DC290: .4byte 0x02020004 _080DC294: ldrh r0, [r5, 0xA] @@ -202500,19 +202500,19 @@ _080DD7A8: movs r5, 0 b _080DD7D0 .align 2, 0 -_080DD7B0: .4byte gUnknown_083DAD78 +_080DD7B0: .4byte gSpriteTemplate_83DAD78 _080DD7B4: ldr r3, _080DD7BC movs r5, 0x50 b _080DD7D0 .align 2, 0 -_080DD7BC: .4byte gUnknown_083DAD90 +_080DD7BC: .4byte gSpriteTemplate_83DAD90 _080DD7C0: ldr r3, _080DD7C8 movs r5, 0x40 b _080DD7D0 .align 2, 0 -_080DD7C8: .4byte gUnknown_083DAD90 +_080DD7C8: .4byte gSpriteTemplate_83DAD90 _080DD7CC: ldr r3, _080DD86C movs r5, 0x30 @@ -202595,7 +202595,7 @@ _080DD864: pop {r0} bx r0 .align 2, 0 -_080DD86C: .4byte gUnknown_083DAD90 +_080DD86C: .4byte gSpriteTemplate_83DAD90 _080DD870: .4byte 0x02020004 _080DD874: .4byte 0x000003ff _080DD878: .4byte 0xfffffc00 @@ -204933,7 +204933,7 @@ _080DEA68: .4byte 0x03004b20 _080DEA6C: .4byte 0x04000050 _080DEA70: .4byte 0x03004b00 _080DEA74: .4byte 0x0202f7c8 -_080DEA78: .4byte gUnknown_083DAF08 +_080DEA78: .4byte gSpriteTemplate_83DAF08 _080DEA7C: .4byte 0x02020004 _080DEA80: .4byte 0x02020020 _080DEA84: .4byte sub_80DE8D8 @@ -205014,7 +205014,7 @@ _080DEB0C: pop {r0} bx r0 .align 2, 0 -_080DEB24: .4byte gUnknown_083DAF08 +_080DEB24: .4byte gSpriteTemplate_83DAF08 _080DEB28: .4byte 0x02020004 _080DEB2C: .4byte 0x03004b00 _080DEB30: .4byte sub_80DE8D8 @@ -206011,7 +206011,7 @@ _080DF2E6: bls _080DF292 b _080DF3B4 .align 2, 0 -_080DF2F4: .4byte gUnknown_083DAF80 +_080DF2F4: .4byte gSpriteTemplate_83DAF80 _080DF2F8: .4byte 0x02020004 _080DF2FC: .4byte 0x0202f7c8 _080DF300: @@ -224608,7 +224608,7 @@ sub_80E8268: @ 80E8268 pop {r0} bx r0 .align 2, 0 -_080E82B0: .4byte gUnknown_083DBBFC +_080E82B0: .4byte gSpriteTemplate_83DBBFC _080E82B4: .4byte 0x02020004 _080E82B8: .4byte gUnknown_083DB694 thumb_func_end sub_80E8268 @@ -224899,12 +224899,12 @@ sub_80E8420: @ 80E8420 pop {r0} bx r0 .align 2, 0 -_080E84E0: .4byte gUnknown_083DBCAC +_080E84E0: .4byte gSpriteTemplate_83DBCAC _080E84E4: .4byte gUnknown_083DB694 _080E84E8: .4byte 0x02020004 -_080E84EC: .4byte gUnknown_083DBC8C +_080E84EC: .4byte gSpriteAnimTable_83DBC8C _080E84F0: .4byte sub_80E872C -_080E84F4: .4byte gUnknown_083DBC9C +_080E84F4: .4byte gSpriteAnimTable_83DBC9C _080E84F8: .4byte sub_80E8760 _080E84FC: .4byte 0x00000101 _080E8500: .4byte 0x04000050 @@ -225363,7 +225363,7 @@ sub_80E8818: @ 80E8818 pop {r0} bx r0 .align 2, 0 -_080E8850: .4byte gUnknown_083DBBFC +_080E8850: .4byte gSpriteTemplate_83DBBFC _080E8854: .4byte 0x02020004 _080E8858: .4byte gUnknown_083DB694 _080E885C: .4byte sub_80E8860 @@ -225759,7 +225759,7 @@ _080E8AF6: pop {r0} bx r0 .align 2, 0 -_080E8B68: .4byte gUnknown_083DBD18 +_080E8B68: .4byte gSpriteTemplate_83DBD18 _080E8B6C: .4byte gUnknown_083DB694 _080E8B70: .4byte 0x02020004 _080E8B74: .4byte gUnknown_083DBD10 @@ -225950,7 +225950,7 @@ _080E8CD0: pop {r0} bx r0 .align 2, 0 -_080E8CDC: .4byte gUnknown_083DBD48 +_080E8CDC: .4byte gSpriteTemplate_83DBD48 _080E8CE0: .4byte 0x02024ea4 _080E8CE4: .4byte SpriteCallbackDummy _080E8CE8: .4byte 0x02020004 @@ -225986,7 +225986,7 @@ sub_80E8CEC: @ 80E8CEC .align 2, 0 _080E8D24: .4byte gUnknown_083DBD60 _080E8D28: .4byte gUnknown_083DBD68 -_080E8D2C: .4byte gUnknown_083DBDE4 +_080E8D2C: .4byte gSpriteTemplate_83DBDE4 _080E8D30: .4byte gUnknown_083DB694 _080E8D34: .4byte 0x00009c74 _080E8D38: .4byte 0x02020004 @@ -244080,7 +244080,7 @@ _080F1D92: _080F1DB0: b _080F1DC8 .align 2, 0 -_080F1DB4: .4byte gUnknown_083E4454 +_080F1DB4: .4byte gSpriteTemplate_83E4454 _080F1DB8: .4byte gUnknown_083DFEC4 _080F1DBC: .4byte 0x02020004 _080F1DC0: .4byte 0x0000030e @@ -245189,7 +245189,7 @@ _080F25F4: .4byte 0x00006d9c _080F25F8: .4byte 0x02025734 _080F25FC: .4byte gUnknown_083E446C _080F2600: .4byte gUnknown_083E4474 -_080F2604: .4byte gUnknown_083E4484 +_080F2604: .4byte gSpriteTemplate_83E4484 _080F2608: .4byte 0x02020004 _080F260C: movs r0, 0x19 @@ -245701,8 +245701,8 @@ _080F2A10: _080F2A44: .4byte 0x0000ffa0 _080F2A48: .4byte gUnknown_083DFEC4 _080F2A4C: .4byte 0x00003b88 -_080F2A50: .4byte gUnknown_083E44F8 -_080F2A54: .4byte gUnknown_083E44E0 +_080F2A50: .4byte gSpriteTemplate_83E44F8 +_080F2A54: .4byte gSpriteTemplate_83E44E0 _080F2A58: movs r3, 0x88 lsls r3, 1 @@ -245728,7 +245728,7 @@ _080F2A58: .align 2, 0 _080F2A84: .4byte gUnknown_083DFEC4 _080F2A88: .4byte 0x0000fff8 -_080F2A8C: .4byte gUnknown_083E44E0 +_080F2A8C: .4byte gSpriteTemplate_83E44E0 _080F2A90: .4byte 0x00003b88 _080F2A94: ldr r0, _080F2B40 @@ -245821,8 +245821,8 @@ _080F2B36: bl StartSpriteAnim b _080F2B6A .align 2, 0 -_080F2B40: .4byte gUnknown_083E4530 -_080F2B44: .4byte gUnknown_083E4548 +_080F2B40: .4byte gSpriteTemplate_83E4530 +_080F2B44: .4byte gSpriteTemplate_83E4548 _080F2B48: .4byte 0x0000ffa0 _080F2B4C: .4byte gUnknown_083DFEC4 _080F2B50: .4byte 0x00003b90 @@ -246283,7 +246283,7 @@ sub_80F2E18: @ 80F2E18 _080F2EA8: .4byte gUnknown_083DFEC4 _080F2EAC: .4byte 0x00008768 _080F2EB0: .4byte gUnknown_083E4568 -_080F2EB4: .4byte gUnknown_083E4570 +_080F2EB4: .4byte gSpriteTemplate_83E4570 _080F2EB8: .4byte gUnknown_083E4588 _080F2EBC: .4byte 0x0000d1e4 _080F2EC0: .4byte 0x0000d1dc @@ -246495,7 +246495,7 @@ _080F3032: _080F3060: .4byte gUnknown_083E4590 _080F3064: .4byte gUnknown_083E45A8 _080F3068: .4byte gUnknown_08E9F988 -_080F306C: .4byte gUnknown_083E45B8 +_080F306C: .4byte gSpriteTemplate_83E45B8 _080F3070: .4byte gUnknown_083DFEC4 _080F3074: .4byte 0x000087cc _080F3078: @@ -246564,7 +246564,7 @@ _080F30DE: _080F30F4: .4byte gUnknown_083DFEC4 _080F30F8: .4byte 0x000087cc _080F30FC: .4byte 0x02020004 -_080F3100: .4byte gUnknown_083E45F0 +_080F3100: .4byte gSpriteTemplate_83E45F0 _080F3104: .4byte 0x000087d0 _080F3108: ldr r0, _080F3128 @@ -247002,7 +247002,7 @@ _080F3406: .align 2, 0 _080F3440: .4byte gUnknown_083E4628 _080F3444: .4byte gUnknown_083E4648 -_080F3448: .4byte gUnknown_083E4660 +_080F3448: .4byte gSpriteTemplate_83E4660 _080F344C: .4byte gUnknown_083DFEC4 _080F3450: .4byte 0x000087da _080F3454: .4byte 0x000087e4 @@ -247859,7 +247859,7 @@ _080F3AD0: .4byte gUnknown_083DFEC4 _080F3AD4: .4byte 0x0000bc8e _080F3AD8: .4byte 0x0000bc8f _080F3ADC: .4byte 0x0000bc4c -_080F3AE0: .4byte gUnknown_083E476C +_080F3AE0: .4byte gSpriteTemplate_83E476C _080F3AE4: .4byte gUnknown_083E4698 _080F3AE8: lsls r0, r1, 4 @@ -248219,7 +248219,7 @@ _080F3D94: pop {r0} bx r0 .align 2, 0 -_080F3D9C: .4byte gUnknown_083E4800 +_080F3D9C: .4byte gSpriteTemplate_83E4800 _080F3DA0: .4byte gUnknown_083DFEC4 _080F3DA4: .4byte 0x02020004 thumb_func_end sub_80F3D00 @@ -248664,7 +248664,7 @@ _080F40B8: strh r1, [r0, 0x2E] b _080F40F8 .align 2, 0 -_080F40E4: .4byte gUnknown_083E4850 +_080F40E4: .4byte gSpriteTemplate_83E4850 _080F40E8: .4byte 0x00006d98 _080F40EC: .4byte 0x02020004 _080F40F0: @@ -248971,7 +248971,7 @@ _080F4340: .4byte 0x0000d1e4 _080F4344: .4byte 0x001a0500 _080F4348: .4byte gUnknown_083E4868 _080F434C: .4byte 0x02020004 -_080F4350: .4byte gUnknown_083E4878 +_080F4350: .4byte gSpriteTemplate_83E4878 _080F4354: .4byte 0x000003ff _080F4358: .4byte 0xfffffc00 _080F435C: .4byte 0x0000ced4 @@ -259559,7 +259559,7 @@ _080F94E8: pop {r0} bx r0 .align 2, 0 -_080F94F0: .4byte gUnknown_083E5A00 +_080F94F0: .4byte gSpriteTemplate_83E5A00 _080F94F4: .4byte 0x02020004 thumb_func_end sub_80F94A4 @@ -259691,7 +259691,7 @@ _080F9584: b _080F9650 .align 2, 0 _080F95D8: .4byte 0x020388c0 -_080F95DC: .4byte gUnknown_083E59D0 +_080F95DC: .4byte gSpriteTemplate_83E59D0 _080F95E0: .4byte 0x02020004 _080F95E4: .4byte 0x0000ffff _080F95E8: @@ -259758,7 +259758,7 @@ _080F9650: b _080F977A .align 2, 0 _080F9660: .4byte 0x020388c0 -_080F9664: .4byte gUnknown_083E59D0 +_080F9664: .4byte gSpriteTemplate_83E59D0 _080F9668: .4byte 0x02020004 _080F966C: ldrb r0, [r5, 0x1] @@ -259822,7 +259822,7 @@ _080F967C: b _080F9778 .align 2, 0 _080F96E4: .4byte 0x020388c0 -_080F96E8: .4byte gUnknown_083E59E8 +_080F96E8: .4byte gSpriteTemplate_83E59E8 _080F96EC: .4byte 0x02020004 _080F96F0: .4byte 0x0000ffff _080F96F4: @@ -259881,7 +259881,7 @@ _080F96F8: b _080F9778 .align 2, 0 _080F9760: .4byte 0x020388c0 -_080F9764: .4byte gUnknown_083E59E8 +_080F9764: .4byte gSpriteTemplate_83E59E8 _080F9768: .4byte 0x02020004 _080F976C: ldrb r0, [r5, 0x3] @@ -264630,7 +264630,7 @@ sub_80FBB3C: @ 80FBB3C b _080FBBD6 .align 2, 0 _080FBBAC: .4byte gUnknown_083E76E8 -_080FBBB0: .4byte gUnknown_083E76F0 +_080FBBB0: .4byte gSpriteTemplate_83E76F0 _080FBBB4: .4byte 0x020388cc _080FBBB8: .4byte 0xffff0000 _080FBBBC: .4byte sub_80FBAF0 @@ -265722,7 +265722,7 @@ _080FC3E4: str r1, [r0] b _080FC442 .align 2, 0 -_080FC430: .4byte gUnknown_083E7A38 +_080FC430: .4byte gSpriteTemplate_83E7A38 _080FC434: .4byte 0x02020004 _080FC438: .4byte sub_80FC55C _080FC43C: @@ -265869,7 +265869,7 @@ _080FC53C: .align 2, 0 _080FC54C: .4byte gUnknown_083E79D4 _080FC550: .4byte 0x02020004 -_080FC554: .4byte gUnknown_083E7A38 +_080FC554: .4byte gSpriteTemplate_83E7A38 _080FC558: .4byte sub_80FC55C thumb_func_end sub_80FC484 @@ -275328,7 +275328,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 8100D84 _08100DD8: .4byte 0x020391a8 _08100DDC: .4byte 0x02020004 _08100DE0: .4byte 0x03004880 -_08100DE4: .4byte gUnknown_083ECA88 +_08100DE4: .4byte gSpriteTemplate_83ECA88 _08100DE8: .4byte 0x02024ea4 _08100DEC: .4byte SpriteCallbackDummy _08100DF0: @@ -284079,7 +284079,7 @@ _08104EB4: pop {r0} bx r0 .align 2, 0 -_08104F0C: .4byte gUnknown_083ED414 +_08104F0C: .4byte gSpriteTemplate_83ED414 _08104F10: .4byte 0x02020004 _08104F14: .4byte 0x0000ffff thumb_func_end sub_8104EA8 @@ -284251,7 +284251,7 @@ sub_8104FF4: @ 8104FF4 pop {r0} bx r0 .align 2, 0 -_08105060: .4byte gUnknown_083ED42C +_08105060: .4byte gSpriteTemplate_83ED42C _08105064: .4byte 0x02020004 _08105068: .4byte 0x0000ffff thumb_func_end sub_8104FF4 @@ -284326,7 +284326,7 @@ sub_81050C4: @ 81050C4 pop {r0} bx r0 .align 2, 0 -_081050F4: .4byte gUnknown_083ED444 +_081050F4: .4byte gSpriteTemplate_83ED444 _081050F8: .4byte 0x02020004 _081050FC: .4byte gUnknown_083ED704 thumb_func_end sub_81050C4 @@ -284365,7 +284365,7 @@ sub_8105100: @ 8105100 pop {r0} bx r0 .align 2, 0 -_08105140: .4byte gUnknown_083ED45C +_08105140: .4byte gSpriteTemplate_83ED45C _08105144: .4byte 0x02020004 _08105148: .4byte 0x02000000 thumb_func_end sub_8105100 @@ -284520,11 +284520,11 @@ sub_81051C0: @ 81051C0 pop {r0} bx r0 .align 2, 0 -_0810526C: .4byte gUnknown_083ED474 +_0810526C: .4byte gSpriteTemplate_83ED474 _08105270: .4byte 0x02020004 _08105274: .4byte gUnknown_083ED73C _08105278: .4byte 0x02000000 -_0810527C: .4byte gUnknown_083ED48C +_0810527C: .4byte gSpriteTemplate_83ED48C _08105280: .4byte gUnknown_083ED75C thumb_func_end sub_81051C0 @@ -284571,7 +284571,7 @@ sub_8105284: @ 8105284 pop {r0} bx r0 .align 2, 0 -_081052D8: .4byte gUnknown_083ED4A4 +_081052D8: .4byte gSpriteTemplate_83ED4A4 _081052DC: .4byte 0x030024d0 _081052E0: .4byte 0x02020004 _081052E4: .4byte gUnknown_083ED78C @@ -284632,7 +284632,7 @@ _081052F4: bx r0 .align 2, 0 _08105350: .4byte 0x0200004b -_08105354: .4byte gUnknown_083ED4BC +_08105354: .4byte gSpriteTemplate_83ED4BC _08105358: .4byte 0x02020004 thumb_func_end sub_81052EC @@ -284755,7 +284755,7 @@ sub_81053A0: @ 81053A0 pop {r0} bx r0 .align 2, 0 -_0810544C: .4byte gUnknown_083ED4D4 +_0810544C: .4byte gSpriteTemplate_83ED4D4 _08105450: .4byte 0x02020004 _08105454: .4byte gUnknown_083ED7B4 _08105458: .4byte 0x02000000 @@ -284800,7 +284800,7 @@ sub_810545C: @ 810545C pop {r0} bx r0 .align 2, 0 -_081054A8: .4byte gUnknown_083ED4EC +_081054A8: .4byte gSpriteTemplate_83ED4EC _081054AC: .4byte 0x02020004 _081054B0: .4byte gUnknown_083ED7D4 _081054B4: .4byte 0x02000000 @@ -284988,7 +284988,7 @@ sub_8105578: @ 8105578 pop {r0} bx r0 .align 2, 0 -_0810561C: .4byte gUnknown_083ED504 +_0810561C: .4byte gSpriteTemplate_83ED504 _08105620: .4byte 0x02020004 _08105624: .4byte 0x02000000 _08105628: .4byte 0x0000ffff @@ -285172,7 +285172,7 @@ sub_81056F0: @ 81056F0 pop {r0} bx r0 .align 2, 0 -_08105778: .4byte gUnknown_083ED51C +_08105778: .4byte gSpriteTemplate_83ED51C _0810577C: .4byte 0x02020004 _08105780: .4byte 0x02000000 thumb_func_end sub_81056F0 @@ -285311,7 +285311,7 @@ sub_8105854: @ 8105854 pop {r0} bx r0 .align 2, 0 -_08105888: .4byte gUnknown_083ED534 +_08105888: .4byte gSpriteTemplate_83ED534 _0810588C: .4byte 0x02020004 _08105890: .4byte 0x02000000 thumb_func_end sub_8105854 @@ -285408,7 +285408,7 @@ _081058D6: _08105938: .4byte gUnknown_083ECC5A _0810593C: .4byte 0x02000054 _08105940: .4byte 0x030024d0 -_08105944: .4byte gUnknown_083ED54C +_08105944: .4byte gSpriteTemplate_83ED54C _08105948: .4byte 0x02020004 thumb_func_end sub_81058C4 @@ -285531,7 +285531,7 @@ sub_81059E8: @ 81059E8 pop {r0} bx r0 .align 2, 0 -_08105A2C: .4byte gUnknown_083ED564 +_08105A2C: .4byte gSpriteTemplate_83ED564 _08105A30: .4byte 0x02020004 _08105A34: .4byte 0x02000000 thumb_func_end sub_81059E8 @@ -285698,7 +285698,7 @@ sub_8105B1C: @ 8105B1C pop {r1} bx r1 .align 2, 0 -_08105B68: .4byte gUnknown_083ED6CC +_08105B68: .4byte gSpriteTemplate_83ED6CC _08105B6C: .4byte 0x02020004 thumb_func_end sub_8105B1C @@ -294909,9 +294909,9 @@ _0810A0FC: .4byte 0x00000602 _0810A100: .4byte 0x00001f08 _0810A104: .4byte sub_810A134 _0810A108: .4byte 0x03004b20 -_0810A10C: .4byte gUnknown_083F77CC +_0810A10C: .4byte gSpriteTemplate_83F77CC _0810A110: .4byte 0x02020004 -_0810A114: .4byte gUnknown_083F77E4 +_0810A114: .4byte gSpriteTemplate_83F77E4 _0810A118: .4byte gUnknown_083F76B8 thumb_func_end sub_8109E80 @@ -295042,7 +295042,7 @@ _0810A218: .4byte 0x03004b20 _0810A21C: .4byte 0x03001770 _0810A220: .4byte gUnknown_083F76BE _0810A224: .4byte 0x04000040 -_0810A228: .4byte gUnknown_083F77FC +_0810A228: .4byte gSpriteTemplate_83F77FC _0810A22C: .4byte gUnknown_083F76B8 _0810A230: .4byte 0x02020004 _0810A234: .4byte gUnknown_083F778C @@ -296013,11 +296013,11 @@ _0810A9F0: .4byte gUnknown_08E954B0 _0810A9F4: .4byte 0x06003800 _0810A9F8: .4byte sub_810AB54 _0810A9FC: .4byte 0x03004b20 -_0810AA00: .4byte gUnknown_083F7AD8 +_0810AA00: .4byte gSpriteTemplate_83F7AD8 _0810AA04: .4byte 0x02020004 -_0810AA08: .4byte gUnknown_083F7AF0 -_0810AA0C: .4byte gUnknown_083F7B28 -_0810AA10: .4byte gUnknown_083F7B40 +_0810AA08: .4byte gSpriteTemplate_83F7AF0 +_0810AA0C: .4byte gSpriteTemplate_83F7B28 +_0810AA10: .4byte gSpriteTemplate_83F7B40 thumb_func_end Cb2_StartWallClock thumb_func_start Cb2_ViewWallClock @@ -296151,11 +296151,11 @@ _0810AA70: pop {r0} bx r0 .align 2, 0 -_0810AB28: .4byte gUnknown_083F7AD8 +_0810AB28: .4byte gSpriteTemplate_83F7AD8 _0810AB2C: .4byte 0x02020004 -_0810AB30: .4byte gUnknown_083F7AF0 -_0810AB34: .4byte gUnknown_083F7B28 -_0810AB38: .4byte gUnknown_083F7B40 +_0810AB30: .4byte gSpriteTemplate_83F7AF0 +_0810AB34: .4byte gSpriteTemplate_83F7B28 +_0810AB38: .4byte gSpriteTemplate_83F7B40 thumb_func_end Cb2_ViewWallClock thumb_func_start sub_810AB3C @@ -298122,7 +298122,7 @@ sub_810BA50: @ 810BA50 pop {r1} bx r1 .align 2, 0 -_0810BA78: .4byte gUnknown_083F7F84 +_0810BA78: .4byte gSpriteTemplate_83F7F84 thumb_func_end sub_810BA50 thumb_func_start sub_810BA7C @@ -310130,7 +310130,7 @@ _08111720: .4byte gUnknown_083F858C _08111724: .4byte gUnknown_083F8594 _08111728: .4byte 0x02000000 _0811172C: .4byte gRegionMapLocations -_08111730: .4byte gUnknown_083F85A4 +_08111730: .4byte gSpriteTemplate_83F85A4 _08111734: .4byte 0x02020004 thumb_func_end sub_8111658 @@ -310289,7 +310289,7 @@ _08111820: .align 2, 0 _08111868: .4byte 0x02020004 _0811186C: .4byte 0x00000fa8 -_08111870: .4byte gUnknown_083F8674 +_08111870: .4byte gSpriteTemplate_83F8674 _08111874: .4byte 0x000003ff _08111878: .4byte 0xfffffc00 _0811187C: @@ -322134,10 +322134,10 @@ _08117A54: .4byte 0x02000000 _08117A58: .4byte gUnknown_083F9F5C _08117A5C: .4byte 0x0001903c _08117A60: .4byte 0x02020004 -_08117A64: .4byte gUnknown_083FA07C +_08117A64: .4byte gSpriteTemplate_83FA07C _08117A68: .4byte 0x0201903c -_08117A6C: .4byte gUnknown_083F9FD4 -_08117A70: .4byte gUnknown_083FA034 +_08117A6C: .4byte gSpriteTemplate_83F9FD4 +_08117A70: .4byte gSpriteTemplate_83FA034 thumb_func_end sub_8117900 thumb_func_start unref_sub_8117A74 @@ -322389,7 +322389,7 @@ _08117BCC: .align 2, 0 _08117C50: .4byte 0x0201903c _08117C54: .4byte 0x02020004 -_08117C58: .4byte gUnknown_083FA40C +_08117C58: .4byte gSpriteTemplate_83FA40C _08117C5C: .4byte sub_81184CC thumb_func_end sub_8117BBC @@ -322681,7 +322681,7 @@ _08117E84: .4byte gUnknown_083F9EE8 _08117E88: .4byte 0x02000000 _08117E8C: .4byte 0x0001903c _08117E90: .4byte 0x02020004 -_08117E94: .4byte gUnknown_083FA0DC +_08117E94: .4byte gSpriteTemplate_83FA0DC thumb_func_end sub_8117DF4 thumb_func_start sub_8117E98 @@ -322968,13 +322968,13 @@ _081180C8: .4byte 0x02000000 _081180CC: .4byte gUnknown_083FA21C _081180D0: .4byte 0xffff0000 _081180D4: .4byte 0x0000ffff -_081180D8: .4byte gUnknown_083FA2B0 +_081180D8: .4byte gSpriteTemplate_83FA2B0 _081180DC: .4byte 0x02019000 _081180E0: .4byte 0x02020004 -_081180E4: .4byte gUnknown_083FA2C8 -_081180E8: .4byte gUnknown_083FA2E0 -_081180EC: .4byte gUnknown_083FA2F8 -_081180F0: .4byte gUnknown_083FA310 +_081180E4: .4byte gSpriteTemplate_83FA2C8 +_081180E8: .4byte gSpriteTemplate_83FA2E0 +_081180EC: .4byte gSpriteTemplate_83FA2F8 +_081180F0: .4byte gSpriteTemplate_83FA310 thumb_func_end sub_8117F2C thumb_func_start sub_81180F4 @@ -323544,7 +323544,7 @@ sub_81184D8: @ 81184D8 .align 2, 0 _08118544: .4byte gUnknown_083FA42C _08118548: .4byte 0x02000000 -_0811854C: .4byte gUnknown_083FA434 +_0811854C: .4byte gSpriteTemplate_83FA434 _08118550: .4byte 0x02020004 thumb_func_end sub_81184D8 @@ -323624,7 +323624,7 @@ _081185CA: .align 2, 0 _081185DC: .4byte 0x0201903c _081185E0: .4byte 0x02020004 -_081185E4: .4byte gUnknown_083FA40C +_081185E4: .4byte gSpriteTemplate_83FA40C thumb_func_end sub_811857C thumb_func_start sub_81185E8 @@ -325330,8 +325330,8 @@ _081192BE: .align 2, 0 _081193B8: .4byte gUnknown_083FA60E _081193BC: .4byte 0x02019000 -_081193C0: .4byte gUnknown_083FA50C -_081193C4: .4byte gUnknown_083FA5C0 +_081193C0: .4byte gSpriteTemplate_83FA50C +_081193C4: .4byte gSpriteTemplate_83FA5C0 _081193C8: .4byte 0x02020004 _081193CC: .4byte gUnknown_083F8DF4 _081193D0: .4byte 0x0000ffff @@ -325497,10 +325497,10 @@ _081194A2: bx r0 .align 2, 0 _08119514: .4byte gUnknown_083FA616 -_08119518: .4byte gUnknown_083FA524 +_08119518: .4byte gSpriteTemplate_83FA524 _0811951C: .4byte 0x02019000 _08119520: .4byte 0x02020004 -_08119524: .4byte gUnknown_083FA5F0 +_08119524: .4byte gSpriteTemplate_83FA5F0 _08119528: .4byte gUnknown_083F8DF4 thumb_func_end sub_81193D4 @@ -327543,7 +327543,7 @@ _0811A4D6: .align 2, 0 _0811A4E8: .4byte gUnknown_083FB78C _0811A4EC: .4byte gUnknown_083FB79C -_0811A4F0: .4byte gUnknown_083FB774 +_0811A4F0: .4byte gSpriteTemplate_83FB774 _0811A4F4: .4byte 0x0201c800 thumb_func_end sub_811A3CC @@ -329926,7 +329926,7 @@ sub_811B6B4: @ 811B6B4 pop {r1} bx r1 .align 2, 0 -_0811B710: .4byte gUnknown_083FD98C +_0811B710: .4byte gSpriteTemplate_83FD98C _0811B714: .4byte 0x0202ff84 _0811B718: .4byte 0x02020004 _0811B71C: .4byte 0x0000ffff @@ -347352,7 +347352,7 @@ _08124240: .4byte 0x0202e8cc _08124244: .4byte 0x02024ea4 _08124248: .4byte sub_8123D98 _0812424C: .4byte 0x02020004 -_08124250: .4byte gUnknown_08401D40 +_08124250: .4byte gSpriteTemplate_8401D40 _08124254: .4byte 0x02039274 _08124258: ldr r7, _081243EC @@ -347558,10 +347558,10 @@ _081243F0: .4byte 0x02019048 _081243F4: .4byte 0x02024ea4 _081243F8: .4byte sub_8123D98 _081243FC: .4byte 0x02020004 -_08124400: .4byte gUnknown_08401D40 +_08124400: .4byte gSpriteTemplate_8401D40 _08124404: .4byte 0x00000109 _08124408: .4byte 0xfff80000 -_0812440C: .4byte gUnknown_08401D70 +_0812440C: .4byte gSpriteTemplate_8401D70 _08124410: .4byte 0x0202e8cc _08124414: adds r0, r4, 0 @@ -367073,7 +367073,7 @@ _0812D57E: pop {r0} bx r0 .align 2, 0 -_0812D584: .4byte gUnknown_08402500 +_0812D584: .4byte gSpriteTemplate_8402500 thumb_func_end sub_812D4EC thumb_func_start sub_812D588 @@ -372452,7 +372452,7 @@ _0812FF70: bx r0 .align 2, 0 _0812FF88: .4byte 0x02020004 -_0812FF8C: .4byte gUnknown_084028CC +_0812FF8C: .4byte gSpriteTemplate_84028CC _0812FF90: .4byte 0x0000ffff thumb_func_end sub_812FEB8 @@ -372968,7 +372968,7 @@ _0813034A: b _081303C6 .align 2, 0 _08130384: .4byte 0x02020004 -_08130388: .4byte gUnknown_0840294C +_08130388: .4byte gSpriteTemplate_840294C _0813038C: lsls r2, r3, 4 adds r1, r2, r3 @@ -373356,7 +373356,7 @@ _0813066E: _08130674: .4byte 0x03004b20 _08130678: .4byte 0x0202f7c8 _0813067C: .4byte 0x0202f7c9 -_08130680: .4byte gUnknown_084029AC +_08130680: .4byte gSpriteTemplate_84029AC _08130684: .4byte 0x02020004 _08130688: .4byte 0x0000ffe0 _0813068C: .4byte sub_81306A4 @@ -374930,7 +374930,7 @@ _08131254: pop {r0} bx r0 .align 2, 0 -_08131260: .4byte gUnknown_08402500 +_08131260: .4byte gSpriteTemplate_8402500 thumb_func_end sub_81311E4 thumb_func_start sub_8131264 @@ -379272,12 +379272,12 @@ _08133500: pop {r0} bx r0 .align 2, 0 -_0813353C: .4byte gUnknown_08402D90 +_0813353C: .4byte gSpriteTemplate_8402D90 _08133540: .4byte 0x030007b0 _08133544: .4byte 0x02020004 _08133548: .4byte 0x0000ffff -_0813354C: .4byte gUnknown_08402DC0 -_08133550: .4byte gUnknown_08402E08 +_0813354C: .4byte gSpriteTemplate_8402DC0 +_08133550: .4byte gSpriteTemplate_8402E08 _08133554: .4byte 0x00002d9f thumb_func_end sub_8133358 @@ -387015,7 +387015,7 @@ _081371C4: .4byte gUnknown_08406150 _081371C8: .4byte 0x02039304 _081371CC: .4byte gUnknown_08406158 _081371D0: .4byte 0x02020020 -_081371D4: .4byte gUnknown_0840618C +_081371D4: .4byte gSpriteTemplate_840618C _081371D8: .4byte sub_81371DC thumb_func_end sub_8137138 @@ -396464,7 +396464,7 @@ _0813BE94: .4byte 0xffff0000 _0813BE98: .4byte 0x04000016 _0813BE9C: .4byte 0xfffe8000 _0813BEA0: .4byte 0x04000012 -_0813BEA4: .4byte gUnknown_0840AFF0 +_0813BEA4: .4byte gSpriteTemplate_840AFF0 _0813BEA8: .4byte 0x02020004 _0813BEAC: ldr r0, _0813BEDC @@ -397914,7 +397914,7 @@ _0813CA58: .4byte 0x0000011b _0813CA5C: .4byte sub_813E210 _0813CA60: .4byte 0x0203931a _0813CA64: .4byte 0x0000030d -_0813CA68: .4byte gUnknown_0840B1F4 +_0813CA68: .4byte gSpriteTemplate_840B1F4 _0813CA6C: adds r0, 0x3E ldrb r1, [r0] @@ -399466,7 +399466,7 @@ sub_813D584: @ 813D584 ldr r1, _0813D648 b _0813D654 .align 2, 0 -_0813D640: .4byte gUnknown_0840AE20 +_0813D640: .4byte gSpriteTemplate_840AE20 _0813D644: .4byte 0x02020004 _0813D648: .4byte sub_813D208 _0813D64C: @@ -399613,7 +399613,7 @@ _0813D654: bx r1 .align 2, 0 _0813D774: .4byte sub_813D504 -_0813D778: .4byte gUnknown_0840AE20 +_0813D778: .4byte gSpriteTemplate_840AE20 _0813D77C: .4byte 0x02020004 _0813D780: .4byte 0x02020020 _0813D784: .4byte sub_813D158 @@ -399992,11 +399992,11 @@ _0813D9D0: .align 2, 0 _0813DA48: .4byte gUnknown_0840AF50 _0813DA4C: .4byte 0xfffc0000 -_0813DA50: .4byte gUnknown_0840AF94 +_0813DA50: .4byte gSpriteTemplate_840AF94 _0813DA54: .4byte 0x02020004 _0813DA58: .4byte gUnknown_0840AF74 -_0813DA5C: .4byte gUnknown_0840AFAC -_0813DA60: .4byte gUnknown_0840AFC4 +_0813DA5C: .4byte gSpriteTemplate_840AFAC +_0813DA60: .4byte gSpriteTemplate_840AFC4 thumb_func_end sub_813D954 thumb_func_start sub_813DA64 @@ -400619,7 +400619,7 @@ _0813DEC0: strh r0, [r7, 0x3C] b _0813DF42 .align 2, 0 -_0813DEF0: .4byte gUnknown_0840B084 +_0813DEF0: .4byte gSpriteTemplate_840B084 _0813DEF4: adds r0, r7, 0 movs r1, 0x2 @@ -401510,7 +401510,7 @@ _0813E58A: bx r0 .align 2, 0 _0813E5D8: .4byte 0x02020004 -_0813E5DC: .4byte gUnknown_0840B0B0 +_0813E5DC: .4byte gSpriteTemplate_840B0B0 thumb_func_end sub_813E580 thumb_func_start sub_813E5E0 @@ -401761,7 +401761,7 @@ _0813E7A8: bx r0 .align 2, 0 _0813E7B8: .4byte 0x02020004 -_0813E7BC: .4byte gUnknown_0840B0DC +_0813E7BC: .4byte gSpriteTemplate_840B0DC thumb_func_end sub_813E6C0 thumb_func_start sub_813E7C0 @@ -401795,7 +401795,7 @@ _0813E7F2: pop {r0} bx r0 .align 2, 0 -_0813E7F8: .4byte gUnknown_0840B0F4 +_0813E7F8: .4byte gSpriteTemplate_840B0F4 _0813E7FC: .4byte 0x02020004 _0813E800: .4byte 0x0000fff4 thumb_func_end sub_813E7C0 @@ -401998,7 +401998,7 @@ _0813E968: bx r0 .align 2, 0 _0813E978: .4byte 0x02020004 -_0813E97C: .4byte gUnknown_0840B124 +_0813E97C: .4byte gSpriteTemplate_840B124 thumb_func_end sub_813E930 thumb_func_start GetCurrentTrainerHillMapId @@ -402232,7 +402232,7 @@ _0813EB32: bx r0 .align 2, 0 _0813EB40: .4byte 0x02020004 -_0813EB44: .4byte gUnknown_0840B150 +_0813EB44: .4byte gSpriteTemplate_840B150 _0813EB48: .4byte gUnknown_0840B168 thumb_func_end sub_813EA60 @@ -402288,7 +402288,7 @@ _0813EB84: pop {r0} bx r0 .align 2, 0 -_0813EBB0: .4byte gUnknown_0840B170 +_0813EBB0: .4byte gSpriteTemplate_840B170 _0813EBB4: .4byte 0x02020004 _0813EBB8: .4byte gUnknown_0840B188 thumb_func_end sub_813EB4C @@ -402551,7 +402551,7 @@ _0813EDA0: bx r0 .align 2, 0 _0813EDB0: .4byte 0x02020004 -_0813EDB4: .4byte gUnknown_0840B1B0 +_0813EDB4: .4byte gSpriteTemplate_840B1B0 _0813EDB8: .4byte gUnknown_08208344 thumb_func_end sub_813EC90 @@ -402586,7 +402586,7 @@ _0813EDEE: pop {r0} bx r0 .align 2, 0 -_0813EDF4: .4byte gUnknown_0840B1C8 +_0813EDF4: .4byte gSpriteTemplate_840B1C8 _0813EDF8: .4byte 0x02020004 thumb_func_end sub_813EDBC @@ -404241,7 +404241,7 @@ sub_813FA94: @ 813FA94 bx r0 .align 2, 0 _0813FB58: .4byte 0x02024c04 -_0813FB5C: .4byte gUnknown_0820AAB4 +_0813FB5C: .4byte gSpriteTemplate_820AAB4 _0813FB60: .4byte 0x02020004 _0813FB64: .4byte 0x0202f7c9 _0813FB68: .4byte sub_813FD90 @@ -404393,7 +404393,7 @@ _0813FBE0: bx r0 .align 2, 0 _0813FC9C: .4byte 0x02024c04 -_0813FCA0: .4byte gUnknown_0820AAB4 +_0813FCA0: .4byte gSpriteTemplate_820AAB4 _0813FCA4: .4byte 0x02020004 _0813FCA8: .4byte 0x0202f7c9 _0813FCAC: .4byte SpriteCallbackDummy @@ -406092,7 +406092,7 @@ _081409B6: b _081409F6 .align 2, 0 _081409D0: .4byte 0x03004b20 -_081409D4: .4byte gUnknown_0840B3B4 +_081409D4: .4byte gSpriteTemplate_840B3B4 _081409D8: .4byte 0x02020004 _081409DC: .4byte gUnknown_0840B378 _081409E0: .4byte sub_8140A08 @@ -406270,7 +406270,7 @@ _08140AA8: _08140B24: .4byte 0x03004b20 _08140B28: .4byte 0x02020004 _08140B2C: .4byte gUnknown_0840B378 -_08140B30: .4byte gUnknown_0840B3B4 +_08140B30: .4byte gSpriteTemplate_840B3B4 _08140B34: .4byte 0x02020020 _08140B38: .4byte sub_8140ECC thumb_func_end sub_8140A64 @@ -406374,7 +406374,7 @@ _08140B80: _08140BFC: .4byte 0x03004b20 _08140C00: .4byte 0x02020004 _08140C04: .4byte gUnknown_0840B378 -_08140C08: .4byte gUnknown_0840B3B4 +_08140C08: .4byte gSpriteTemplate_840B3B4 _08140C0C: .4byte 0x02020020 _08140C10: .4byte sub_8140ECC thumb_func_end sub_8140B3C @@ -406477,7 +406477,7 @@ _08140C58: _08140CD0: .4byte 0x03004b20 _08140CD4: .4byte 0x02020004 _08140CD8: .4byte gUnknown_0840B378 -_08140CDC: .4byte gUnknown_0840B3B4 +_08140CDC: .4byte gSpriteTemplate_840B3B4 _08140CE0: .4byte 0x02020020 _08140CE4: .4byte sub_8140ECC thumb_func_end sub_8140C14 @@ -406583,7 +406583,7 @@ _08140D2C: _08140DAC: .4byte 0x03004b20 _08140DB0: .4byte 0x02020004 _08140DB4: .4byte gUnknown_0840B378 -_08140DB8: .4byte gUnknown_0840B3B4 +_08140DB8: .4byte gSpriteTemplate_840B3B4 _08140DBC: .4byte 0x02020020 _08140DC0: .4byte sub_8140ECC thumb_func_end sub_8140CE8 @@ -406712,7 +406712,7 @@ _08140EA4: .align 2, 0 _08140EB4: .4byte 0x02020004 _08140EB8: .4byte gUnknown_0840B378 -_08140EBC: .4byte gUnknown_0840B3B4 +_08140EBC: .4byte gSpriteTemplate_840B3B4 _08140EC0: .4byte 0x02020020 _08140EC4: .4byte sub_8140ECC _08140EC8: .4byte 0x03004b20 @@ -406860,7 +406860,7 @@ _08140F68: _08140FE0: .4byte 0x03004b20 _08140FE4: .4byte 0x02020004 _08140FE8: .4byte gUnknown_0840B378 -_08140FEC: .4byte gUnknown_0840B3B4 +_08140FEC: .4byte gSpriteTemplate_840B3B4 _08140FF0: .4byte 0x02020020 _08140FF4: .4byte sub_8140FF8 thumb_func_end sub_8140F24 @@ -407003,7 +407003,7 @@ _081410A6: .align 2, 0 _08141104: .4byte 0x03004b20 _08141108: .4byte gUnknown_0840B378 -_0814110C: .4byte gUnknown_0840B3B4 +_0814110C: .4byte gSpriteTemplate_840B3B4 _08141110: .4byte 0x02020004 _08141114: .4byte 0x02020020 _08141118: .4byte sub_8140ECC @@ -407139,7 +407139,7 @@ _081411A8: _08141218: .4byte 0x03004b20 _0814121C: .4byte 0x02020004 _08141220: .4byte gUnknown_0840B378 -_08141224: .4byte gUnknown_0840B3B4 +_08141224: .4byte gSpriteTemplate_840B3B4 _08141228: .4byte 0x02020020 _0814122C: .4byte sub_8141230 thumb_func_end sub_8141164 @@ -408115,7 +408115,7 @@ _081419A0: adds r1, 0x4 b _081419F4 .align 2, 0 -_081419CC: .4byte gUnknown_08402500 +_081419CC: .4byte gSpriteTemplate_8402500 _081419D0: .4byte 0x02020004 _081419D4: ldr r0, _08141A2C @@ -408163,7 +408163,7 @@ _08141A02: adds r4, r2, 0 b _08141A8C .align 2, 0 -_08141A2C: .4byte gUnknown_08402500 +_08141A2C: .4byte gSpriteTemplate_8402500 _08141A30: .4byte 0x02020004 _08141A34: .4byte 0x000003ff _08141A38: .4byte 0xfffffc00 @@ -412064,7 +412064,7 @@ sub_81438C4: @ 81438C4 movs r0, 0 b _0814393E .align 2, 0 -_08143934: .4byte gUnknown_0840B7A4 +_08143934: .4byte gSpriteTemplate_840B7A4 _08143938: .4byte 0x02020004 _0814393C: movs r0, 0x1 @@ -415920,7 +415920,7 @@ _081457F8: .4byte 0x0000ffff _081457FC: .4byte 0x02024e8c _08145800: .4byte 0x02020004 _08145804: .4byte sub_81454E0 -_08145808: .4byte gUnknown_0840CAEC +_08145808: .4byte gSpriteTemplate_840CAEC thumb_func_end sub_81456B4 thumb_func_start sub_814580C @@ -420987,7 +420987,7 @@ sub_814817C: @ 814817C pop {r1} bx r1 .align 2, 0 -_081481A4: .4byte gUnknown_084121E4 +_081481A4: .4byte gSpriteTemplate_84121E4 _081481A8: .4byte 0x02020004 _081481AC: .4byte 0x0000fff4 thumb_func_end sub_814817C @@ -422920,7 +422920,7 @@ _0814922A: bx r0 .align 2, 0 _0814923C: .4byte 0x02020004 -_08149240: .4byte gUnknown_08416B3C +_08149240: .4byte gSpriteTemplate_8416B3C _08149244: .4byte 0x0202000c thumb_func_end sub_8149174 @@ -423071,8 +423071,8 @@ sub_8149310: @ 8149310 pop {r1} bx r1 .align 2, 0 -_0814935C: .4byte gUnknown_08416CDC -_08149360: .4byte gUnknown_08416D2C +_0814935C: .4byte gSpriteTemplate_8416CDC +_08149360: .4byte gSpriteTemplate_8416D2C _08149364: .4byte 0x02020004 thumb_func_end sub_8149310 @@ -423114,8 +423114,8 @@ sub_8149368: @ 8149368 pop {r1} bx r1 .align 2, 0 -_081493B4: .4byte gUnknown_08416CF4 -_081493B8: .4byte gUnknown_08416D44 +_081493B4: .4byte gSpriteTemplate_8416CF4 +_081493B8: .4byte gSpriteTemplate_8416D44 _081493BC: .4byte 0x02020004 thumb_func_end sub_8149368 @@ -423229,7 +423229,7 @@ sub_8149424: @ 8149424 pop {r1} bx r1 .align 2, 0 -_08149490: .4byte gUnknown_08416D7C +_08149490: .4byte gSpriteTemplate_8416D7C _08149494: .4byte 0xffe00000 _08149498: .4byte 0x02020004 _0814949C: .4byte sub_81493C4 @@ -423288,7 +423288,7 @@ sapphire_sub_81494A0: @ 81494A0 pop {r1} bx r1 .align 2, 0 -_0814950C: .4byte gUnknown_08416D94 +_0814950C: .4byte gSpriteTemplate_8416D94 _08149510: .4byte 0xffe00000 _08149514: .4byte 0x02020004 _08149518: .4byte sub_81493C4 @@ -423474,7 +423474,7 @@ _0814965E: pop {r0} bx r0 .align 2, 0 -_08149664: .4byte gUnknown_08416EB8 +_08149664: .4byte gSpriteTemplate_8416EB8 _08149668: .4byte 0x02020004 _0814966C: .4byte sub_8149558 thumb_func_end sub_8149614 @@ -423587,7 +423587,7 @@ _0814973A: pop {r0} bx r0 .align 2, 0 -_08149740: .4byte gUnknown_08416EB8 +_08149740: .4byte gSpriteTemplate_8416EB8 _08149744: .4byte 0x02020004 _08149748: .4byte sub_8149670 thumb_func_end sub_81496E4 @@ -423680,7 +423680,7 @@ _081497EA: pop {r0} bx r0 .align 2, 0 -_081497F0: .4byte gUnknown_08416EB8 +_081497F0: .4byte gSpriteTemplate_8416EB8 _081497F4: .4byte 0x02020004 _081497F8: .4byte sub_814974C thumb_func_end sub_8149794 @@ -423858,7 +423858,7 @@ _0814993C: pop {r0} bx r0 .align 2, 0 -_08149948: .4byte gUnknown_08416EB8 +_08149948: .4byte gSpriteTemplate_8416EB8 _0814994C: .4byte 0x02020004 _08149950: .4byte sub_81497FC thumb_func_end sub_81498CC @@ -425618,7 +425618,7 @@ _0814A684: .4byte 0x0203a360 _0814A688: .4byte gUnknown_0842F240 _0814A68C: .4byte 0x0000fff0 _0814A690: .4byte gUnknown_0842F140 -_0814A694: .4byte gUnknown_0842F250 +_0814A694: .4byte gSpriteTemplate_842F250 _0814A698: .4byte 0x02020004 _0814A69C: adds r0, r6, 0 @@ -426451,7 +426451,7 @@ _0814AD00: .4byte 0x0203a360 _0814AD04: .4byte gUnknown_0842F248 _0814AD08: .4byte 0x0000fff1 _0814AD0C: .4byte gUnknown_0842F1C0 -_0814AD10: .4byte gUnknown_0842F298 +_0814AD10: .4byte gSpriteTemplate_842F298 _0814AD14: .4byte 0x02020004 _0814AD18: adds r0, r5, 0 diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index 40a302370..aacd440e7 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -11153,7 +11153,7 @@ sub_8079F44: @ 8079F44 b _0807A02E .align 2, 0 _08079FE0: .4byte gUnknown_0837F5E0 -_08079FE4: .4byte gUnknown_0837F5B0 +_08079FE4: .4byte gSpriteTemplate_837F5B0 _08079FE8: .4byte gMonFrontPicTable _08079FEC: .4byte gUnknown_081E7C74 _08079FF0: @@ -11221,7 +11221,7 @@ _0807A06C: .4byte gUnknown_081E9114 _0807A070: .4byte 0x06010000 _0807A074: .4byte 0x040000d4 _0807A078: .4byte 0x84000200 -_0807A07C: .4byte gUnknown_0837F5B0 +_0807A07C: .4byte gSpriteTemplate_837F5B0 _0807A080: .4byte gUnknown_081E7C74 _0807A084: lsls r0, r7, 1 @@ -11271,7 +11271,7 @@ _0807A0D0: pop {r1} bx r1 .align 2, 0 -_0807A0E4: .4byte gUnknown_0837F5B0 +_0807A0E4: .4byte gSpriteTemplate_837F5B0 _0807A0E8: .4byte gUnknown_081E9114 _0807A0EC: .4byte 0x02020004 _0807A0F0: .4byte gUnknown_081E7C18 |