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

ground map includes

Browse Source
This commit is contained in:
DizzyEggg 2025-10-23 15:53:08 +02:00
parent db39c95592
commit 46065e5899
12 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ground_bg.h
View File

@ -16,10 +16,12 @@ void GetCameraPositionForLayer(GroundBg *groundBg, s32 id, PixelPos *dstPos);
void SetCameraPositionForLayer(GroundBg *groundBg, s32 id, const PixelPos *srcPos);
void sub_80A4580(GroundBg *groundBg, s32 id, PixelPos *pixPos);
void sub_80A4608(GroundBg *groundBg, PixelPos *dstPos);
void GetDungeonBounds(GroundBg *groundBg, PixelPos *dstPos1, PixelPos *dstPos2);
u8 sub_80A4660(GroundBg *groundBg, u8 bits, PixelPos *pixPos1, PixelPos *boundary);
u8 sub_80A46C0(GroundBg *groundBg, u8 bits, PixelPos *pixPos1, PixelPos *boundary);
u16 sub_80A4720(GroundBg *groundBg, s32 id, PixelPos *pixPos);
void sub_80A4740(GroundBg *groundBg, s32 id, PixelPos *pixPos, u32 dstVal);
void sub_80A4764(GroundBg *groundBg);
void sub_80A49E8(GroundBg *groundBg);
void GetDungeonBounds(GroundBg *groundBg, PixelPos *dstPos1, PixelPos *dstPos2);
#endif // GUARD_GROUND_BG_H

29
include/ground_map.h
View File

@ -2,21 +2,34 @@
#define GUARD_GROUND_MAP_H
#include "structs/str_position.h"
#include "structs/str_ground_script.h"
#include "structs/str_dungeon_location.h"
void GroundMap_Reset(void);
void AllocGroundMapAction(void);
void FreeGroundMapAction(void);
void GroundMap_Reset(void);
void sub_80A4B38(void);
void sub_80A4B54(void);
void sub_80A56C0(PixelPos *pos);
s16 GetAdjustedGroundMap(s32 mapId);
s16 GetGroundMapID(void);
void GroundMap_ExecuteEnter(s16);
void GroundMap_ExecuteEvent(s16 scriptIndex, u32);
void GroundMap_GetStationScript(ScriptInfoSmall *r0, s32 _groundScriptId, s32 _groupId, s32 _sectorId);
void GroundMap_ExecuteEvent(s16 scriptIndex, u32 param_2);
void GroundMap_ExecuteStation(s32 _map, s32 _group, s32 _sector, bool32 _setScriptState);
bool8 GroundMapNotifyAll(s16);
void GroundMap_ExecuteEnter(s16 param_1);
bool8 GroundMapNotifyAll(s16 param_1);
bool8 sub_80A4D48(s16 index);
s16 GetAdjustedGroundMap(s32 mapId);
void GroundMap_Select(s32 mapId_);
void GroundMap_SelectDungeon(s32 mapId_, const DungeonLocation *loc, u32 param_2);
void sub_80A56A0(u8 param_1, u8 param_2);
void sub_80A56C0(PixelPos *pos);
void sub_80A56F0(PixelPos *pos);
void sub_80A5704(PixelPos *pos);
s16 GetGroundMapID(void);
bool8 GetCurrentDungeonBounds(PixelPos *pos1, PixelPos *pos2);
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);
void GroundMap_Action(void);
void sub_80A5E70(void);

4
src/code_809D148.c
View File

@ -10,6 +10,7 @@
#include "ground_lives.h"
#include "ground_effect.h"
#include "ground_object.h"
#include "ground_map.h"
struct unkStruct_20399E8
{
@ -184,9 +185,6 @@ u8 sub_809D248(PixelPos *r0)
return sUnknown_20399E8.unk44;
}
// Todo: move these to appropriate header files
extern bool8 sub_80A579C(PixelPos *a0, PixelPos *a1);
void sub_809D25C(void)
{
s32 r2, r1, r3;

2
src/debug_field_map.c
View File

@ -20,8 +20,6 @@
#include "code_809D148.h"
extern void sub_8012A18(s32 unused);
extern bool8 sub_80A579C(PixelPos *a0, PixelPos *a1);
extern void GroundMap_Select(s16);
extern void sub_80999E8(s32 a0);
extern void sub_80A59DC(void);
extern PixelPos SetVecFromDirectionSpeed(s8 r1, u32 r2);

2
src/ground_effect.c
View File

@ -4,6 +4,7 @@
#include "data_script.h"
#include "ground_script.h"
#include "ground_sprite.h"
#include "ground_map.h"
#include "debug.h"
#include "memory.h"
@ -49,7 +50,6 @@ struct GroundEffectTypeData
extern struct GroundEffectTypeData gGroundEffectTypes[];
const struct GroundScriptHeader *GetGroundScript(s16 a0, DebugLocation *);
bool8 GetCurrentDungeonBounds(PixelPos *, PixelPos *);
void sub_80A7688(struct UnkGroundSpriteStruct *ptr, s32 unused, s32 a2_, s32 a3);
void sub_80A7714(struct UnkGroundSpriteStruct *);
extern bool8 sub_80A66F8(struct UnkGroundSpriteStruct *ptr);

4
src/ground_lives.c
View File

@ -19,6 +19,7 @@
#include "ground_lives_helper.h"
#include "ground_sprite_monster.h"
#include "ground_object.h"
#include "ground_map.h"
#include "code_809D148.h"
struct GroundLivesMeta_Sub1
@ -110,11 +111,8 @@ 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 CheckMapCollision_80A585C(PixelPos *, PixelPos *);
extern bool8 sub_80A58C8(PixelPos *, PixelPos *);
extern bool8 sub_809B1C0(s32 a0, u32 kind, Pokemon *a2);
extern Pokemon *sub_80A8D54(s32);
extern bool8 GetCurrentDungeonBounds(PixelPos *a0, PixelPos *a1);
extern const struct GroundScriptHeader *GetGroundScript(s16 a0, const DebugLocation *);
static s32 sub_80A7B94(s16 *a0);

2
src/ground_lives_helper.c
View File

@ -6,11 +6,11 @@
#include "game_options.h"
#include "ground_main.h"
#include "ground_script.h"
#include "ground_map.h"
extern void nullsub_104(void);
extern void sub_809C6CC(u16 param_1);
extern bool8 sub_809B260(s32 *a0);
extern void GroundMap_ExecuteEvent(s32, s32);
void nullsub_117(void)
{

2
src/ground_main.c
View File

@ -93,8 +93,6 @@ extern void UpdateFadeInTile(s32);
extern void sub_8001D88(void);
extern void sub_80999D4(s32);
extern void sub_8005838(s32, s32);
extern void sub_80A4B38(void);
extern void sub_80A4B54(void);
static s16 sub_8098FCC(u32 unused);

25
src/ground_map.c
View File

@ -1,10 +1,10 @@
#include "global.h"
#include "globaldata.h"
#include "ground_map.h"
#include "debug.h"
#include "event_flag.h"
#include "ground_bg.h"
#include "ground_main.h"
#include "ground_map.h"
#include "ground_script.h"
#include "ground_script_file.h"
#include "ground_weather.h"
@ -15,16 +15,11 @@
#include "constants/ground_map.h"
#include "code_809D148.h"
extern u8 sub_80A46C0(GroundBg *, u32, s32, s32);
extern u8 sub_80A4660(GroundBg *, u32, s32, s32);
void GroundMap_SelectDungeon(s32 mapId, const DungeonLocation *loc, u32 param_2);
void sub_80A56D8(const PixelPos*);
IWRAM_INIT GroundMapAction *gGroundMapAction = {NULL};
IWRAM_INIT GroundBg *gGroundMapDungeon_3001B70 = {NULL};
static void sub_80A5204(void *, const void *, BmaHeader *, s32);
static void sub_80A56D8(const PixelPos *pos);
static const SubStruct_52C gUnknown_8117324 = {
.unk0 = 0,
@ -1218,7 +1213,7 @@ void sub_80A56C0(PixelPos *pos)
GetCameraPositionForLayer(gGroundMapDungeon_3001B70, 0, pos);
}
void sub_80A56D8(const PixelPos *pos)
static void sub_80A56D8(const PixelPos *pos)
{
SetCameraPositionForLayer(gGroundMapDungeon_3001B70, 0, pos);
}
@ -1307,7 +1302,7 @@ bool8 sub_80A579C(PixelPos *pos1, PixelPos *pos2)
return FALSE;
}
bool8 CheckMapCollision_80A585C(PixelPos *pixPos1,PixelPos *boundary)
bool8 CheckMapCollision_80A585C(PixelPos *pixPos1, PixelPos *boundary)
{
u8 *currPtr;
int i, j;
@ -1331,7 +1326,7 @@ bool8 CheckMapCollision_80A585C(PixelPos *pixPos1,PixelPos *boundary)
return FALSE;
}
bool8 sub_80A58C8(PixelPos *pixPos1,PixelPos *boundary)
bool8 sub_80A58C8(PixelPos *pixPos1, PixelPos *boundary)
{
u8 *currPtr;
int i, j;
@ -1355,16 +1350,14 @@ bool8 sub_80A58C8(PixelPos *pixPos1,PixelPos *boundary)
return FALSE;
}
u8 sub_80A5934(s32 param_1, s32 param_2, s32 param_3)
u8 sub_80A5934(u8 param_1, PixelPos *param_2, PixelPos *param_3)
{
u32 param_1_u32 = (u8)param_1;
return sub_80A4660(gGroundMapDungeon_3001B70, param_1_u32, param_2, param_3);
return sub_80A4660(gGroundMapDungeon_3001B70, param_1, param_2, param_3);
}
u8 sub_80A595C(s32 param_1, s32 param_2, s32 param_3)
u8 sub_80A595C(u8 param_1, PixelPos *param_2, PixelPos *param_3)
{
u32 param_1_u32 = (u8)param_1;
return sub_80A46C0(gGroundMapDungeon_3001B70, param_1_u32, param_2, param_3);
return sub_80A46C0(gGroundMapDungeon_3001B70, param_1, param_2, param_3);
}
u16 sub_80A5984(s32 param_1, PixelPos *param_2)

4
src/ground_object.c
View File

@ -8,6 +8,7 @@
#include "ground_script.h"
#include "ground_sprite.h"
#include "ground_lives.h"
#include "ground_map.h"
#include "memory.h"
typedef struct GroundObject {
@ -54,10 +55,8 @@ const struct GroundScriptHeader *GetGroundScript(s16 a0, DebugLocation *);
void sub_80A7658(struct UnkGroundSpriteStruct *);
extern bool8 sub_80A66F8(struct UnkGroundSpriteStruct *ptr);
extern bool8 sub_80A671C(struct UnkGroundSpriteStruct *ptr);
extern bool8 CheckMapCollision_80A585C(PixelPos *, PixelPos *);
extern void sub_80A7664(struct UnkGroundSpriteStruct *ptr, PixelPos *pixelPos, s32 a2);
extern bool8 GetCurrentDungeonBounds(PixelPos *a0, PixelPos *a1);
void sub_80A75CC(void *, s32, s32, s32);
static void GroundObject_Delete(s32 index_);
@ -153,6 +152,7 @@ const u8 gGroundObjectFileName[];
static const struct ScriptCommand gUnknown_81182F4[] = {

8
src/ground_script.c
View File

@ -55,10 +55,6 @@
#include "ground_weather.h"
#include "code_809D148.h"
void GroundMap_Select(s16);
void GroundMap_SelectDungeon(s32, DungeonLocation*, u32);
void GroundMap_GetStationScript(ScriptInfoSmall *out, s16, s32, s32);
// Beware of the declarations without specified arguments, returning u32 or s32, these were quickly hacked in to get the code to compile and link
// The return values are almost certainly NOT correct and will need to be rechecked when moving to header files
char sub_8002984(s32, u8);
@ -96,12 +92,8 @@ void sub_8096488(void);
bool8 sub_80964B4(void);
bool8 sub_8097640();
u8 sub_80964E4();
void sub_80A56A0(s32, s32);
void sub_80A56F0(PixelPos *);
void sub_80A5704(PixelPos *);
s32 sub_80A5984();
void sub_80A59A0(s32, s32 *, u16);
extern bool8 sub_80A579C(PixelPos *a0, PixelPos *a1);
// For gScriptLocks, gScriptLockConds, gUnlockBranchLabels
#define SCRIPT_LOCKS_ARR_COUNT 129

2
src/textbox.c
View File

@ -23,6 +23,7 @@
#include "flash.h"
#include "friend_list_menu.h"
#include "ground_lives.h"
#include "ground_map.h"
#include "ground_main.h"
#include "ground_script.h"
#include "gulpin_shop_801FB50.h"
@ -124,7 +125,6 @@ void sub_8096BD0(void);
bool8 DrawCredits(s32 creditsCategoryIndex, s32);
u32 sub_8035574();
void sub_803565C(void);
void GroundMap_ExecuteEvent(s16, u32);
bool8 sub_8015080(u8 *buffer, const MenuItem *menuItems);
s32 sub_801516C();
void sub_80151A4();