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

remove GROUND_SCRIPT_INCOMPLETE_DECLARATIONS

Browse Source
This commit is contained in:
DizzyEggg
2024-11-29 11:11:37 +01:00
parent 2d4127bd57
commit 86c247954e
5 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/code_80A26CC.h
View File

@@ -23,12 +23,7 @@ void sub_80A2558(s32, s16 *);
void sub_80A2584(s16, s16);
void sub_80A2598(s16, s16);
u32 sub_80A25AC(u16);
#if !defined(NONMATCHING) && defined(GROUND_SCRIPT_INCOMPLETE_DECLARATIONS)
// Workaround for ExecuteScriptCommand relying on s32 behavior of arguments
const DungeonInfo *GetDungeonInfo_80A2608(s32 index);
#else
const DungeonInfo *GetDungeonInfo_80A2608(s16 index);
#endif
const DungeonInfo *sub_80A2620(s16 index);
s16 sub_80A2654(s16 index);
s16 sub_80A2668(u32);

9
include/ground_main.h
View File

@@ -14,17 +14,8 @@ typedef struct GroundConversionStruct
bool8 sub_8098F88(void);
const char *sub_8098FB4(void);
#if !defined(NONMATCHING) && defined(GROUND_SCRIPT_INCOMPLETE_DECLARATIONS)
// Workaround for ExecuteScriptCommand relying on s32 behavior of arguments
// Arguments could be left fully implicit (as I think they were in the original code),
// but this way at least verifies the argument count
bool8 GroundMainGroundRequest(s32 r0, s32 r1, s32 r2);
bool8 GroundMainRescueRequest(s32 r0, s32 r1);
#else
bool8 GroundMainGroundRequest(s16 r0, u32 r1, s32 r2);
bool8 GroundMainRescueRequest(s16 r0, u32 r1);
#endif
bool32 GroundMainGameEndRequest(u32 r0);
bool32 GroundMainGameCancelRequest(u32 r0);
bool8 sub_8098D80(u32 speed);

5
src/code_80A26CC.c
View File

@@ -78,8 +78,9 @@ u32 sub_80A25AC(u16 param_1)
return 1;
}
const DungeonInfo *GetDungeonInfo_80A2608(s16 index)
const DungeonInfo *GetDungeonInfo_80A2608(s32 _index)
{
s32 index = (s16) _index;
return &gUnknown_81168A8[index];
}
@@ -186,7 +187,7 @@ u8 sub_80A2740(s32 index)
{
const DungeonInfo *temp;
temp = GetDungeonInfo_80A2608(index);
temp = GetDungeonInfo_80A2608((s16) index);
return temp->dungeonIndex;
}

10
src/ground_main.c
View File

@@ -139,10 +139,9 @@ void sub_8098CC8(void)
ClearAllItems_8091FB4();
}
bool8 GroundMainGroundRequest(s16 r0, u32 r1, s32 r2)
bool8 GroundMainGroundRequest(s32 r0, s32 r1, s32 r2)
{
s32 temp;
temp = r0; // force a asr shift
s32 temp = (s16) r0; // force a asr shift
if(gUnknown_20398A8 == 0)
{
Log(0, sFmtGroundRequest, temp, r2);
@@ -191,9 +190,10 @@ bool8 sub_8098DCC(u32 speed)
return FALSE;
}
bool8 GroundMainRescueRequest(s16 r0, u32 r1)
bool8 GroundMainRescueRequest(s32 r0, s32 r1)
{
s32 r2 = r0, r5 = r2;
s32 r2 = (s16) r0;
s32 r5 = r2;
if(gUnknown_20398A8 == 0)
{
Log(0, sFmtRescueRequest, r2, r1);

9
src/ground_script_1.c
View File

@@ -13,11 +13,6 @@
#include "exclusive_pokemon.h"
#include "items.h"
#include "math.h"
#ifndef NONMATCHING
#define GROUND_SCRIPT_INCOMPLETE_DECLARATIONS
#endif
#include "ground_main.h"
#include "code_80A26CC.h"
@@ -1838,10 +1833,10 @@ s32 ExecuteScriptCommand(Action *action) {
UNUSED u32 sub_80A1440(u32 r0, u32 r1, u32 r2)
{
return sub_80A14E8(0, r0, r1, r2);
return sub_80A14E8(0, r0, r1, r2);
}
UNUSED bool8 GroundScript_ExecuteTrigger(s16 r0)
UNUSED bool8 GroundScript_ExecuteTrigger(s16 r0)
{
s32 ret;
ScriptInfoSmall scriptInfo;