Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-26 18:55:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ground map externs

Browse Source
This commit is contained in:
DizzyEggg
2025-10-23 15:59:41 +02:00
parent 46065e5899
commit 4d11518c21
6 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/ground_map.h
View File

@@ -29,8 +29,11 @@ bool8 sub_80A579C(PixelPos *pos1, PixelPos *pos2);
bool8 CheckMapCollision_80A585C(PixelPos *pixPos1, PixelPos *boundary);
bool8 sub_80A58C8(PixelPos *pixPos1, PixelPos *boundary);
u8 sub_80A5934(u8 param_1, PixelPos *param_2, PixelPos *param_3);
u8 sub_80A595C(u8 param_1, PixelPos *param_2, PixelPos *param_3);
u16 sub_80A5984(s32 param_1, PixelPos *param_2);
void sub_80A59A0(s32 param_1, PixelPos *param_2, u16 param_3);
void GroundMap_Action(void);
void sub_80A59DC(void);
void sub_80A5E70(void);
#endif // GUARD_GROUND_MAP_H

1
src/debug_field_map.c
View File

@@ -21,7 +21,6 @@
extern void sub_8012A18(s32 unused);
extern void sub_80999E8(s32 a0);
extern void sub_80A59DC(void);
extern PixelPos SetVecFromDirectionSpeed(s8 r1, u32 r2);
UNUSED static void DebugMapViewer(void)

2
src/ground_lives.c
View File

@@ -108,9 +108,7 @@ extern const struct GroundLiveTypeData gGroundLivesTypeData_811E63C[];
extern s32 sub_8002984(s32 _direction1, u32 caseID);
extern bool8 sub_80A66F8(struct UnkGroundSpriteStruct *ptr);
extern bool8 sub_80A671C(struct UnkGroundSpriteStruct *ptr);
extern bool8 sub_80A595C(u32 a0, PixelPos *pixelPosArg1, PixelPos *pixelPosArg2);
extern PixelPos SetVecFromDirectionSpeed(s32 r1, u32 r2);
extern u8 sub_80A5934(s32 param_1, PixelPos *, PixelPos *);
extern bool8 sub_809B1C0(s32 a0, u32 kind, Pokemon *a2);
extern Pokemon *sub_80A8D54(s32);
extern const struct GroundScriptHeader *GetGroundScript(s16 a0, const DebugLocation *);

6
src/ground_main.c
View File

@@ -52,12 +52,8 @@ EWRAM_INIT u8 gUnknown_203B49D = {0};
extern void sub_809B57C();
extern void sub_809D25C();
extern void sub_80A59DC();
extern void sub_809B614();
extern void sub_809CA20();
extern void sub_80A6E80();
extern void sub_8099BE4();
extern void sub_809B638();
extern void nullsub_106();
extern void sub_80A73EC();
@@ -75,13 +71,11 @@ extern bool8 sub_8099B94(void);
extern void sub_8099768(void);
extern void sub_809975C(void);
extern void sub_809B474(void);
extern void sub_80A59DC(void);
extern void sub_809B614(void);
extern void sub_8099BE4(void);
extern void sub_8099744(void);
extern void WaitForNextFrameAndAdvanceRNG(void);
extern void LoadBufferedInputs(void);
extern void sub_80A5E70(void);
extern void sub_809B638(void);
extern void sub_8099750(void);
extern void nullsub_16(void);

5
src/ground_map.c
View File

@@ -1365,10 +1365,9 @@ u16 sub_80A5984(s32 param_1, PixelPos *param_2)
return sub_80A4720(gGroundMapDungeon_3001B70, param_1, param_2);
}
void sub_80A59A0(s32 param_1, PixelPos *param_2, u32 param_3)
void sub_80A59A0(s32 param_1, PixelPos *param_2, u16 param_3)
{
u32 param_3_u32 = (u16)param_3;
sub_80A4740(gGroundMapDungeon_3001B70, param_1, param_2, param_3_u32);
sub_80A4740(gGroundMapDungeon_3001B70, param_1, param_2, param_3);
}
void GroundMap_Action(void)

9
src/ground_script.c
View File

@@ -92,8 +92,6 @@ void sub_8096488(void);
bool8 sub_80964B4(void);
bool8 sub_8097640();
u8 sub_80964E4();
s32 sub_80A5984();
void sub_80A59A0(s32, s32 *, u16);
// For gScriptLocks, gScriptLockConds, gUnlockBranchLabels
#define SCRIPT_LOCKS_ARR_COUNT 129
@@ -3683,10 +3681,9 @@ static s32 sub_80A14E8(Action *action, u8 idx, u32 r2, s32 r3)
}
return 0;
case 0x3D: {
s32 sp_338[2];
sp_338[0] = r2;
sp_338[1] = r3;
sub_80A59A0(0, sp_338, sub_80A5984(1, sp_338));
PixelPos sp_338 = {r2, r3};
sub_80A59A0(0, &sp_338, sub_80A5984(1, &sp_338));
return 0;
}
case 0x3E: