Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers

Decompile field effect helpers

data/field_effect_helpers.s

@@ -3,30 +3,9 @@
 
 	.section .rodata
     
-gUnknown_085CDC38:: @ 85CDC38
+    .align 1
-	.2byte 12, 28, 44
 	
-gUnknown_085CDC3E:: @ 85CDC3E
+gUnknown_085CDC6E:: @ 85CDC6E
-	.byte 0x00, 0x01, 0x02, 0x03
-
-gUnknown_085CDC42:: @ 85CDC42
-	.2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000
-
-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
-	
-gUnknown_085CDC6A:: @ 85CDC6A
-	.2byte 3, 7
 	@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
 

include/event_object_movement.h

@@ -80,6 +80,7 @@ struct LockedAnimEventObjects
 };
 
 extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
+extern const u8 gReflectionEffectPaletteMap[];
 
 void sub_808D438(void);
 u8 GetMoveDirectionAnimNum(u8);
@@ -189,6 +190,10 @@ u8 GetMoveDirectionFasterAnimNum(u8);
 u8 GetMoveDirectionFastestAnimNum(u8);
 u8 GetLedgeJumpDirection(s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8 objectId);
+u16 GetObjectPaletteTag(u8 palSlot);
+void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
+s16 sub_809773C(s16 a1);
+s16 sub_8097728(s16 a1);
 
 void MovementType_None(struct Sprite *);
 void MovementType_LookAround(struct Sprite *);
@@ -249,6 +254,7 @@ u8 GetSlideMovementAction(u32);
 u8 GetJumpInPlaceMovementAction(u32);
 u8 GetJumpMovementAction(u32);
 u8 GetJump2MovementAction(u32);
+u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
 
 u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *);
 u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *);

ld_script.txt

@@ -200,7 +200,7 @@ SECTIONS {
         src/rom_81520A8.o(.text);
         src/save.o(.text);
         src/mystery_event_script.o(.text);
-        asm/field_effect_helpers.o(.text);
+        src/field_effect_helpers.o(.text);
         src/contest_ai.o(.text);
         src/battle_anim_sound_tasks.o(.text);
         src/battle_controller_safari.o(.text);
@@ -490,6 +490,7 @@ SECTIONS {
         src/battle_message.o(.rodata);
         data/cable_car.o(.rodata);
         src/save.o(.rodata);
+        src/field_effect_helpers.o(.rodata);
         data/field_effect_helpers.o(.rodata);
         src/contest_ai.o(.rodata);
         src/battle_controller_safari.o(.rodata);