Merge pull request #463 from sceptillion/master

decompile fldeff_recordmixing

8 files changed, 33 insertions, 13 deletions

diff --git a/include/field_effect.h b/include/field_effect.h
index a509697e4..9f71efba1 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -67,7 +67,7 @@ enum FieldEffectScriptIdx
     FLDEFF_CUT_GRASS,
     FLDEFF_FIELD_MOVE_SHOW_MON_INIT,
     FLDEFF_USE_FLY_ANCIENT_TOMB,
-    FLDEFF_PCTURN_ON,
+    FLDEFF_SECRET_BASE_PC_TURN_ON,
     FLDEFF_HALL_OF_FAME_RECORD,
     FLDEFF_USE_TELEPORT
 };
@@ -253,6 +253,6 @@ void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
 void sub_80878A8(void);
 void sub_8087BA8(void);
 
-extern u32 gFieldEffectArguments[8];
+extern s32 gFieldEffectArguments[8];
 
 #endif // GUARD_FIELD_EFFECT_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 250ed8469..1b25aad24 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -64,7 +64,7 @@ u8 player_get_direction_lower_nybble(void);
 u8 player_get_direction_upper_nybble(void);
 u8 PlayerGetZCoord(void);
 u8 TestPlayerAvatarFlags(u8);
-// sub_80597D0
+u8 sub_80597D0(void);
 u8 GetPlayerAvatarObjectId(void);
 void sub_80597E8(void);
 void sub_80597F4(void);
@@ -83,7 +83,7 @@ void sub_8059B88(u8);
 void sub_8059BF4(void);
 // sub_8059C3C
 void sub_8059C94(u8);
-// sub_8059D08
+void sub_8059D08(u8);
 u8 sub_8059E84(struct Task *task, struct MapObject *b, struct MapObject *c);
 u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c);
 u8 sub_8059F40(struct Task *task, struct MapObject *b, struct MapObject *c);
diff --git a/include/fldeff_80C5CD4.h b/include/fldeff_80C5CD4.h
deleted file mode 100644
index 413e8ad96..000000000
--- a/include/fldeff_80C5CD4.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_FLDEFF_80C5CD4_H
-#define GUARD_FLDEFF_80C5CD4_H
-
-void DoFieldPoisonEffect(void);
-bool32 FieldPoisonEffectIsRunning(void);
-void CreateRecordMixingSprite(void);
-void DestroyRecordMixingSprite(void);
-
-#endif // GUARD_FLDEFF_80C5CD4_H
diff --git a/include/fldeff_decoration.h b/include/fldeff_decoration.h
new file mode 100644
index 000000000..50b075b89
--- /dev/null
+++ b/include/fldeff_decoration.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_FLDEFF_DECORATION_H
+#define GUARD_FLDEFF_DECORATION_H
+
+void sub_80C68A4(s16 metatileId, s16 x, s16 y);
+void sub_80C6A54(s16 x, s16 y);
+void DoDecorationSoundEffect(s16 metatileId);
+void DoYellowCave4Sparkle(void);
+
+#endif // GUARD_FLDEFF_DECORATION_H
diff --git a/include/fldeff_poison.h b/include/fldeff_poison.h
new file mode 100644
index 000000000..fe3308ba9
--- /dev/null
+++ b/include/fldeff_poison.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_FLDEFF_POISON_H
+#define GUARD_FLDEFF_POISON_H
+
+void DoFieldPoisonEffect(void);
+bool32 FieldPoisonEffectIsRunning(void);
+
+#endif // GUARD_FLDEFF_POISON_H
diff --git a/include/fldeff_recordmixing.h b/include/fldeff_recordmixing.h
new file mode 100644
index 000000000..550705eb6
--- /dev/null
+++ b/include/fldeff_recordmixing.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_FLDEFF_RECORDMIXING_H
+#define GUARD_FLDEFF_RECORDMIXING_H
+
+u8 CreateRecordMixingSprite(void);
+void DestroyRecordMixingSprite(void);
+
+#endif // GUARD_FLDEFF_RECORDMIXING_H
diff --git a/include/rom6.h b/include/rom6.h
index e7a3ba48e..8c3691624 100644
--- a/include/rom6.h
+++ b/include/rom6.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_ROM6_H
 #define GUARD_ROM6_H
 
+extern struct MapPosition gUnknown_0203923C;
+
 bool8 npc_before_player_of_type(u8);
 u8 oei_task_add(void);
 
diff --git a/include/secret_base.h b/include/secret_base.h
index 07784556f..abe5d781f 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -5,9 +5,13 @@
 #define MAX_SECRET_BASES 20
 
 void ResetSecretBases(void);
+void sub_80BB5E4(void);
+void sub_80BB63C(void);
+void sub_80BB800(void);
 void sub_80BB970(struct MapEvents *events);
 u8 sub_80BBB24(void);
 void sub_80BBCCC(u8 flagIn);
+void sub_80BBFD8(struct MapPosition *, struct MapEvents *);
 void sub_80BC038(struct MapPosition *, struct MapEvents *);
 u8 sub_80BC050();
 u8 *GetSecretBaseMapName(u8 *dest);