1 files changed, 25 insertions, 49 deletions

diff --git a/include/asm.inc.h b/include/asm.inc.h
index f533d8729..bfa37e058 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -11,7 +11,6 @@ void sub_8032AA8(u8 index, int i);
 
 // asm/rom_803D1FC.o
 u16 SpeciesToNationalPokedexNum(u16);
-u32 SpeciesToCryId(u32);
 void DrawSpindaSpots(u16, u32, void *, u8);
 u8 sub_803FC58(u16);
 void AdjustFriendship(struct Pokemon *, u8);
@@ -34,42 +33,9 @@ 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 sub_8047A1C(void);
-void sub_8047A34(void);
-void save_serialize_game(void);
-void save_deserialize_game();
-
 // asm/berry_blender.o
 void sub_80516C4(u8, u16);
 
-// asm/metatile_behavior.o
-bool8 MetatileBehavior_IsSandOrDeepSand(char);
-bool8 is_tile_x69_2_warp_door(u8);
-u8 MetatileBehavior_IsDoor(u8);
-bool8 MetatileBehavior_IsLadder(u8);
-u8 sub_8056F08(u8);
-bool8 sub_8056F24(u8);
-u8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8);
-bool8 MetatileBehavior_IsEastArrowWarp(u8);
-bool8 MetatileBehavior_IsWestArrowWarp(u8);
-bool8 MetatileBehavior_IsNorthArrowWarp(u8);
-bool8 MetatileBehavior_IsSouthArrowWarp(u8);
-bool8 MetatileBehavior_IsTallGrass(char);
-bool8 MetatileBehavior_IsLongGrass(char);
-u8 MetatileBehavior_IsBridge(u8);
-u8 sub_8057450(u8);
-u8 MetatileBehavior_IsLandWildEncounter(u8);
-u8 MetatileBehavior_IsWaterWildEncounter(u8);
-bool8 sub_80574C4(char);
-bool8 sub_80574D8(char);
-bool8 sub_8057568(char);
-bool8 sub_805759C(u8);
-bool8 MetatileBehavior_IsSurfableFishableWater(u8);
-
 // src/field_door.o
 void FieldSetDoorOpened(u32, u32);
 void FieldSetDoorClosed(u32, u32);
@@ -100,6 +66,7 @@ void FieldObjectGetLocalIdAndMap(struct MapObject *, u8 *, u8 *, u8 *);
 void sub_805BCF0(u8, u8, u8, u8);
 void sub_805BD48(u8, u8, u8);
 void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
+void gpu_pal_allocator_reset__manage_upper_four(void);
 void npc_coords_shift(struct MapObject *pObject, s16 x, s16 y);
 void sub_805C0F8(u8, u8, u8, s16, s16);
 void npc_coords_shift_still(struct MapObject *pObject);
@@ -249,11 +216,17 @@ void sub_808AB90(void);
 
 // asm/rom_8094928.o
 void sub_80961D8(void);
+u8 sub_809D3A4(u16 arg0, void (*)(struct Sprite *), int, u8 arg3, u32 arg4);
+u16 sub_809D4A8(u16);
+void sub_809D510(struct Sprite *);
+void sub_809D580(u16);
+void sub_809D608(u16);
 u8 pokemon_ailments_get_primary(u32);
 u8 exec_movement(u8, u8, u8, void *);
 bool8 sub_80A212C(u8, u8, u8);
 void sub_80A2178(void);
 void sub_80A2B18(void);
+u16 sub_80A2D64(u16, u8 *);
 void AddMapNamePopUpWindowTask(void);
 void HideMapNamePopUpWindow();
 
@@ -261,12 +234,22 @@ void HideMapNamePopUpWindow();
 void sub_80A3684(void);
 void sub_80A3714(void);
 void sub_80A53F8(void);
+void sub_80A5B40(void);
 void sub_80A68CC();
+u8 sub_80A7D8C(u8 berry, int i, int i1);
+void sub_80A7DD4(void);
+u8 sub_80A7E5C(u8);
+
+// 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);
@@ -289,15 +272,6 @@ void *picbox_close(void);
 // asm/naming_screen.o
 void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCallback s4);
 
-// asm/money.o
-bool8 IsEnoughMoney(u32, u32);
-void sub_80B79B8(u32 *, u32);
-void sub_80B79E0(u32 *, u32);
-void sub_80B7AEC(u32, u8 left, u8 top);
-void sub_80B7BEC(u32, u8, u8);
-void sub_80B7C14(u32, u8, u8);
-void RemoveMoneyLabelObject(u8, u8);
-
 // asm/secret_base.o
 void sub_80BB5B4(void);
 u8 sub_80BBB24(void);
@@ -373,6 +347,11 @@ void sub_80EBA5C(void);
 void sub_80F7AA4(void);
 void sub_80F7F30(void);
 
+// asm/menu_helpers.o
+bool8 sub_80F9344(void);
+void sub_80F9368(void);
+void sub_80F9438(void);
+
 // asm/script_pokemon_util_80F99CC.o
 void sub_80F99CC(void);
 
@@ -417,6 +396,7 @@ void sub_811AAD8(u8);
 u8 sub_811AAE8(void);
 
 // asm/mystery_event_script.o
+u32 sub_812613C(u8 *);
 void sub_8126160(u8);
 u16 sub_8126338(void);
 
@@ -467,12 +447,6 @@ void sub_813E930(/*TODO: arg types*/);
 void sub_813EB4C(u8);
 void sub_813EDBC(/*TODO: arg types*/);
 
-// asm/mystery_event_menu.o
-void CB2_InitMysteryEventMenu(void);
-
-// asm/save_failed_screen.o
-void fullscreen_save_activate();
-
 // asm/rom_81473B8.o
 bool8 sub_81474C8(void);
 void sub_8147514(void);
@@ -486,6 +460,7 @@ u8 intro_create_brendan_sprite(/*TODO: arg types*/);
 u8 intro_create_may_sprite(/*TODO: arg types*/);
 u8 intro_create_latios_sprite(/*TODO: arg types*/);
 u8 intro_create_latias_sprite(/*TODO: arg types*/);
+void sub_814A568(u8*);
 
 // src/agb_flash.o
 u16 ReadFlashId(void);
@@ -493,3 +468,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);