summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/vars.h2
-rw-r--r--include/field_player_avatar.h2
-rw-r--r--include/fldeff_80F9BCC.h19
-rw-r--r--include/fldeff_misc.h24
-rw-r--r--include/secret_base.h8
-rw-r--r--include/strings.h2
6 files changed, 37 insertions, 20 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 9854ec5a2..faffe7c70 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -100,7 +100,7 @@
#define VAR_0x4051 0x4051
#define VAR_0x4052 0x4052
#define VAR_0x4053 0x4053
-#define VAR_0x4054 0x4054
+#define VAR_CURRENT_SECRET_BASE 0x4054
#define VAR_0x4055 0x4055
#define VAR_0x4056 0x4056
#define VAR_0x4057 0x4057
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index adb51f889..3aedec5de 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -58,5 +58,7 @@ u8 GetJumpSpecialMovementAction(u32);
bool8 PartyHasMonWithSurf(void);
bool8 IsPlayerFacingSurfableFishableWater(void);
bool8 IsPlayerSurfingNorth(void);
+void sub_808C228(u8 direction);
+u8 sub_808BCD0(void);
#endif // GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/fldeff_80F9BCC.h b/include/fldeff_80F9BCC.h
deleted file mode 100644
index 027bb4273..000000000
--- a/include/fldeff_80F9BCC.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef GUARD_FLDEFF_80F9BCC_H
-#define GUARD_FLDEFF_80F9BCC_H
-
-// Exported type declarations
-
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-void sub_80FA5E4(s16 id, s16 x, s16 y);
-void sub_80FA794(s16 x, s16 y);
-void CreateRecordMixingSprite(void);
-void DestroyRecordMixingSprite(void);
-void FldeffPoison_Start(void);
-void sub_80FA970(s16);
-void sub_80FA9D0(void);
-bool8 sub_80FADE4(u16, u8);
-
-#endif //GUARD_FLDEFF_80F9BCC_H
diff --git a/include/fldeff_misc.h b/include/fldeff_misc.h
new file mode 100644
index 000000000..954ecbb5c
--- /dev/null
+++ b/include/fldeff_misc.h
@@ -0,0 +1,24 @@
+#ifndef GUARD_FLDEFF_MISC_H
+#define GUARD_FLDEFF_MISC_H
+
+void PopSecretBaseBalloon(s16 id, s16 x, s16 y);
+void ShatterSecretBaseBreakableDoor(s16 x, s16 y);
+u8 CreateRecordMixingSprite(void);
+void DestroyRecordMixingSprite(void);
+void FldEffPoison_Start(void);
+void PlaySecretBaseMusicNoteMatSound(s16 metatileId);
+void DoSecretBaseGlitterMatSparkle(void);
+bool8 sub_80FADE4(u16, u8);
+
+extern struct MapPosition gPlayerFacingPosition;
+extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
+
+extern u8 EventScript_275A86[];
+extern u8 EventScript_275ADF[];
+extern u8 EventScript_275B38[];
+
+extern const struct OamData gEventObjectBaseOam_32x8;
+
+extern const u16 gTilesetPalettes_SecretBase[][16];
+
+#endif //GUARD_FLDEFF_MISC_H
diff --git a/include/secret_base.h b/include/secret_base.h
index 4fa0d0c4a..ac15357e3 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -23,4 +23,12 @@ void sub_80EB9E0(void);
void sub_80EBB28(void);
void sub_80E9668(const struct MapPosition *position, const struct MapEvents *events);
+// SetCurrentSecretBaseFromPosition
+void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events);
+// SetCurrentSecretBaseVar
+void sub_80E8B6C(void);
+void sub_80E8BC8(void);
+void sub_80E8D4C(void);
+void EnableBothScriptContexts(void);
+
#endif //GUARD_SECRET_BASE_H
diff --git a/include/strings.h b/include/strings.h
index 5af8b63ff..a6f61f603 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -140,6 +140,8 @@ extern const u8 gText_Cancel4[];
extern const u8 gText_IsThisTheCorrectTime[];
extern const u8 gText_PkmnFainted3[];
extern const u8 gText_Coins[];
+extern const u8 gText_Silver[];
+extern const u8 gText_Gold[];
extern const u8 gText_Var1AteTheVar2[];
extern const u8 gText_Var1HappilyAteVar2[];