Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 07:28:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup some includes

Browse Source
This commit is contained in:
Seth Barberee 2024-10-27 16:02:34 -07:00
parent 91e0c0b220
commit b859e1be40
9 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/dungeon_action.h
View File

@ -3,6 +3,7 @@
#include "structs/dungeon_entity.h"
void sub_8044C50(u16 action);
void ClearMonsterActionFields(ActionContainer *actionPointer);
void SetMonsterActionFields(ActionContainer *actionPointer, u16 action);
void SetActionPassTurnOrWalk(ActionContainer *actionPointer, s16 species);

15
include/dungeon_map_access.h
View File

@ -9,4 +9,19 @@ Tile *GetTileMut(s32 x, s32 y);
void sub_8049ED4(void);
void sub_804AC20(DungeonPos *pos);
void sub_80495E4(void);
void LoadDungeonTilesetAssets(void);
void sub_8049820(void);
void sub_8049840(void);
void sub_8049884(void);
void sub_80498A8(s32 x, s32 y);
void sub_8049B8C(void);
void sub_8049BB0(s32 x, s32 y);
void sub_804A1F0(s32 a0, s32 a1);
void sub_804A49C(s32 a0, s32 a1);
void sub_804A728(DungeonPos *pos, s32 a1, u8 a2, u8 a3);
void sub_804AA60(void);
void sub_804AAAC(void);
void sub_804AAD4(void);
#endif // GUARD_DUNGEON_MAP_ACCESS_H

2
src/code_803E724.c
View File

@ -68,8 +68,6 @@ extern void sub_8083D44(void);
extern void sub_8040A84(void);
extern void sub_80400D4(void);
extern void sub_8041888(u8 param_1);
extern void sub_804A1F0(s32 a0, s32 a1);
extern void sub_804A49C(s32 a0, s32 a1);
extern void sub_80402AC(s32, s32);
void sub_803EC94(void);

8
src/code_8042B34.c
View File

@ -287,12 +287,10 @@ extern void sub_8040150(bool8 param_1);
extern void sub_803D4AC(void);
extern void sub_804513C(void);
extern void sub_8043CD8(void);
extern void sub_80495E4(void);
extern void sub_803E250(void);
extern void sub_8040130(void);
extern void sub_8040124(void);
extern void sub_803E830(void);
extern void sub_8049820(void);
extern void sub_803E214(void);
extern void nullsub_56(void);
extern void sub_806863C(void);
@ -309,7 +307,6 @@ extern void sub_8086130(void);
extern void FreeDungeonPokemonSprites(void);
extern void sub_803DF60(void);
extern void sub_803E02C(void);
extern void sub_8049840(void);
extern void sub_80847D4(void);
extern void sub_8043D60(void);
extern void sub_806890C(void);
@ -344,26 +341,21 @@ extern void sub_806AA70(void);
extern void sub_803D8F0(void);
extern void sub_806AD3C(void);
extern void sub_806C42C(void);
extern void sub_804AAD4(void);
extern void sub_8049B8C(void);
extern void sub_806B678(void);
extern void sub_806C3C0(void);
extern void sub_806B168(void);
extern void sub_806B6C4(void);
extern void sub_806A338(void);
extern void sub_804AAAC(void);
extern void sub_8051E3C(void);
extern void sub_8045CB0(void);
extern void sub_807FA18(void);
extern void sub_806A974(void);
extern void sub_806CF60(void);
extern void sub_8049884(void);
extern void sub_8068F80(void);
extern bool8 sub_8044B28(void);
extern bool8 sub_8083C24(void);
extern bool8 sub_8083C88(u8 param_1);
extern bool8 sub_8043ED0(bool8);
extern void LoadDungeonTilesetAssets(void);
extern void LoadDungeonPokemonSprites(void);
extern void ShowDungeonNameBanner(void);
extern void sub_803EAF0(u32, u32);

18
src/code_805D8C8_1.c
View File

