diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-08-04 15:23:09 -0700 |
| commit | ed90bf2430290853bd9376d53c70055fa07634be (patch) | |
| tree | 39f67b5cbd0c0ef9e1a4763a052fd07924349940 /data/field_map_obj.s | |
| parent | bbc7c6ccfc7d59f61f406849f752fdd5038a6a80 (diff) | |
| parent | d58bf398b2b83a326d23d14d531de7f45a1058bb (diff) | |
Merge branch 'master' into pokedex_2
Diffstat (limited to 'data/field_map_obj.s')
| -rw-r--r-- | data/field_map_obj.s | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/data/field_map_obj.s b/data/field_map_obj.s index d12de7aa9..72d20cd4e 100644 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -31,7 +31,13 @@ gUnknown_83A0010:: @ 83A0010 .incbin "baserom.gba", 0x3A0010, 0x3688 gUnknown_83A3698:: @ 83A3698 - .incbin "baserom.gba", 0x3A3698, 0x1AC0 + .incbin "baserom.gba", 0x3A3698, 0x80 + +gEventObjectBaseOam_32x32:: @ 83A3718 + .incbin "baserom.gba", 0x3A3718, 0x8 + +gUnknown_83A3720:: @ 83A3720 + .incbin "baserom.gba", 0x3A3720, 0x1a38 gUnknown_83A5158:: @ 83A5158 .incbin "baserom.gba", 0x3A5158, 0xB0 |