diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros.s | 5 | ||||
| -rw-r--r-- | asm/rom5.s | 24 |
2 files changed, 15 insertions, 14 deletions
diff --git a/asm/macros.s b/asm/macros.s index 8058ed6d7..11774b301 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -95,9 +95,10 @@ .4byte 0 @ padding .endm - .macro obj_rot_scal_anim_end + .macro obj_rot_scal_anim_end unknown=0 .2byte 0x7fff - .fill 6 @ padding + .2byte \unknown + .fill 4 @ padding .endm .macro credits_entry number, text diff --git a/asm/rom5.s b/asm/rom5.s index 10777250d..eded47fc5 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -171225,8 +171225,8 @@ _080CE5F6: .align 2, 0 _080CE608: .4byte 0x0202f388 _080CE60C: .4byte 0x02020004 -_080CE610: .4byte gUnknown_083D6FC8 -_080CE614: .4byte gUnknown_083D6FF8 +_080CE610: .4byte gBattleAnimSpriteTemplate_83D6FC8 +_080CE614: .4byte gBattleAnimSpriteTemplate_83D6FF8 _080CE618: ldrh r0, [r4, 0xA] adds r0, 0x1 @@ -183959,7 +183959,7 @@ _080D4866: bx r0 .align 2, 0 _080D486C: .4byte 0x03004b20 -_080D4870: .4byte gUnknown_083DB4D8 +_080D4870: .4byte gBattleAnimSpriteTemplate_83DB4D8 _080D4874: .4byte 0x02020004 _080D4878: .4byte sub_80D487C thumb_func_end sub_80D47D0 @@ -188447,7 +188447,7 @@ sub_80D6A6C: @ 80D6A6C bx r0 .align 2, 0 _080D6AD4: .4byte 0x03004b00 -_080D6AD8: .4byte gUnknown_083D9950 +_080D6AD8: .4byte gBattleAnimSpriteTemplate_83D9950 _080D6ADC: .4byte 0x02020004 _080D6AE0: .4byte 0x000003ff _080D6AE4: .4byte 0xfffffc00 @@ -190012,7 +190012,7 @@ _080D7698: movs r0, 0 b _080D76BE .align 2, 0 -_080D76B0: .4byte gUnknown_083D97D0 +_080D76B0: .4byte gBattleAnimSpriteTemplate_83D97D0 _080D76B4: .4byte 0x02020004 _080D76B8: .4byte sub_80D76C4 _080D76BC: @@ -192947,7 +192947,7 @@ _080D8DAA: bl DestroySprite b _080D8DF6 .align 2, 0 -_080D8DBC: .4byte gUnknown_083D9C78 +_080D8DBC: .4byte gBattleAnimSpriteTemplate_83D9C78 _080D8DC0: .4byte 0x02020004 _080D8DC4: .4byte sub_80D8E00 _080D8DC8: @@ -193544,7 +193544,7 @@ _080D9250: _080D9260: .4byte 0x0202f7c9 _080D9264: .4byte 0x02024a72 _080D9268: .4byte 0xfff00000 -_080D926C: .4byte gUnknown_083DB4A8 +_080D926C: .4byte gBattleAnimSpriteTemplate_83DB4A8 _080D9270: .4byte 0x02020004 _080D9274: .4byte SpriteCallbackDummy _080D9278: .4byte sub_80D927C @@ -197593,7 +197593,7 @@ _080DB176: _080DB180: .4byte 0x03004b20 _080DB184: .4byte 0x0202f7b2 _080DB188: .4byte 0x03004b00 -_080DB18C: .4byte gUnknown_083DB538 +_080DB18C: .4byte gBattleAnimSpriteTemplate_83DB538 _080DB190: .4byte 0x0202f7c9 thumb_func_end sub_80DB0E8 @@ -366527,7 +366527,7 @@ _0812D150: strh r4, [r6, 0x8] b _0812D246 .align 2, 0 -_0812D168: .4byte gUnknown_083D7220 +_0812D168: .4byte gBattleAnimSpriteTemplate_83D7220 _0812D16C: .4byte 0x02020004 _0812D170: .4byte SpriteCallbackDummy _0812D174: .4byte gUnknown_08402400 @@ -366631,7 +366631,7 @@ _0812D222: b _0812D246 .align 2, 0 _0812D22C: .4byte 0x02020004 -_0812D230: .4byte gUnknown_083D7220 +_0812D230: .4byte gBattleAnimSpriteTemplate_83D7220 _0812D234: .4byte sub_812D254 _0812D238: movs r1, 0x14 @@ -368369,7 +368369,7 @@ _0812DED6: .align 2, 0 _0812DFD0: .4byte 0x0202f7c8 _0812DFD4: .4byte 0x03004b00 -_0812DFD8: .4byte gUnknown_084025EC +_0812DFD8: .4byte gBattleAnimSpriteTemplate_84025EC _0812DFDC: .4byte 0x02020004 _0812DFE0: .4byte 0x0000ffff _0812DFE4: .4byte sub_812E0F8 @@ -408092,7 +408092,7 @@ _08141966: b _08141A02 .align 2, 0 _08141998: .4byte 0x02017840 -_0814199C: .4byte gUnknown_084024E8 +_0814199C: .4byte gBattleAnimSpriteTemplate_84024E8 _081419A0: cmp r0, 0 blt _081419D4 |