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

Renamed ActionParameter.lastItemThrowPosition

Browse Source
This commit is contained in:
AnonymousRandomPerson 2024-12-28 23:15:35 -06:00
parent 06a16a56c6
commit 39dff3a9ec
5 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/status.h
View File

@ -47,7 +47,7 @@
#define STATUS_CHARGING 11
#define STATUS_ENRAGED 12
// ReflectClassStatus statuses
// Reflect class statuses
#define STATUS_REFLECT 1
#define STATUS_SAFEGUARD 2
#define STATUS_LIGHT_SCREEN 3

2
include/structs/dungeon_entity.h
View File

@ -33,7 +33,7 @@
typedef struct ActionParameter
{
/* 0x0 */ u8 actionUseIndex;
/* 0x4 */ DungeonPos lastItemThrowPosition;
/* 0x4 */ DungeonPos itemPos;
} ActionParameter;
// size: 0x18

8
src/code_8044CC8.c
View File

@ -46,7 +46,7 @@ Item * sub_8044CC8(Entity *param_1, ActionParameter *param_2)
item = &gTeamInventoryRef->teamItems[param_2->actionUseIndex - 1];
}
else if (param_2->actionUseIndex == 0x80) {
tile = GetTile((param_2->lastItemThrowPosition).x,(param_2->lastItemThrowPosition).y);
tile = GetTile((param_2->itemPos).x,(param_2->itemPos).y);
item = GetItemData(tile->object);
}
else {
@ -81,7 +81,7 @@ bool8 sub_8044D40(ActionContainer *param_1,s32 index)
if (puVar1->actionUseIndex != 0x80) {
return FALSE;
}
sub_80461C8(&puVar1->lastItemThrowPosition,1);
sub_80461C8(&puVar1->itemPos,1);
}
return TRUE;
}
@ -120,7 +120,7 @@ void sub_8044DF0(Entity *entity, s32 index, u32 unused)
info = GetEntInfo(entity);
item = sub_8044D90(entity,index,unused);
if ((info->action).actionParameters[0].actionUseIndex == 0x80) {
sub_80461C8(&(info->action).actionParameters[0].lastItemThrowPosition,1);
sub_80461C8(&(info->action).actionParameters[0].itemPos,1);
}
else {
item->id = ITEM_NOTHING;
@ -144,7 +144,7 @@ void sub_8044E24(Entity *entity,int index,u32 unused)
if (GetItemCategory(itemPtr->id) == CATEGORY_TMS_HMS) {
if (info->action.actionParameters[index].actionUseIndex == 0x80) {
item = *itemPtr;
pos = &info->action.actionParameters[index].lastItemThrowPosition;
pos = &info->action.actionParameters[index].itemPos;
sub_80461C8(pos,1);
item.quantity = itemPtr->id - 125;
item.id = ITEM_TM_USED_TM;

16
src/code_805D8C8_1.c
View File

@ -413,8 +413,8 @@ void DungeonHandlePlayerInput(void)
if (ItemExists(&gTeamInventoryRef->teamItems[i]) && ItemSet(&gTeamInventoryRef->teamItems[i])) {
sub_8044C50(ACTION_THROW_ITEM_PLAYER);
leaderInfo->action.actionParameters[0].actionUseIndex = i +1;
leaderInfo->action.actionParameters[0].lastItemThrowPosition.x = 0;
leaderInfo->action.actionParameters[0].lastItemThrowPosition.y = 0;
leaderInfo->action.actionParameters[0].itemPos.x = 0;
leaderInfo->action.actionParameters[0].itemPos.y = 0;
break;
}
}
@ -1803,8 +1803,8 @@ bool8 sub_805FD74(Entity * a0, struct UnkMenuBitsStruct *a1)
};
sUnknownActionUnk4.actionUseIndex = 0;
sUnknownActionUnk4.lastItemThrowPosition.x = 0;
sUnknownActionUnk4.lastItemThrowPosition.y = 0;
sUnknownActionUnk4.itemPos.x = 0;
sUnknownActionUnk4.itemPos.y = 0;
if (a1 != NULL) {
var_2C = (a1->a0_8 != 0);
var_34 = (a1->a0_16 != 0);
@ -2255,8 +2255,8 @@ void sub_8060890(DungeonPos *a0)
break;
}
sUnknownActionUnk4.lastItemThrowPosition.x = a0->x;
sUnknownActionUnk4.lastItemThrowPosition.y = a0->y;
sUnknownActionUnk4.itemPos.x = a0->x;
sUnknownActionUnk4.itemPos.y = a0->y;
}
extern Item * sub_8044CC8(Entity *param_1, ActionParameter *param_2, UNUSED s32 a3);
@ -2457,8 +2457,8 @@ void sub_8060CE8(ActionContainer *a0)
SetMonsterActionFields(a0, gUnknown_202EE44[gUnknown_202EE10.menuIndex].unk0);
a0->actionParameters[0] = sUnknownActionUnk4;
a0->actionParameters[1].actionUseIndex = 0;
a0->actionParameters[1].lastItemThrowPosition.x = 0;
a0->actionParameters[1].lastItemThrowPosition.y = 0;
a0->actionParameters[1].itemPos.x = 0;
a0->actionParameters[1].itemPos.y = 0;
}
void sub_8060D24(UNUSED ActionContainer *a0)