@ -85,12 +85,10 @@ void sub_8075680(u32);
void sub_8094C88(void);
void sub_8040A84(void);
void sub_8047158(void);
void sub_804AA60(void);
void sub_806A914(u8 a0, u8 a1, u8 a2);
void sub_8044C10(u8 a0);
u16 GetLeaderActionId(void);
void sub_80978C8(s16 a0);
void sub_8044C50(u16 a0);
static void TryCreateModeArrows(Entity *leader);
bool8 sub_8094C48(void);
bool8 sub_805EC4C(Entity *a0, u8 a1);
@ -215,7 +213,7 @@ void DungeonHandlePlayerInput(void)
}
frames = 0;
sub_8044C50(0);
sub_8044C50(ACTION_NOTHING);
sShowThreeArrows1 = FALSE;
sShowThreeArrows2 = FALSE;
@ -247,7 +245,7 @@ void DungeonHandlePlayerInput(void)
}
if (gRealInputs.held & A_BUTTON && gRealInputs.held & B_BUTTON && FixedPointToInt(leaderInfo->belly) != 0) {
sub_8044C50(1);
sub_8044C50(ACTION_PASS_TURN);
gDungeon->unk644.unk2F = 1;
break;
}
@ -258,14 +256,14 @@ void DungeonHandlePlayerInput(void)
if (gRealInputs.pressed & A_BUTTON) {
if (gRealInputs.held & B_BUTTON) {
if (FixedPointToInt(leaderInfo->belly) != 0) {
sub_8044C50(1);
sub_8044C50(ACTION_PASS_TURN);
gDungeon->unk644.unk2F = 1;
break;
}
}
else if (ShouldMonsterRunAwayAndShowEffect(leader, TRUE)) {
LogMessageByIdWithPopupCheckUser(leader, gUnknown_80FD4B0);
sub_8044C50(1);
sub_8044C50(ACTION_PASS_TURN);
gDungeon->unk644.unk2F = 1;
break;
}
@ -415,7 +413,7 @@ void DungeonHandlePlayerInput(void)
s32 i;
for (i = 0; i < INVENTORY_SIZE; i++) {
if (ItemExists(&gTeamInventoryRef->teamItems[i]) && ItemSet(&gTeamInventoryRef->teamItems[i])) {
sub_8044C50(11);
sub_8044C50(ACTION_THROW_ITEM_PLAYER);
leaderInfo->action.unk4[0].actionUseIndex = i +1;
leaderInfo->action.unk4[0].lastItemThrowPosition.x = 0;
leaderInfo->action.unk4[0].lastItemThrowPosition.y = 0;
@ -531,11 +529,11 @@ void DungeonHandlePlayerInput(void)
if (immobilizedMsg != NULL) {
LogMessageByIdWithPopupCheckUser(leader, immobilizedMsg);
}
sub_8044C50(1);
sub_8044C50(ACTION_PASS_TURN);
gDungeon->unk644.unk2F = 1;
}
else {
sub_8044C50(2);
sub_8044C50(ACTION_WALK);
if ((gRealInputs.held & B_BUTTON || bPress) && FixedPointToInt(leaderInfo->belly) != 0) {
if (GetEntInfo(leader)->cringeClassStatus.status != STATUS_CONFUSED) {
gDungeon->unk644.unk28 = 1;
@ -565,7 +563,7 @@ void DungeonHandlePlayerInput(void)
HandleTalkFieldAction(leader);
if (sub_8044B28())
break;
sub_8044C50(0);
sub_8044C50(ACTION_NOTHING);
}
else if ((r6.a0_8) == 0) {
gDungeon->unk644.unk29 = 0;

1
src/code_8077274_1.c
View File

@ -1,6 +1,7 @@
#include "global.h"
#include "code_803E46C.h"
#include "code_8045A00.h"
#include "dungeon_map_access.h"
#include "dungeon_message.h"
#include "code_805D8C8.h"
#include "code_806CD90.h"

4
src/dungeon_cutscenes.c
View File

@ -375,7 +375,6 @@ extern s32 GetCameraXPos(void);
extern s32 GetCameraYPos(void);
extern void sub_803F878(u32, s32);
extern void BgColorCallNullsub4(void);
extern void DeoxysScreenFlash(void);
extern void sub_8085EB0(void);
extern void sub_8049884(void);
extern void sub_8049B8C(void);
@ -400,6 +399,9 @@ extern void sub_80460F8(DungeonPos *, Item *, u8);
extern u8 sub_8044B28(void);
extern bool8 sub_8085B80(struct_8085B80 *);
void sub_808BBA8(Entity * );
void DeoxysScreenFlash(void);
void sub_8086A54(Entity *);
void ZapdosScreenFlash(s32 numFlashes);
void ZapdosDropInEffect(Entity *);
void SetupDeoxysFightHP(Entity *r0);

2
src/dungeon_map_access.c
View File

@ -39,8 +39,6 @@ EWRAM_DATA_2 const Tile *gCurTilesetOobTile = {0};
extern u8 sub_8043CE4(u32);
extern void sub_80402AC(s32, s32);
extern int sprintf(char *, const char *, ...);
void sub_8049BB0(s32, s32);
void sub_80498A8(s32, s32);
const Tile *GetTile(s32 x, s32 y)
{

1
src/tile_types.c
View File

@ -84,7 +84,6 @@ const u8 gDungeonWaterType[76] = {
DUNGEON_WATER_TYPE_NONE,
};
extern void sub_80498A8(s32, s32);
extern void sub_80402AC(s32, s32);
extern void sub_8049BB0(s32, s32);
void sub_8042A14(DungeonPos *);