diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-10 14:01:09 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-10 14:01:09 -0700 |
| commit | 70cfe31a677da53d183f4c6a98db25d7aac78181 (patch) | |
| tree | 4036987ed6fad1f9da87fae9048a0e76c975d4c8 /asm | |
| parent | 515615d8abf4394f9774085d43a0fe7cb30b15e2 (diff) | |
door animation graphics
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros.s | 13 | ||||
| -rw-r--r-- | asm/rom4.s | 12 |
2 files changed, 19 insertions, 6 deletions
diff --git a/asm/macros.s b/asm/macros.s index 301053010..83a9aa44c 100644 --- a/asm/macros.s +++ b/asm/macros.s @@ -120,3 +120,16 @@ .4byte \number .4byte \text .endm + + .macro door_anim_frame unknown, offset + .byte \unknown + .byte 0 @ padding + .2byte \offset + .endm + + .macro door_anim_gfx metatile_num, unknown, tile_addr, palette_addr + .2byte \metatile_num + .2byte \unknown + .4byte \tile_addr + .4byte \palette_addr + .endm diff --git a/asm/rom4.s b/asm/rom4.s index 17b1d199f..b46245343 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -12778,7 +12778,7 @@ unref_sub_805869C: @ 805869C pop {r0} bx r0 .align 2, 0 -_080586B0: .4byte gUnknown_0830F9B4 +_080586B0: .4byte gDoorAnimGraphicsTable thumb_func_end unref_sub_805869C thumb_func_start sub_80586B4 @@ -12802,7 +12802,7 @@ _080586D6: pop {r0} bx r0 .align 2, 0 -_080586DC: .4byte gUnknown_0830F9B4 +_080586DC: .4byte gDoorAnimGraphicsTable thumb_func_end sub_80586B4 thumb_func_start sub_80586E0 @@ -12826,7 +12826,7 @@ _08058702: pop {r0} bx r0 .align 2, 0 -_08058708: .4byte gUnknown_0830F9B4 +_08058708: .4byte gDoorAnimGraphicsTable thumb_func_end sub_80586E0 thumb_func_start sub_805870C @@ -12849,7 +12849,7 @@ sub_805870C: @ 805870C asrs r0, 24 b _0805873C .align 2, 0 -_08058734: .4byte gUnknown_0830F9B4 +_08058734: .4byte gDoorAnimGraphicsTable _08058738: movs r0, 0x1 negs r0, r0 @@ -12879,7 +12879,7 @@ task_overworld_door_add_if_role_69_for_opening_door_at: @ 8058744 asrs r0, 24 b _08058774 .align 2, 0 -_0805876C: .4byte gUnknown_0830F9B4 +_0805876C: .4byte gDoorAnimGraphicsTable _08058770: movs r0, 0x1 negs r0, r0 @@ -12916,7 +12916,7 @@ sub_8058790: @ 8058790 movs r0, 0x12 b _080587AE .align 2, 0 -_080587A8: .4byte gUnknown_0830F9B4 +_080587A8: .4byte gDoorAnimGraphicsTable _080587AC: movs r0, 0x8 _080587AE: |