diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-18 12:53:31 -0500 |
| commit | c6ff1a6ce39cb67c6de21f2e4938ea62c97ee7e5 (patch) | |
| tree | 47e2f5eaa84c3cc97b96bdf06170136abe446d81 /data/field_effect_helpers.s | |
| parent | 3c2b1731eeb7037a1b681444b1c126fc239a904e (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'data/field_effect_helpers.s')
| -rw-r--r-- | data/field_effect_helpers.s | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s index 97086af0d..6d0b0b3bb 100644 --- a/data/field_effect_helpers.s +++ b/data/field_effect_helpers.s @@ -7,19 +7,23 @@ gUnknown_085CDC38:: @ 85CDC38 .incbin "baserom.gba", 0x5cdc38, 0x6 gUnknown_085CDC3E:: @ 85CDC3E - .incbin "baserom.gba", 0x5cdc3e, 0x4 + .byte 0x00, 0x01, 0x02, 0x03 gUnknown_085CDC42:: @ 85CDC42 - .incbin "baserom.gba", 0x5cdc42, 0xa + .2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000 gUnknown_085CDC4C:: @ 85CDC4C - .incbin "baserom.gba", 0x5cdc4c, 0x8 + .4byte sub_8154C7C + .4byte sub_8154CA0 gUnknown_085CDC54:: @ 85CDC54 - .incbin "baserom.gba", 0x5cdc54, 0xc + .4byte sub_815547C + .4byte sub_81554AC + .4byte sub_815550C gUnknown_085CDC60:: @ 85CDC60 .incbin "baserom.gba", 0x5cdc60, 0xa gUnknown_085CDC6A:: @ 85CDC6A .incbin "baserom.gba", 0x5cdc6a, 0x96 + |