24
src/dungeon_ai_items.c
View File

@ -97,8 +97,8 @@ void AIDecideUseItem(Entity *pokemon)
{
SetMonsterActionFields(&pokemonInfo->action, ACTION_THROW_ITEM_AI);
pokemonInfo->action.actionParameters[0].actionUseIndex = selectedToolboxIndex;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.y = pokemon->pos.y;
pokemonInfo->action.actionParameters[0].itemPos.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].itemPos.y = pokemon->pos.y;
pokemonInfo->action.direction = gAIThrownItemDirections[targetIndex] & DIRECTION_MASK;
break;
}
@ -121,8 +121,8 @@ void AIDecideUseItem(Entity *pokemon)
u32 chosenTargetIndex = DungeonRandInt(gAIThrowItemActionChoiceCount);
SetMonsterActionFields(&pokemonInfo->action, ACTION_THROW_ITEM_AI);
pokemonInfo->action.actionParameters[0].actionUseIndex = selectedToolboxIndex;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.y = pokemon->pos.y;
pokemonInfo->action.actionParameters[0].itemPos.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].itemPos.y = pokemon->pos.y;
pokemonInfo->action.direction = GetDirectionTowardsPosition(&pokemon->pos, &potentialTargetPositions[chosenTargetIndex]) & DIRECTION_MASK;
pokemonInfo->action.itemTargetPosition = potentialTargetPositions[chosenTargetIndex];
}
@ -134,8 +134,8 @@ void AIDecideUseItem(Entity *pokemon)
{
SetMonsterActionFields(&pokemonInfo->action, ACTION_EAT_AI);
pokemonInfo->action.actionParameters[0].actionUseIndex = selectedToolboxIndex;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.y = pokemon->pos.y;
pokemonInfo->action.actionParameters[0].itemPos.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].itemPos.y = pokemon->pos.y;
}
else
{
@ -206,8 +206,8 @@ void AIDecideUseItem(Entity *pokemon)
SetMonsterActionFields(&pokemonInfo->action, ACTION_EAT_AI);
}
pokemonInfo->action.actionParameters[0].actionUseIndex = selectedToolboxIndex;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.y = pokemon->pos.y;
pokemonInfo->action.actionParameters[0].itemPos.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].itemPos.y = pokemon->pos.y;
return;
}
}
@ -240,8 +240,8 @@ void AIDecideUseItem(Entity *pokemon)
u32 chosenTargetIndex = DungeonRandInt(gAIThrowItemActionChoiceCount);
SetMonsterActionFields(&pokemonInfo->action, ACTION_THROW_ITEM_AI);
pokemonInfo->action.actionParameters[0].actionUseIndex = selectedToolboxIndex;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.y = pokemon->pos.y;
pokemonInfo->action.actionParameters[0].itemPos.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].itemPos.y = pokemon->pos.y;
pokemonInfo->action.direction = GetDirectionTowardsPosition(&pokemon->pos, &potentialTargetPositions[chosenTargetIndex]) & DIRECTION_MASK;
pokemonInfo->action.itemTargetPosition = potentialTargetPositions[chosenTargetIndex];
return;
@ -257,8 +257,8 @@ void AIDecideUseItem(Entity *pokemon)
{
SetMonsterActionFields(&pokemonInfo->action, ACTION_THROW_ITEM_AI);
pokemonInfo->action.actionParameters[0].actionUseIndex = selectedToolboxIndex;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].lastItemThrowPosition.y = pokemon->pos.y;
pokemonInfo->action.actionParameters[0].itemPos.x = pokemon->pos.x;
pokemonInfo->action.actionParameters[0].itemPos.y = pokemon->pos.y;
pokemonInfo->action.direction = gAIThrownItemDirections[targetIndex] & DIRECTION_MASK;
return;
}