From 35ee9f67c0d89d73c7ef4c8d272dca767ceeb7c4 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 9 Oct 2018 17:32:39 -0400 Subject: ported some of field_effect_helpers --- data/field_effect_helpers.s | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s index 63fc1580e..a1edac00c 100644 --- a/data/field_effect_helpers.s +++ b/data/field_effect_helpers.s @@ -2,15 +2,8 @@ .include "constants/constants.inc" .section .rodata - -gUnknown_085CDC38:: @ 85CDC38 - .2byte 12, 28, 44 - -gUnknown_085CDC3E:: @ 85CDC3E - .byte 0x00, 0x01, 0x02, 0x03 - -gUnknown_085CDC42:: @ 85CDC42 - .2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000 + + .align 2 gUnknown_085CDC4C:: @ 85CDC4C .4byte sub_8154C7C -- cgit v1.2.3 From 803c2388ce23efebab04c86c6d58dc2d24a49dd2 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 10 Oct 2018 12:02:02 -0400 Subject: finish porting field_effect_helpers --- data/field_effect_helpers.s | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'data') diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s index a1edac00c..e49592659 100644 --- a/data/field_effect_helpers.s +++ b/data/field_effect_helpers.s @@ -3,23 +3,9 @@ .section .rodata - .align 2 - -gUnknown_085CDC4C:: @ 85CDC4C - .4byte sub_8154C7C - .4byte sub_8154CA0 - -gUnknown_085CDC54:: @ 85CDC54 - .4byte sub_815547C - .4byte sub_81554AC - .4byte sub_815550C - -gUnknown_085CDC60:: @ 85CDC60 - .byte 0, 0, 1, 2, 3, 0, 0, 1, 1 - .byte 0 + .align 1 -gUnknown_085CDC6A:: @ 85CDC6A - .2byte 3, 7 +gUnknown_085CDC6E:: @ 85CDC6E @the following might be unref, not sure .byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00 -- cgit v1.2.3