diff options
-rw-r--r-- | baserom.ips | bin | 467680 -> 465227 bytes | |||
-rw-r--r-- | data/mon_markings.s | 172 | ||||
-rw-r--r-- | graphics/misc/mon_markings.png | bin | 0 -> 502 bytes |
3 files changed, 156 insertions, 16 deletions
diff --git a/baserom.ips b/baserom.ips Binary files differindex 075641a83..41093030b 100644 --- a/baserom.ips +++ b/baserom.ips diff --git a/data/mon_markings.s b/data/mon_markings.s index ff9529e50..d2e211f95 100644 --- a/data/mon_markings.s +++ b/data/mon_markings.s @@ -6,26 +6,166 @@ .section .rodata .align 2 -gUnknown_83EE008:: @ 83EE008 - .incbin "baserom.gba", 0x3EE008, 0x20 +gUnknown_83EE008:: @ 83EE008 gbapal + .incbin "graphics/misc/mon_markings.gbapal" -gUnknown_83EE028:: @ 83EE028 - .incbin "baserom.gba", 0x3EE028, 0x808 +gUnknown_83EE028:: @ 83EE028 4bpp + .incbin "graphics/misc/mon_markings.4bpp" -gUnknown_83EE830:: @ 83EE830 - .incbin "baserom.gba", 0x3EE830, 0x8 +gUnknown_83EE828:: @ 83EE828 + .4byte 0x02135009, 0x000000ff -gUnknown_83EE838:: @ 83EE838 - .incbin "baserom.gba", 0x3EE838, 0x58 +gUnknown_83EE830:: @ 83EE830 oamdata + .4byte 0xc0000000, 0x00000000 -gUnknown_83EE890:: @ 83EE890 - .incbin "baserom.gba", 0x3EE890, 0x38 +gUnknown_83EE838:: @ 83EE838 oamdata + .4byte 0x00000000, 0x00000000 -gUnknown_83EE8C8:: @ 83EE8C8 - .incbin "baserom.gba", 0x3EE8C8, 0x8 +gAnimCmd_83EE840:: + obj_image_anim_frame 0x0, 5 + obj_image_anim_end -gUnknown_83EE8D0:: @ 83EE8D0 - .incbin "baserom.gba", 0x3EE8D0, 0x88 +gAnimCmd_83EE848:: + obj_image_anim_frame 0x1, 5 + obj_image_anim_end -gUnknown_83EE958:: @ 83EE958 - .incbin "baserom.gba", 0x3EE958, 0x40 +gAnimCmd_83EE850:: + obj_image_anim_frame 0x2, 5 + obj_image_anim_end + +gAnimCmd_83EE858:: + obj_image_anim_frame 0x3, 5 + obj_image_anim_end + +gAnimCmd_83EE860:: + obj_image_anim_frame 0x4, 5 + obj_image_anim_end + +gAnimCmd_83EE868:: + obj_image_anim_frame 0x5, 5 + obj_image_anim_end + +gAnimCmd_83EE870:: + obj_image_anim_frame 0x6, 5 + obj_image_anim_end + +gAnimCmd_83EE878:: + obj_image_anim_frame 0x7, 5 + obj_image_anim_end + +gAnimCmd_83EE880:: + obj_image_anim_frame 0x8, 5 + obj_image_anim_end + +gAnimCmd_83EE888:: + obj_image_anim_frame 0x9, 5 + obj_image_anim_end + +gUnknown_83EE890:: @ 83EE890 animcmd + .4byte gAnimCmd_83EE840 + .4byte gAnimCmd_83EE848 + .4byte gAnimCmd_83EE850 + .4byte gAnimCmd_83EE858 + .4byte gAnimCmd_83EE860 + .4byte gAnimCmd_83EE868 + .4byte gAnimCmd_83EE870 + .4byte gAnimCmd_83EE878 + .4byte gAnimCmd_83EE880 + .4byte gAnimCmd_83EE888 + +gAnimCmd_83EE8B8:: + obj_image_anim_frame 0x0, 5 + obj_image_anim_end + +gAnimCmd_83EE8C0:: + obj_image_anim_frame 0x40, 5 + obj_image_anim_end + +gUnknown_83EE8C8:: @ 83EE8C8 animcmd + .4byte gAnimCmd_83EE8B8 + .4byte gAnimCmd_83EE8C0 + +gUnknown_83EE8D0:: @ 83EE8D0 oamdata + .4byte 0x40004000, 0x00000000 + +gAnimCmd_83EE8D8:: + obj_image_anim_frame 0x0, 5 + obj_image_anim_end + +gAnimCmd_83EE8E0:: + obj_image_anim_frame 0x4, 5 + obj_image_anim_end + +gAnimCmd_83EE8E8:: + obj_image_anim_frame 0x8, 5 + obj_image_anim_end + +gAnimCmd_83EE8F0:: + obj_image_anim_frame 0xc, 5 + obj_image_anim_end + +gAnimCmd_83EE8F8:: + obj_image_anim_frame 0x10, 5 + obj_image_anim_end + +gAnimCmd_83EE900:: + obj_image_anim_frame 0x14, 5 + obj_image_anim_end + +gAnimCmd_83EE908:: + obj_image_anim_frame 0x18, 5 + obj_image_anim_end + +gAnimCmd_83EE910:: + obj_image_anim_frame 0x1c, 5 + obj_image_anim_end + +gAnimCmd_83EE918:: + obj_image_anim_frame 0x20, 5 + obj_image_anim_end + +gAnimCmd_83EE920:: + obj_image_anim_frame 0x24, 5 + obj_image_anim_end + +gAnimCmd_83EE928:: + obj_image_anim_frame 0x28, 5 + obj_image_anim_end + +gAnimCmd_83EE930:: + obj_image_anim_frame 0x2c, 5 + obj_image_anim_end + +gAnimCmd_83EE938:: + obj_image_anim_frame 0x30, 5 + obj_image_anim_end + +gAnimCmd_83EE940:: + obj_image_anim_frame 0x34, 5 + obj_image_anim_end + +gAnimCmd_83EE948:: + obj_image_anim_frame 0x38, 5 + obj_image_anim_end + +gAnimCmd_83EE950:: + obj_image_anim_frame 0x3c, 5 + obj_image_anim_end + +gUnknown_83EE958:: @ 83EE958 animcmd + .4byte gAnimCmd_83EE8D8 + .4byte gAnimCmd_83EE8E0 + .4byte gAnimCmd_83EE8E8 + .4byte gAnimCmd_83EE8F0 + .4byte gAnimCmd_83EE8F8 + .4byte gAnimCmd_83EE900 + .4byte gAnimCmd_83EE908 + .4byte gAnimCmd_83EE910 + .4byte gAnimCmd_83EE918 + .4byte gAnimCmd_83EE920 + .4byte gAnimCmd_83EE928 + .4byte gAnimCmd_83EE930 + .4byte gAnimCmd_83EE938 + .4byte gAnimCmd_83EE940 + .4byte gAnimCmd_83EE948 + .4byte gAnimCmd_83EE950 diff --git a/graphics/misc/mon_markings.png b/graphics/misc/mon_markings.png Binary files differnew file mode 100644 index 000000000..048b02280 --- /dev/null +++ b/graphics/misc/mon_markings.png |