diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-21 12:46:19 +0100 |
| commit | ad2ef517bd702c352d7a4d5b64db0e99f04721c2 (patch) | |
| tree | 540ef4c700ee35c2b177e219a9c0092a3a9aa29c /data/menu_helpers.s | |
| parent | 77352c7ee480fe3127692ce50a6bdd019de87291 (diff) | |
| parent | 8a60952fc01ada92e029be488481a29da32f47eb (diff) | |
option menu fix conflicts
Diffstat (limited to 'data/menu_helpers.s')
| -rw-r--r-- | data/menu_helpers.s | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/data/menu_helpers.s b/data/menu_helpers.s index 8d0e12939..25ca66485 100644 --- a/data/menu_helpers.s +++ b/data/menu_helpers.s @@ -4,11 +4,34 @@ .section .rodata .align 2, 0 +gUnknown_0859F4E8:: @ 859F4E8 + .2byte 0x00 + .2byte 0x4000 + .2byte 0x00 + .2byte 0x00 + +gUnknown_0859F4F0:: @ 859F4F0 + obj_image_anim_frame 0x00, 0x00 + obj_image_anim_end + +gUnknown_0859F4F8:: @ 859F4F8 + obj_image_anim_frame 0x04, 0x00 + obj_image_anim_end + +gUnknown_0859F500:: @ 859F500 + obj_image_anim_frame 0x00, 0x40 + obj_image_anim_end + +gUnknown_0859F508:: @ 859F508 + .4byte gUnknown_0859F4F0 + .4byte gUnknown_0859F4F8 + .4byte gUnknown_0859F500 + gUnknown_0859F514:: @ 859F514 - .incbin "baserom.gba", 0x59f514, 0x8 + .4byte gBagSwapLineGfx, 0x6D0100 gUnknown_0859F51C:: @ 859F51C - .incbin "baserom.gba", 0x59f51c, 0x8 + .4byte gBagSwapLinePal, 0x6D gUnknown_0859F524:: @ 859F524 - .incbin "baserom.gba", 0x59f524, 0x18 + spr_template 0x6D, 0x6D, gUnknown_0859F4E8, gUnknown_0859F508, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy |