summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm.inc.h16
-rw-r--r--include/decompress.h1
-rw-r--r--include/load_save.h17
-rw-r--r--include/rom4.h2
-rw-r--r--include/sprite.h3
5 files changed, 29 insertions, 10 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 1cae90e98..80fe5fa00 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -34,15 +34,6 @@ u8 daycare_relationship_score_from_savegame(void);
// asm/rom_804373C.o
void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s4);
-// asm/load_save.o
-void CheckForFlashMemory(void);
-int sub_80479F8();
-void sub_8047A04();
-void SetSecretBase2Field_9_AndHideBG(void);
-void ClearSecretBase2Field_9_2(void);
-void SaveSerializedGame(void);
-void LoadSerializedGame(void);
-
// asm/berry_blender.o
void sub_80516C4(u8, u16);
@@ -263,10 +254,16 @@ void sub_80A3714(void);
void sub_80A53F8(void);
void sub_80A68CC();
+// src/matsuda_debug_menu.o
+void sub_80AA280(u8);
+void sub_80AA5E8(u8);
+void sub_80AA658(u8);
+
// asm/contest.o
void sub_80AB1B0(void);
void sub_80AE098(u8);
void sub_80AE398(u8, u8);
+u32 sub_80AE770(u8, u8);
void sub_80AE82C(u8);
void sub_80AF668(void);
void sub_80B0F28(u8);
@@ -493,3 +490,4 @@ u16 SetFlashTimerIntr(u8 timerNum, void (**intrFunc)(void));
void ReadFlash(u16 sectorNum, u32 offset, u8 *dest, u32 size);
u32 ProgramFlashSectorAndVerify();
u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, u8 *src, u32 n);
+u16 IdentifyFlash(void);
diff --git a/include/decompress.h b/include/decompress.h
index 382e6d76a..a9bdd341b 100644
--- a/include/decompress.h
+++ b/include/decompress.h
@@ -12,5 +12,6 @@ void LoadCompressedObjectPaletteOverrideBuffer(const struct SpritePalette *a, vo
void DecompressPicFromTable_2(const struct SpriteSheet *a, u8 b, u8 c, void *d, void *e, s32 f);
void sub_800D334(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s32 f, u32 g);
void sub_800D378(const struct SpriteSheet *a, u32 b, u32 c, u32 d, void *dest, s32 f, u32 g, u32 h);
+void Unused_LZDecompressWramIndirect(const void **src, void *dest);
#endif // GUARD_DECOMPRESS_H
diff --git a/include/load_save.h b/include/load_save.h
new file mode 100644
index 000000000..5ca52a2fc
--- /dev/null
+++ b/include/load_save.h
@@ -0,0 +1,17 @@
+#ifndef GUARD_LOAD_SAVE_H
+#define GUARD_LOAD_SAVE_H
+
+void CheckForFlashMemory(void);
+bool32 GetSecretBase2Field_9(void);
+void ClearSecretBase2Field_9(void);
+void SetSecretBase2Field_9(void);
+void SetSecretBase2Field_9_AndHideBG(void);
+void ClearSecretBase2Field_9_2(void);
+void SavePlayerParty(void);
+void LoadPlayerParty(void);
+void SaveSerializedGame(void);
+void LoadSerializedGame(void);
+void LoadPlayerData(void);
+void SavePlayerData(void);
+
+#endif // GUARD_LOAD_SAVE_H
diff --git a/include/rom4.h b/include/rom4.h
index b12bbf4bc..036f43c36 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -59,7 +59,7 @@ void sub_8053720(s16, s16);
// sub_8053778
// unref_sub_8053790
// sub_80537CC
-// gpu_sync_bg_hide
+void gpu_sync_bg_hide();
// sub_8053818
// sub_8053850
// sub_80538B0
diff --git a/include/sprite.h b/include/sprite.h
index 4298593ca..57926fc68 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -245,5 +245,8 @@ void FreeSpritePaletteByTag(u16 tag);
void SetSubspriteTables(struct Sprite *sprite, struct SubspriteTable *subspriteTables);
bool8 AddSpriteToOamBuffer(struct Sprite *object, u8 *oamIndex);
bool8 AddSubspritesToOamBuffer(struct Sprite *sprite, struct OamData *destOam, u8 *oamIndex);
+void CopyToSprites(u8 *src);
+void CopyFromSprites(u8 *dest);
+u8 SpriteTileAllocBitmapOp(u16 bit, u8 op);
#endif // GUARD_SPRITE_H