move more externs

This commit is contained in:
DizzyEggg 2025-08-28 19:39:16 +02:00
parent 87bd005c29
commit 06e932b568
12 changed files with 14 additions and 19 deletions

View File

@ -1,6 +1,10 @@
#ifndef GUARD_DUNGEON_NAME_BANNER_H
#define GUARD_DUNGEON_NAME_BANNER_H
#include "structs/str_file_system.h"
void ShowDungeonNameBanner_Async(void);
extern OpenedFile *gDungeonNameBannerPalette;
#endif

View File

@ -16,4 +16,6 @@ bool8 sub_808384C(DungeonPos *posDst, const DungeonPos *posSrc);
void sub_80838EC(u8 *a0);
void sub_8083904(struct DungeonPos *posDst, struct Entity *entityArg);
extern Entity *gLeaderPointer;
#endif

View File

@ -5,6 +5,7 @@
#include "structs/dungeon_entity.h"
#include "structs/str_position.h"
#include "structs/str_traps.h"
#include "structs/str_dungeon.h"
#include "structs/map.h"
static inline EntityInfo *GetEntInfo(Entity *entity)
@ -35,4 +36,7 @@ bool8 CanTargetPosition(Entity *entity, DungeonPos *pos);
void SubstitutePlaceholderStringTags(u8 *buffer, Entity *entity, u32 param_3);
void sub_8045ACC(void);
extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE];
extern u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE];
#endif // GUARD_DUNGEON_UTIL_H

View File

@ -45,7 +45,6 @@ void sub_8041BBC(Entity *r0);
extern void sub_804178C(u32);
extern void sub_8042B20(Entity *entity);
extern void sub_8042B0C(Entity *entity);
extern Entity *gLeaderPointer;
extern bool8 sub_80860A8(u8 id);
extern u8 gUnknown_202F32C;
extern u8 GetRandomFloorItem(s32 a0);

View File

@ -27,8 +27,6 @@
#include "dungeon_music.h"
#include "string_format.h"
extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE];
u8 sub_806B8CC();
u8 sub_808529C(s32);
void nullsub_96(Entity *pokemon,Entity *target);

View File

@ -86,7 +86,6 @@ extern void sub_8041AE0(Entity *pokemon);
extern void sub_807EC28(bool8);
extern const u8 *GetCurrentDungeonName(void);
extern Entity *gLeaderPointer;
extern const u8 *gUnknown_80F8A84;
extern const u8 *gUnknown_80F8A6C;

View File

@ -39,7 +39,6 @@ extern bool8 sub_8046F00(Item *item);
extern bool8 PosHasItem(DungeonPos *pos);
extern u8 gUnknown_202EE00;
extern Entity *gLeaderPointer;
extern const u8 *gUnknown_80F8B24;

View File

@ -93,7 +93,6 @@ extern char* sub_808E51C(s32 a1);
extern void sub_8045C18(u8 *buffer, Item *item);
extern u8 gUnknown_202EE00;
extern Entity *gLeaderPointer;
extern u8 gUnknown_202EE39;
EWRAM_DATA s32 gTeamMenuChosenId = 0;

View File

@ -80,9 +80,6 @@ extern void sub_806B678(void);
extern void EntityUpdateStatusSprites(Entity *);
extern Entity *sub_80696A8(Entity *a0);
extern Entity *gLeaderPointer;
extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE];
extern u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE];
extern u8 gUnknown_202F32C;
bool8 sub_806A564(s16 r0);

View File

@ -8,14 +8,11 @@
#include "dungeon_map_access.h"
#include "dungeon_logic.h"
#include "dungeon_serializer.h"
#include "dungeon_range.h"
#include "dungeon_util.h"
#include "dungeon_pokemon_sprites.h"
#include "pokemon.h"
extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE];
extern u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE];
extern Entity *gLeaderPointer; // 203B450
#include "data/dungeon_serializer.h"

View File

@ -29,7 +29,9 @@
#include "menu_input.h"
#include "code_801602C.h"
#include "dungeon_tilemap.h"
#include "dungeon_name_banner.h"
#include "dungeon_engine.h"
#include "effect_main.h"
// File split is correct. This technical file deals with windows, advancing frames(v-blanks) and vram / pal set-up.
@ -40,17 +42,13 @@ struct DungeonPalFile
};
extern struct DungeonPalFile *gDungeonPaletteFile;
extern struct DungeonPalFile *gDungeonNameBannerPalette;
extern struct DungeonPalFile *gUnknown_202EC94;
extern RGB gUnknown_202ECA4[];
extern OpenedFile *gUnknown_202EC9C;
void xxx_draw_string_80524F0(void);
void sub_8085F78(void);
void sub_806CC10();
void sub_804522C();
void sub_803F9CC();
void sub_800E90C();
void sub_8042E5C();
static void sub_803E490(u32);
@ -391,7 +389,7 @@ void sub_803E874(bool8 r10, s32 r9)
if (r10) {
index = 224;
color = gDungeonNameBannerPalette->unk4;
color = gDungeonNameBannerPalette->data;
count = 16;
for (i = 0; i < count; i++) {
SetBGPaletteBufferColorRGB(index, color, r9, NULL);

View File

@ -101,7 +101,6 @@ extern void sub_8042B0C(Entity *);
extern u8 gUnknown_202F32C;
extern u8 gUnknown_202F1A8;
extern Entity *gLeaderPointer;
void EnforceMaxItemsAndMoney(void);
static void sub_8043FD0(void);