From ce0abfe00d6e4590d1bfe2b43ebc57aaffefa791 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 29 Aug 2025 20:57:48 +0200 Subject: [PATCH] dungeon map access externs --- include/dungeon_map_access.h | 18 +++++++++--------- include/dungeon_menu_team.h | 2 ++ src/dungeon_action_execution.c | 2 +- src/dungeon_main.c | 4 ---- src/dungeon_menu_items.c | 13 +------------ src/dungeon_menu_moves.c | 2 +- src/dungeon_menu_team.c | 8 +------- src/dungeon_misc.c | 1 - src/dungeon_move.c | 2 -- src/dungeon_move_util.c | 1 - 10 files changed, 15 insertions(+), 38 deletions(-) diff --git a/include/dungeon_map_access.h b/include/dungeon_map_access.h index a98a24079..f52c3d40b 100644 --- a/include/dungeon_map_access.h +++ b/include/dungeon_map_access.h @@ -5,10 +5,6 @@ const Tile *GetTile(s32 x, s32 y); Tile *GetTileMut(s32 x, s32 y); - -void UpdateTrapsVisibility(void); -void DiscoverMinimap(DungeonPos *pos); - void sub_80495E4(void); void LoadDungeonTilesetAssets(void); void sub_8049820(void); @@ -17,20 +13,24 @@ void sub_8049884(void); void sub_80498A8(s32 x, s32 y); void sub_8049B8C(void); void sub_8049BB0(s32 x, s32 y); +void UpdateTrapsVisibility(void); void sub_804A1F0(s32 a0, s32 a1); void sub_804A49C(s32 a0, s32 a1); void ChangeDungeonCameraPos(DungeonPos *pos, s32 a1, u8 a2, u8 a3); void sub_804AA60(void); void sub_804AAAC(void); void sub_804AAD4(void); +void DiscoverMinimap(DungeonPos *pos); +bool8 PosHasItem(DungeonPos *pos); +Entity *GetMonsterAtPos(DungeonPos *pos); +bool8 sub_804AD34(DungeonPos *pos); +bool8 sub_804AE08(DungeonPos *pos); +void sub_804AE84(DungeonPos *pos); +bool8 IsTileGround(Tile *tile); +bool8 IsWaterTileset(void); #define DUNGEON_WATER_TYPE_NONE 0 #define DUNGEON_WATER_TYPE_LAVA 1 #define DUNGEON_WATER_TYPE_WATER 2 -bool8 sub_804AD34(DungeonPos *pos); -void sub_804AE84(DungeonPos *pos); -bool8 IsTileGround(Tile *tile); -bool8 IsWaterTileset(void); - #endif // GUARD_DUNGEON_MAP_ACCESS_H diff --git a/include/dungeon_menu_team.h b/include/dungeon_menu_team.h index 56b963178..2031ad334 100644 --- a/include/dungeon_menu_team.h +++ b/include/dungeon_menu_team.h @@ -13,4 +13,6 @@ void ShowStatusesDescriptionMenu(s32 count, STATUSTEXTS(statuses)); #define WHICH_MENU_ITEMS 2 Entity *ShowDungeonToWhichMonMenu(s32 *teamId, s32 caseId); +extern s32 gTeamMenuChosenId; + #endif // GUARD_DUNGEON_MENU_TEAM_H diff --git a/src/dungeon_action_execution.c b/src/dungeon_action_execution.c index 9a63ef94a..caf238507 100644 --- a/src/dungeon_action_execution.c +++ b/src/dungeon_action_execution.c @@ -37,6 +37,7 @@ #include "dungeon_leveling.h" #include "dungeon_cutscene.h" #include "dungeon_move.h" +#include "dungeon_map_access.h" #include "warp_target.h" void sub_8075BA4(Entity *param_1, u8 param_2); @@ -63,7 +64,6 @@ void sub_8066FA4(Entity *); void HandleUnsetItemAction(Entity *,bool8); extern u8 DisplayActions(Entity *); void sub_806A1E8(Entity *pokemon); -bool8 sub_804AE08(DungeonPos *pos); void HandlePickUpAIAction(Entity *pokemon); void HandleThrowItemAIAction(Entity *pokemon); void HandleEatAIAction(Entity *pokemon); diff --git a/src/dungeon_main.c b/src/dungeon_main.c index a5dcfc9a2..4217cce2f 100644 --- a/src/dungeon_main.c +++ b/src/dungeon_main.c @@ -74,15 +74,11 @@ s32 GetTeamMemberEntityIndex(Entity *pokemon); bool8 sub_8070F80(Entity * pokemon, s32 direction); void sub_806752C(ActionContainer *a0); void sub_8067768(ActionContainer *a0); -void ChangeDungeonCameraPos(DungeonPos *pos, s32 a1, u8 a2, u8 a3); extern bool8 sub_8071A8C(Entity *pokemon); extern bool8 sub_8070F14(Entity * pokemon, s32 direction); -extern Entity *sub_80696A8(Entity *a0); extern void sub_8041AD0(Entity *pokemon); extern void sub_8041AE0(Entity *pokemon); -extern s32 gTeamMenuChosenId; - static EWRAM_DATA bool8 sInDiagonalMode = 0; static EWRAM_DATA bool8 sInRotateMode = 0; // Frames counter for arrows in diagonal/rotate mode. diff --git a/src/dungeon_menu_items.c b/src/dungeon_menu_items.c index a4af84122..99a69d022 100644 --- a/src/dungeon_menu_items.c +++ b/src/dungeon_menu_items.c @@ -28,25 +28,14 @@ #include "dungeon_action.h" #include "code_801B3C0.h" #include "dungeon_engine.h" +#include "dungeon_strings.h" extern bool8 sub_8070F14(Entity * pokemon, s32 direction); bool8 sub_805EC2C(Entity *a0, s32 x, s32 y); -extern Entity *sub_80696A8(Entity *a0); extern void sub_8041AD0(Entity *pokemon); extern void sub_8041AE0(Entity *pokemon); -extern const u8 gUnknown_8106B50[]; extern bool8 sub_8046F00(Item *item); -extern bool8 PosHasItem(DungeonPos *pos); -extern u8 gUnknown_202EE00; - - -extern const u8 *gUnknown_80F8B24; -extern const u8 *gTeamToolboxAPtr; -extern const u8 *gTeamToolboxBPtr; -extern const u8 *gFieldItemMenuGroundTextPtr; -extern const u8 *gUnknown_80FE940; -extern const u8 *gWhichTextPtr1; static EWRAM_DATA ActionParameter sUnknownActionUnk4 = {0}; static EWRAM_DATA s32 sUnknown_202F240 = 0; diff --git a/src/dungeon_menu_moves.c b/src/dungeon_menu_moves.c index 5c4c6bf9e..3a6a078fa 100644 --- a/src/dungeon_menu_moves.c +++ b/src/dungeon_menu_moves.c @@ -18,6 +18,7 @@ #include "dungeon_strings.h" #include "dungeon_util.h" #include "dungeon_engine.h" +#include "dungeon_map_access.h" #include "input.h" #include "moves.h" #include "menu_input.h" @@ -30,7 +31,6 @@ #include "text_3.h" extern s32 GetTeamMemberEntityIndex(Entity *pokemon); -extern void ChangeDungeonCameraPos(DungeonPos *pos, s32 a1, u8 a2, u8 a3); extern void sub_806752C(ActionContainer *a0); extern void ShowDungeonSummaryOrIQMenu(ActionContainer *a0, bool8 a1); extern void sub_8067768(ActionContainer *a0); diff --git a/src/dungeon_menu_team.c b/src/dungeon_menu_team.c index 71f60e6d0..2ee6b48c9 100644 --- a/src/dungeon_menu_team.c +++ b/src/dungeon_menu_team.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "dungeon_menu_team.h" #include "constants/tactic.h" #include "structs/map.h" #include "structs/str_dungeon.h" @@ -21,7 +22,6 @@ #include "dungeon_main.h" #include "dungeon_map_access.h" #include "dungeon_menu_moves.h" -#include "dungeon_menu_team.h" #include "dungeon_message.h" #include "dungeon_misc.h" #include "dungeon_logic.h" @@ -72,12 +72,9 @@ void sub_806752C(ActionContainer *a0); void ActionSetOrUnsetMove(ActionContainer *a0, bool8 a1); void ActionDelinkMoves(ActionContainer *a0, bool8 a1); void sub_8067768(ActionContainer *a0); -void ChangeDungeonCameraPos(DungeonPos *pos, s32 a1, u8 a2, u8 a3); extern void sub_80643AC(Entity *pokemon); -extern bool8 ShowDungeonMovesMenu(Entity * entity, u8 a1, u8 a2, s32 a3, s32 a4); extern bool8 sub_8070F14(Entity * pokemon, s32 direction); bool8 sub_805EC2C(Entity *a0, s32 x, s32 y); -extern Entity *sub_80696A8(Entity *a0); extern void sub_8041AD0(Entity *pokemon); extern void sub_8041AE0(Entity *pokemon); extern bool8 sub_8046F00(Item *item); @@ -87,9 +84,6 @@ extern char* sub_808E4FC(s32 a1); extern char* sub_808E51C(s32 a1); extern void sub_8045C18(u8 *buffer, Item *item); -extern u8 gUnknown_202EE00; -extern u8 gUnknown_202EE39; - EWRAM_DATA s32 gTeamMenuChosenId = 0; static UNUSED EWRAM_DATA u8 sUnused[4] = {0}; EWRAM_DATA static SpriteOAM sOAMStatusDescriptionArrow = {0}; diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c index 12f3f2fc9..e05eb7600 100644 --- a/src/dungeon_misc.c +++ b/src/dungeon_misc.c @@ -75,7 +75,6 @@ extern void sub_8042EC8(Entity *a0, s32 a1); extern Entity *sub_804550C(s16 a); extern Entity *sub_80453AC(s16 id); extern void EntityUpdateStatusSprites(Entity *); -extern Entity *sub_80696A8(Entity *a0); extern u8 gUnknown_202F32C; diff --git a/src/dungeon_move.c b/src/dungeon_move.c index 19c5d24c5..576898bf3 100644 --- a/src/dungeon_move.c +++ b/src/dungeon_move.c @@ -57,8 +57,6 @@ extern u16 sub_80412E0(u16 moveId, u8 weather, u8 a2); extern void sub_800EF10(u16 r0); extern void sub_800E3AC(s32 a0, DungeonPos *pos, s32 a2); extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *); -extern Entity *sub_80696A8(Entity *a0); -extern Entity *GetMonsterAtPos(DungeonPos *pos); extern void sub_8042930(Entity *r0); extern void sub_8041B48(Entity *pokemon); extern void sub_8041BA8(Entity *pokemon); diff --git a/src/dungeon_move_util.c b/src/dungeon_move_util.c index 15e696081..2e25a49e1 100644 --- a/src/dungeon_move_util.c +++ b/src/dungeon_move_util.c @@ -53,7 +53,6 @@ extern u16 sub_80412E0(u16 moveId, u8 weather, u8 a2); extern void sub_800EF10(u16 r0); extern void sub_800E3AC(s32 a0, DungeonPos *pos, s32 a2); extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *); -extern Entity *GetMonsterAtPos(DungeonPos *pos); static u8 ToItemID(u32 itemID);