diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-21 09:04:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-21 09:04:10 -0500 |
| commit | 1234d0252cbe2b0001784b10b75f0d339824632d (patch) | |
| tree | 04bd826b0a6313c2223b907956581d661d602066 /data/field_map_obj.s | |
| parent | 1849ad778d5a94edc076ce5ecf7aec97aa8db4fa (diff) | |
| parent | a1b21100524b01231c3e571621bb36ae25a20e2e (diff) | |
Merge pull request #161 from PikalaxALT/dism_more_data
Evolution Scene and other data dism
Diffstat (limited to 'data/field_map_obj.s')
| -rw-r--r-- | data/field_map_obj.s | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/data/field_map_obj.s b/data/field_map_obj.s index e4fe9ceca..19f0fac9f 100644 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -3,19 +3,24 @@ .section .rodata .align 2 gUnknown_835B934:: @ 835B934 - .incbin "baserom.gba", 0x35B934, 0x10 + .byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00 gUnknown_835B944:: @ 835B944 - .incbin "baserom.gba", 0x35B944, 0x18 + spr_template 0, 65535, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject gUnknown_835B95C:: @ 835B95C - .incbin "baserom.gba", 0x35B95C, 0xC + .4byte CameraObject_0 + .4byte CameraObject_1 + .4byte CameraObject_2 gUnknown_835B968:: @ 835B968 .incbin "graphics/map_objects/0.gbapal" gUnknown_835B988:: - .incbin "baserom.gba", 0x35B988, 0x1E0 + .incbin "graphics/map_objects/unk_835B988.gbapal" + +gUnknown_835B9A0:: + .space 0x1C0 gUnknown_835BB68:: @ 835BB68 .incbin "graphics/map_objects/000.4bpp" |