diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:41:25 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-15 12:41:25 +0000 |
| commit | 2acab81713aac51f96a50dc42a67ec7761901aa4 (patch) | |
| tree | c39251dc3e6eb2f7cc884cbe4953b8c34dce8423 /data/field_effect_helpers.s | |
| parent | e373cf4bb9217eb5e4edba08c7cb95ecc895b821 (diff) | |
| parent | 72b57b342eaf6e4a3ea77fae8b40e4ab11c64ae2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
also started fixing pointers in my dumps
Diffstat (limited to 'data/field_effect_helpers.s')
| -rw-r--r-- | data/field_effect_helpers.s | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s index 015318e5a..6d0b0b3bb 100644 --- a/data/field_effect_helpers.s +++ b/data/field_effect_helpers.s @@ -7,23 +7,19 @@ gUnknown_085CDC38:: @ 85CDC38 .incbin "baserom.gba", 0x5cdc38, 0x6 gUnknown_085CDC3E:: @ 85CDC3E -@ replacing .incbin "baserom.gba", 0x005cdc3e, 0x4 -.byte 0x00, 0x01, 0x02, 0x03 + .byte 0x00, 0x01, 0x02, 0x03 gUnknown_085CDC42:: @ 85CDC42 -@ replacing .incbin "baserom.gba", 0x005cdc42, 0xa -.2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000 + .2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000 gUnknown_085CDC4C:: @ 85CDC4C -@ replacing .incbin "baserom.gba", 0x005cdc4c, 0x8 -.4byte sub_8154C7C -.4byte sub_8154CA0 + .4byte sub_8154C7C + .4byte sub_8154CA0 gUnknown_085CDC54:: @ 85CDC54 -@ replacing .incbin "baserom.gba", 0x005cdc54, 0xc -.4byte sub_815547C -.4byte sub_81554AC -.4byte sub_815550C + .4byte sub_815547C + .4byte sub_81554AC + .4byte sub_815550C gUnknown_085CDC60:: @ 85CDC60 .incbin "baserom.gba", 0x5cdc60, 0xa |