diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-19 20:09:28 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-19 20:09:28 +0100 |
| commit | 37a6e1b6c7173e38b69bffab3e1a7a8cb323d36d (patch) | |
| tree | 22cad9a80d8fc5e10c44af3a6cd50db357d7fcc5 /data/field_effect_helpers.s | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
| parent | deec6f21db44e7f095154e02ae4a9f5d8c42fe75 (diff) | |
Merge branch 'master' of https://github.com/itskobold/pokeemerald into kobold_fixes
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 + |