Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-09-29 12:27:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #331 from DizzyEggg/patch-4

Browse Source 
Fix nonmatching in sub_8044D90
This commit is contained in:
Seth Barberee
2025-02-19 07:18:25 -08:00
committed by GitHub
parent d70df01a8a 719776628a
commit 1b2d447053
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/code_8044CC8.c
View File

@@ -36,7 +36,7 @@ extern u8 GetFloorType(void);
void sub_80460F8(DungeonPos *, Item *, u32);
bool8 sub_80461C8(DungeonPos *, u32);
Item * sub_8044CC8(Entity *param_1, ActionParameter *param_2)
Item * sub_8044CC8(Entity *param_1, ActionParameter *param_2, UNUSED s32 a3)
{
const Tile *tile;
Item *item;
@@ -54,7 +54,8 @@ Item * sub_8044CC8(Entity *param_1, ActionParameter *param_2)
info = GetEntInfo(param_1);
}
else {
if (3 < (u8)(param_2->actionUseIndex + 0x70)) {
u8 id = param_2->actionUseIndex - 0x90;
if (3 < id) {
return NULL;
}
info = GetEntInfo(gDungeon->teamPokemon[param_2->actionUseIndex - 0x90]);
@@ -86,14 +87,10 @@ bool8 sub_8044D40(ActionContainer *param_1,s32 index)
return TRUE;
}
Item *sub_8044D90(Entity *entity, s32 index, s32 unused) {
Item *sub_8044D90(Entity *entity, s32 index, s32 unused)
{
EntityInfo *info = GetEntInfo(entity);
#ifdef NONMATCHING
ActionParameter *puVar1 = &info->action.actionParameters[index];
#else
register ActionParameter *puVar1 asm("r3") = &info->action.actionParameters[index];
#endif
return sub_8044CC8(entity, puVar1);
return sub_8044CC8(entity, &info->action.actionParameters[index], unused);
}
Entity *sub_8044DA4(Entity *entity, s32 index)