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

correct file split dungeon ai items

Browse Source
This commit is contained in:
DizzyEggg
2025-03-31 11:01:44 +02:00
parent b22171dc63
commit 9cdb4e5982
6 changed files with 184 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/data_8107010.s
View File

@@ -2,9 +2,7 @@
.align 2
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"
.string "pksdir0\0"

3
ld_script.txt
View File

@@ -581,6 +581,9 @@ SECTIONS {
src/dungeon_logic.o(.rodata);
src/dungeon_8071B48.o(.rodata);
src/code_80718D8.o(.rodata);
src/dungeon_ai_leader.o(.rodata);
src/dungeon_8072CF4.o(.rodata);
src/dungeon_ai_items.o(.rodata);
data/data_8107010.o(.rodata);
src/dungeon_serializer.o(.rodata);
data/data_8107224.o(.rodata);

168
src/code_8073CF0.c
View File

@@ -35,10 +35,6 @@
extern bool8 sub_8044B28(void);
extern void sub_8075708(Entity *entity);
extern void DealDamageToEntity(Entity *, s32, u32, u32);
extern void sub_8067110(Entity *);
extern void sub_80671A0(Entity *);
extern void sub_8073D14(Entity *);
extern void sub_8045BF8(u8 *, Item *);
extern void sub_805229C(void);
extern void sub_807E8F0(Entity *);
extern void sub_80444F4(Entity *pokemon);
@@ -86,170 +82,6 @@ void sub_8075050(EntityInfo *info, Unk_Entity_x184 *strPtr);
static EWRAM_DATA s32 gUnknown_202F378 = 0;
void HandleEatAIAction(Entity *pokemon)
{
sub_8067110(pokemon);
}
void HandleThrowItemAIAction(Entity *pokemon)
{
sub_80671A0(pokemon);
}
void HandlePickUpAIAction(Entity *pokemon)
{
sub_8073D14(pokemon);
}
void sub_8073D14(Entity *entity)
{
Item *groundItem;
EntityInfo *_entityInfo;
EntityInfo *entityInfo = GetEntInfo(entity);
Entity *tileObject = GetTileAtEntitySafe(entity)->object;
if (tileObject == NULL)
return;
if (sub_8044B28())
return;
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], entity, 0);
if (entityInfo->isTeamLeader)
return;
if (entityInfo->shopkeeper == 1)
return;
if (IsExperienceLocked(entityInfo->joinedAt.id))
return;
if (entityInfo->monsterBehavior == BEHAVIOR_RESCUE_TARGET)
return;
_entityInfo = GetEntInfo(entity); // Reloaded as a new variable for some reason.
groundItem = GetItemData(tileObject);
if (groundItem->flags & ITEM_FLAG_IN_SHOP)
return;
if (ShouldMonsterRunAwayAndShowEffect(entity, TRUE)) {
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], entity, 0);
DisplayDungeonLoggableMessageTrue(entity, gMonTerrifiedCouldntPickUpItem);
}
else if (!_entityInfo->isNotTeamMember && GetItemCategory(groundItem->id) == CATEGORY_POKE) {
// Why check the same thing again?
if (_entityInfo->isNotTeamMember) {
PlaySoundEffect(0x14B);
}
else {
PlaySoundEffect(0x14C);
}
AddToTeamMoney(GetMoneyValue(groundItem));
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItem);
}
else {
s32 i, nItems, newInventoryId;
s32 inventoryIds[INVENTORY_SIZE + 1]; // plus held
Item *carriedItems[INVENTORY_SIZE + 1]; // plus held
s32 newQuantity;
if (gDungeon->unk644.hasInventory && !_entityInfo->isNotTeamMember) {
for (i = 0; i < INVENTORY_SIZE; i++) {
carriedItems[i] = &gTeamInventoryRef->teamItems[i];
inventoryIds[i] = i;
}
carriedItems[INVENTORY_SIZE] = &_entityInfo->heldItem;
inventoryIds[INVENTORY_SIZE] = -1;
nItems = INVENTORY_SIZE + 1;
}
else {
carriedItems[0] = &_entityInfo->heldItem;
inventoryIds[0] = -1;
nItems = 1;
}
if ((groundItem->id < 9) && !(groundItem->flags & ITEM_FLAG_IN_SHOP)) {
newInventoryId = -1;
newQuantity = -1;
for (i = 0; i < nItems; i++) {
if (carriedItems[i]->flags & ITEM_FLAG_EXISTS
&& !(carriedItems[i]->flags & ITEM_FLAG_IN_SHOP)
&& ((groundItem->id == carriedItems[i]->id) && (groundItem->flags & ITEM_FLAG_STICKY) == (carriedItems[i]->flags & ITEM_FLAG_STICKY))
&& carriedItems[i]->quantity != 99 && newQuantity < carriedItems[i]->quantity)
{
newQuantity = carriedItems[i]->quantity;
newInventoryId = i;
}
}
if (newInventoryId == -1) {
newQuantity = -1;
for (i = 0; i < nItems; i++) {
if (carriedItems[i]->flags & ITEM_FLAG_EXISTS
&& !(carriedItems[i]->flags & ITEM_FLAG_IN_SHOP)
&& groundItem->id == carriedItems[i]->id
&& carriedItems[i]->quantity != 99
&& newQuantity < carriedItems[i]->quantity)
{
newQuantity = carriedItems[i]->quantity;
newInventoryId = i;
}
}
}
if (newInventoryId != -1) {
s32 quantity = carriedItems[newInventoryId]->quantity + groundItem->quantity;
if (quantity >= 99)
quantity = 99;
carriedItems[newInventoryId]->quantity = quantity;
if (groundItem->flags & ITEM_FLAG_STICKY)
carriedItems[newInventoryId]->flags |= ITEM_FLAG_STICKY;
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
PlaySoundEffect(0x14A);
if (inventoryIds[newInventoryId] <= -1)
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItem2);
else
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItemToolbox);
return;
}
}
for (i = 0; i < nItems; i++) {
if (!(carriedItems[i]->flags & ITEM_FLAG_EXISTS))
break;
}
if (i == nItems) {
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
DisplayDungeonLoggableMessageTrue(entity, gMonSteppedOnItem);
}
else {
if (_entityInfo->isNotTeamMember) {
PlaySoundEffect(0x14B);
}
else {
PlaySoundEffect(0x14A);
}
if (inventoryIds[i] <= -1) {
_entityInfo->heldItem = *groundItem;
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItem2);
}
else if (AddItemToInventory(groundItem)) {
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], entity, 0);
DisplayDungeonLoggableMessageTrue(entity, gMonCouldntPickUpItem);
}
else {
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItemToolbox);
}
}
}
}
void sub_8074094(Entity *entity)
{
s32 rand;

1
src/dungeon_8072CF4.c
View File

@@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_ai_leader.h"
#include "dungeon_move_util.h"
#include "code_803E46C.h"

179
src/dungeon_ai_items.c
View File

@@ -1,5 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "constants/direction.h"
#include "constants/dungeon_action.h"
#include "constants/iq_skill.h"
@@ -19,6 +19,17 @@
#include "items.h"
#include "structs/str_position.h"
#include "position_util.h"
#include "string_format.h"
#include "dungeon_strings.h"
#include "dungeon_message.h"
#include "dungeon_music.h"
#include "dungeon_items.h"
#include "constants/dungeon.h"
extern void sub_8045BF8(u8 *, Item *);
extern void sub_8067110(Entity *);
extern void sub_80671A0(Entity *);
extern bool8 sub_8044B28(void);
#define NUM_POTENTIAL_ROCK_TARGETS 20
#define GROUND_ITEM_TOOLBOX_INDEX 0x80
@@ -38,6 +49,8 @@ EWRAM_DATA u32 gAIThrownItemProbabilities[NUM_DIRECTIONS] = {0};
extern TeamInventory *gTeamInventoryRef;
void sub_8073D14(Entity *);
void AIDecideUseItem(Entity *pokemon)
{
EntityInfo *pokemonInfo = GetEntInfo(pokemon);
@@ -405,3 +418,167 @@ void TargetThrownItem(Entity *pokemon, Entity *targetPokemon, Item *item, s32 ta
gAIThrowItemActionChoiceCount++;
}
}
void HandleEatAIAction(Entity *pokemon)
{
sub_8067110(pokemon);
}
void HandleThrowItemAIAction(Entity *pokemon)
{
sub_80671A0(pokemon);
}
void HandlePickUpAIAction(Entity *pokemon)
{
sub_8073D14(pokemon);
}
void sub_8073D14(Entity *entity)
{
Item *groundItem;
EntityInfo *_entityInfo;
EntityInfo *entityInfo = GetEntInfo(entity);
Entity *tileObject = GetTileAtEntitySafe(entity)->object;
if (tileObject == NULL)
return;
if (sub_8044B28())
return;
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], entity, 0);
if (entityInfo->isTeamLeader)
return;
if (entityInfo->shopkeeper == 1)
return;
if (IsExperienceLocked(entityInfo->joinedAt.id))
return;
if (entityInfo->monsterBehavior == BEHAVIOR_RESCUE_TARGET)
return;
_entityInfo = GetEntInfo(entity); // Reloaded as a new variable for some reason.
groundItem = GetItemData(tileObject);
if (groundItem->flags & ITEM_FLAG_IN_SHOP)
return;
if (ShouldMonsterRunAwayAndShowEffect(entity, TRUE)) {
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], entity, 0);
DisplayDungeonLoggableMessageTrue(entity, gMonTerrifiedCouldntPickUpItem);
}
else if (!_entityInfo->isNotTeamMember && GetItemCategory(groundItem->id) == CATEGORY_POKE) {
// Why check the same thing again?
if (_entityInfo->isNotTeamMember) {
PlaySoundEffect(0x14B);
}
else {
PlaySoundEffect(0x14C);
}
AddToTeamMoney(GetMoneyValue(groundItem));
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItem);
}
else {
s32 i, nItems, newInventoryId;
s32 inventoryIds[INVENTORY_SIZE + 1]; // plus held
Item *carriedItems[INVENTORY_SIZE + 1]; // plus held
s32 newQuantity;
if (gDungeon->unk644.hasInventory && !_entityInfo->isNotTeamMember) {
for (i = 0; i < INVENTORY_SIZE; i++) {
carriedItems[i] = &gTeamInventoryRef->teamItems[i];
inventoryIds[i] = i;
}
carriedItems[INVENTORY_SIZE] = &_entityInfo->heldItem;
inventoryIds[INVENTORY_SIZE] = -1;
nItems = INVENTORY_SIZE + 1;
}
else {
carriedItems[0] = &_entityInfo->heldItem;
inventoryIds[0] = -1;
nItems = 1;
}
if ((groundItem->id < 9) && !(groundItem->flags & ITEM_FLAG_IN_SHOP)) {
newInventoryId = -1;
newQuantity = -1;
for (i = 0; i < nItems; i++) {
if (carriedItems[i]->flags & ITEM_FLAG_EXISTS
&& !(carriedItems[i]->flags & ITEM_FLAG_IN_SHOP)
&& ((groundItem->id == carriedItems[i]->id) && (groundItem->flags & ITEM_FLAG_STICKY) == (carriedItems[i]->flags & ITEM_FLAG_STICKY))
&& carriedItems[i]->quantity != 99 && newQuantity < carriedItems[i]->quantity)
{
newQuantity = carriedItems[i]->quantity;
newInventoryId = i;
}
}
if (newInventoryId == -1) {
newQuantity = -1;
for (i = 0; i < nItems; i++) {
if (carriedItems[i]->flags & ITEM_FLAG_EXISTS
&& !(carriedItems[i]->flags & ITEM_FLAG_IN_SHOP)
&& groundItem->id == carriedItems[i]->id
&& carriedItems[i]->quantity != 99
&& newQuantity < carriedItems[i]->quantity)
{
newQuantity = carriedItems[i]->quantity;
newInventoryId = i;
}
}
}
if (newInventoryId != -1) {
s32 quantity = carriedItems[newInventoryId]->quantity + groundItem->quantity;
if (quantity >= 99)
quantity = 99;
carriedItems[newInventoryId]->quantity = quantity;
if (groundItem->flags & ITEM_FLAG_STICKY)
carriedItems[newInventoryId]->flags |= ITEM_FLAG_STICKY;
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
PlaySoundEffect(0x14A);
if (inventoryIds[newInventoryId] <= -1)
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItem2);
else
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItemToolbox);
return;
}
}
for (i = 0; i < nItems; i++) {
if (!(carriedItems[i]->flags & ITEM_FLAG_EXISTS))
break;
}
if (i == nItems) {
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
DisplayDungeonLoggableMessageTrue(entity, gMonSteppedOnItem);
}
else {
if (_entityInfo->isNotTeamMember) {
PlaySoundEffect(0x14B);
}
else {
PlaySoundEffect(0x14A);
}
if (inventoryIds[i] <= -1) {
_entityInfo->heldItem = *groundItem;
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItem2);
}
else if (AddItemToInventory(groundItem)) {
SubstitutePlaceholderStringTags(gFormatBuffer_Monsters[0], entity, 0);
DisplayDungeonLoggableMessageTrue(entity, gMonCouldntPickUpItem);
}
else {
sub_8045BF8(gFormatBuffer_Items[0], groundItem);
RemoveItemFromDungeonAt(&entity->pos, 1);
DisplayDungeonLoggableMessageTrue(entity, gMonPickedUpItemToolbox);
}
}
}
}

1
src/dungeon_ai_leader.c
View File

@@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon_ai_leader.h"
#include "constants/status.h"
#include "constants/targeting.h"