sub_8068FE0

include/constants/monster.h

@@ -431,5 +431,6 @@
 #define MONSTER_MAX (MONSTER_RAYQUAZA_CUTSCENE + 1)
 
 #define IS_CASTFORM_FORM_MONSTER(id)((id == MONSTER_CASTFORM_SNOWY || id == MONSTER_CASTFORM_SUNNY || id == MONSTER_CASTFORM_RAINY))
+#define IS_DEOXYS_FORM_MONSTER(id)((id == MONSTER_DEOXYS_ATTACK || id == MONSTER_DEOXYS_DEFENSE || id == MONSTER_DEOXYS_SPEED))
 
 #endif  // GUARD_CONSTANTS_MONSTER_H

include/structs/str_dungeon.h

@@ -388,7 +388,8 @@ typedef struct Dungeon
     u32 unk18[(0xB8 - 0x18) / 4];
     Entity *unkB8;
     Entity *unkBC;
-    u8 fillC0[0x134 - 0xC0];
+    s32 unkC0;
+    u8 fillC4[0x134 - 0xC4];
     struct unkStruct_Dungeon134_sub unk134;
     /* 0x17C */ RGB colorRamp[COLOR_RAMP_COUNT];
     /* 0x57C */ unkDungeon57C unk57C;

ld_script.txt

@@ -234,7 +234,6 @@ SECTIONS {
         src/dungeon_menu_recruitment.o(.text);
         src/code_8066D04.o(.text);
         src/code_805D8C8.o(.text);
-        asm/code_805D8C8_1.o(.text);
         src/code_8069D4C.o(.text);
         src/targeting.o(.text);
         src/code_8069E0C.o(.text);

src/code_805D8C8.c

@@ -9,6 +9,7 @@
 #include "text.h"
 #include "moves.h"
 #include "string_format.h"
+#include "friend_area.h"
 #include "code_80450F8.h"
 #include "code_8045A00.h"
 #include "code_803E668.h"
@@ -19,6 +20,7 @@
 #include "dungeon_leader.h"
 #include "dungeon_message.h"
 #include "constants/dungeon.h"
+#include "constants/friend_area.h"
 
 // monster_sbin.s
 // data_8106A4C.s
@@ -347,4 +349,353 @@ void sub_8068A84(PokemonStruct1 *pokemon)
     }
 }
 
-//
+extern bool8 sub_806A564(s32 r0);
+extern void sub_808DFDC(s32 a1, PokemonStruct2* a2);
+extern void xxx_pokemon2_to_pokemonstruct_808DF44(PokemonStruct1*, PokemonStruct2*);
+extern void sub_8067A80(u8 a0, s32 a1, s32 a2, PokemonStruct1 **a3);
+extern bool8 sub_806A5A4(s32 r0);
+extern u8 sub_806A538(s32);
+
+extern const u8 *const gUnknown_80FE1A4;
+extern const u8 *const gUnknown_80FE20C;
+
+static inline bool8 IsUnkDungeon(u8 joinedDungeon)
+{
+    if (joinedDungeon == DUNGEON_POKEMON_SQUARE || joinedDungeon == DUNGEON_HOWLING_FOREST_2)
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_8068BDC(bool8 a0)
+{
+    bool8 spArr[NUM_FRIEND_AREAS];
+    PokemonStruct1 *monPointers[21];
+    PokemonStruct1 mon1Structs[MAX_TEAM_MEMBERS];
+    u16 arr2[18];
+    FriendAreaCapacity areaCapacity;
+    s32 i, j, id;
+
+    for (i = 0; i < NUM_FRIEND_AREAS; i++) {
+        spArr[i] = FALSE;
+    }
+
+    for (id = 0; id < MAX_TEAM_MEMBERS; id++) {
+        PokemonStruct2 *monPtr = &gRecruitedPokemonRef->pokemon2[id];
+        if (PokemonFlag1Struct2(monPtr) && !sub_806A564(monPtr->unkA)) {
+            Item *monItem = &monPtr->itemSlot;
+            if (ItemExists(monItem) && monItem->id == ITEM_POKE) {
+                AddToTeamMoney(GetMoneyValue(monItem));
+                ZeroOutItem(monItem);
+            }
+        }
+    }
+
+    for (id = 0; id < MAX_TEAM_MEMBERS; id++) {
+        PokemonStruct2 *monPtr = &gRecruitedPokemonRef->pokemon2[id];
+        if (PokemonFlag1Struct2(monPtr) && !sub_806A564(monPtr->unkA)) {
+            if (IS_CASTFORM_FORM_MONSTER(monPtr->speciesNum)) {
+                monPtr->speciesNum = MONSTER_CASTFORM;
+            }
+
+            if (sub_806A58C(monPtr->unkA)) {
+                if (IsLevelResetTo1(gDungeon->unk644.dungeonLocation.id)) {
+                    sub_808DFDC(monPtr->unkA, monPtr);
+                }
+                else {
+                    xxx_pokemon2_to_pokemonstruct_index_808DF2C(monPtr->unkA, monPtr);
+                }
+            }
+            else {
+                if (a0) {
+                    spArr[GetFriendArea(monPtr->speciesNum)] = TRUE;
+                }
+            }
+        }
+    }
+
+    for (i = 0; i < NUM_FRIEND_AREAS; i++) {
+        u8 friendAreaId = i;
+        if (!spArr[friendAreaId])
+            continue;
+
+        sub_8092404(friendAreaId, arr2, TRUE, TRUE);
+        GetFriendAreaCapacity2(friendAreaId, &areaCapacity, FALSE, FALSE);
+        for (j = 0; j < 21 && arr2[j] != 0xFFFF; j++) {
+            monPointers[j] = &gRecruitedPokemonRef->pokemon[arr2[j]];
+        }
+
+        for (id = 0; id < MAX_TEAM_MEMBERS; id++) {
+            PokemonStruct2 *monPtr = &gRecruitedPokemonRef->pokemon2[id];
+            if (PokemonFlag1Struct2(monPtr) && sub_806A5A4(monPtr->unkA) && GetFriendArea(monPtr->speciesNum) == friendAreaId && a0) {
+                monPointers[j] = &mon1Structs[id];
+                xxx_pokemon2_to_pokemonstruct_808DF44(monPointers[j], monPtr);
+                monPointers[j]->unk0 |= 0x4000;
+                monPointers[j]->unkC[0].level = 0;
+                monPointers[j]->unkC[1].level = 0;
+                j++;
+            }
+        }
+
+        if (j <= areaCapacity.maxPokemon) {
+            s32 k;
+            for (k = 0; k < j; k++) {
+                if (monPointers[k]->unk0 & 0x4000) {
+                    sub_808D1DC(monPointers[k]);
+                }
+            }
+        }
+        else {
+            WriteFriendAreaName(gFormatBuffer_Items[0], friendAreaId, FALSE);
+            DisplayDungeonMessage(NULL, gUnknown_80FE1A4, TRUE); // The Friend Area is full, a friend must be released.
+            while (1) {
+                sub_8067A80(friendAreaId, j - areaCapacity.maxPokemon, j, monPointers);
+                for (id = 0; id < j; id++) {
+                    PokemonStruct1 *monPtr = monPointers[id];
+                    if (PokemonFlag1(monPtr) && (monPtr->unk0 & 0x8000)) {
+                        if (IsUnkDungeon(monPtr->dungeonLocation.id)) {
+                            break;
+                        }
+                    }
+                }
+
+                if (id == j)
+                    break;
+                if (DisplayDungeonYesNoMessage(NULL, gUnknown_80FE20C, TRUE) == TRUE) // If you dismiss this mon, it may never join you again. Bid farewell to it?
+                    break;
+            }
+
+            for (id = 0; id < j; id++) {
+                if (PokemonFlag1(monPointers[id]) && (monPointers[id]->unk0 & 0x8000)) {
+                    monPointers[id]->unk0 = 0;
+                }
+            }
+            for (id = 0; id < j; id++) {
+                if (PokemonFlag1(monPointers[id]) && (monPointers[id]->unk0 & 0x4000)) {
+                    sub_808D1DC(monPointers[id]);
+                    monPointers[id]->unk0 = 0;
+                }
+            }
+        }
+    }
+}
+
+void sub_8068F28(void)
+{
+    s32 i;
+
+    for (i = 0; i < MAX_TEAM_MEMBERS; i++) {
+        PokemonStruct2 *monStruct2Ptr = &gRecruitedPokemonRef->pokemon2[i];
+        if(PokemonFlag1Struct2(monStruct2Ptr)) {
+            if (sub_806A564(monStruct2Ptr->unkA)) {
+                monStruct2Ptr->unk0 = 0;
+            }
+            else if (sub_806A538(monStruct2Ptr->unkA)) {
+                monStruct2Ptr->unk0 = 0;
+            }
+        }
+    }
+}
+
+void sub_8068F80(void)
+{
+    Entity *leader = GetLeader();
+    Dungeon *dungeon = gDungeon;
+
+    dungeon->unk644.unk28 = 0;
+    dungeon->unk644.unk29 = 0;
+    dungeon->unk644.unk2F = 0;
+    dungeon->unkC0 = 0;
+    if (leader != NULL) {
+        bool8 isShop = (GetTileAtEntitySafe(leader)->terrainType & TERRAIN_TYPE_SHOP) != 0;
+        dungeon->unk644.unk54 = isShop;
+        dungeon->unk644.unk55 = isShop;
+        sub_804AC20(&leader->pos);
+    }
+}
+
+static inline void ClearOnTeamFlag(PokemonStruct1 *mon)
+{
+    mon->unk0 &= ~(FLAG_ON_TEAM);
+}
+
+static inline void ClearMonItemId(PokemonStruct1 *mon)
+{
+    mon->heldItem.id = ITEM_NOTHING;
+}
+
+void sub_8068FE0(Entity *entity, s32 param_2, Entity *param_3)
+{
+    u16 joinId;
+    Entity EStack_a4;
+    s32 i;
+    s32 unkArg = (s16) param_2;
+    EntityInfo *entInfo = GetEntInfo(entity);
+    Tile *tile = GetTileAtEntitySafe(entity);
+    if (param_3 == NULL) {
+        sub_80457DC(&EStack_a4);
+        param_3 = &EStack_a4;
+    }
+    if (tile->monster == entity) {
+        tile->monster = NULL;
+    }
+
+    ShowDungeonMapAtPos(entity->pos.x,entity->pos.y);
+
+    for (i = 0; i < DUNGEON_MAX_POKEMON; i++) {
+        Entity *mon = gDungeon->activePokemon[i];
+        if (mon != NULL && EntityIsValid(mon)) {
+            EntityInfo *info = GetEntInfo(mon);
+            if (info->aiTarget.aiTarget == entity) {
+                info->aiTarget.aiTarget = NULL;
+            }
+        }
+    }
+    if (entInfo->curseClassStatus.status == STATUS_DECOY) {
+        gDungeon->decoyIsActive = FALSE;
+    }
+    if (entInfo->frozenClassStatus.status == STATUS_WRAP || entInfo->frozenClassStatus.status == STATUS_WRAPPED) {
+        sub_8076CB4(entInfo->unk9C);
+    }
+
+    sub_8078084(entity);
+    entity->unk22 = 0;
+    entity->isVisible = FALSE;
+    gLeaderPointer = NULL;
+    joinId = entInfo->joinedAt.id;
+    if (joinId == DUNGEON_JOIN_LOCATION_PARTNER && gDungeon->unk644.unk18 == 0) {
+        gDungeon->unk10 = 1;
+        entInfo->HP = 0;
+        SubstitutePlaceholderStringTags(gDungeon->faintStringBuffer,entity,0);
+        return;
+    }
+
+    #ifndef NONMATCHING
+    // Yeah, this is just agbcc at its finest...
+    joinId = entity->isVisible; joinId = entity->unk22;joinId = entity->isVisible; joinId = entity->unk22;joinId = entity->isVisible; joinId = entity->unk22;
+    #endif
+    if (entInfo->isTeamLeader) {
+        sub_803E708(0x3c,0x49);
+        DisplayMessageLog();
+        if (gDungeon->unk6 == 0) {
+            if (gDungeon->unk644.unk2A == 0
+                && unkArg != 0x21c
+                && unkArg != 0x222
+                && unkArg != 0x21e
+                && gDungeon->unk3A0D == 0
+                && gDungeon->unk644.unk37 >= 0
+                && gDungeon->unk644.unk34 != TRUE)
+            {
+                if (gDungeon->unk644.unk37 > 0) {
+                    if (DisplayDungeonYesNoMessage(NULL,*gUnknown_80FE268,1) == 1) {
+                        DisplayDungeonMessage(NULL,*gUnknown_80FE28C,1);
+                        gDungeon->unk4 = 1;
+                        gDungeon->unk6 = 1;
+                        gDungeon->unk644.unk10 = 1;
+                        gDungeon->unk644.unk37 -= 1;
+                        return;
+                    }
+                }
+                else {
+                    DisplayDungeonMessage(NULL,*gUnknown_80FE2D0,1);
+                }
+            }
+        }
+        else {
+            gDungeon->unk4 = 1;
+            gDungeon->unk6 = 1;
+            gDungeon->unk644.unk10 = 1;
+            return;
+        }
+
+        sub_8083AB0(unkArg,param_3,entity);
+        if (unkArg == 0x21f) {
+            EntityInfo *partnerInfo = NULL;
+            for (i = 0; i < MAX_TEAM_MEMBERS; i++) {
+                Entity *teamMon = gDungeon->teamPokemon[i];
+                if (EntityIsValid(teamMon)) {
+                    partnerInfo = GetEntInfo(teamMon);
+                    if (partnerInfo->joinedAt.id == DUNGEON_JOIN_LOCATION_PARTNER)
+                        break;
+                }
+            }
+            if (partnerInfo != NULL) {
+                PokemonStruct2 *partnerStruct = &gRecruitedPokemonRef->pokemon2[partnerInfo->teamIndex];
+                sub_806C264(partnerInfo->teamIndex,partnerInfo);
+                if (sub_806A58C(partnerStruct->unkA) != 0) {
+                    if (IsLevelResetTo1(gDungeon->unk644.dungeonLocation.id) == 0) {
+                        xxx_pokemon2_to_pokemonstruct_index_808DF2C(partnerStruct->unkA, partnerStruct);
+                    }
+                    if (!IsMakuhitaTrainingMaze()) {
+                        ClearMonItemId(&gRecruitedPokemonRef->pokemon[partnerStruct->unkA]);
+                    }
+                }
+                partnerStruct->unk0 = 0;
+            }
+        }
+    }
+
+    if (entInfo->isNotTeamMember) {
+        for (i = 0; i < entInfo->unk168; i++) {
+            gUnknown_202EE76[entInfo->unk167 + i] = 0;
+        }
+    }
+    else {
+        for (i = 0; i < entInfo->unk168; i++) {
+            gUnknown_202EE70[entInfo->unk167 + i] = 0;
+        }
+    }
+
+    if (entInfo->joinedAt.id == DUNGEON_JOIN_LOCATION_CLIENT_POKEMON) {
+        gDungeon->unk10 = 2;
+        SubstitutePlaceholderStringTags(gDungeon->faintStringBuffer,entity,0);
+    }
+    else if (entInfo->joinedAt.id == DUNGEON_RESCUE_TEAM_BASE) {
+        gDungeon->unk10 = 3;
+        SubstitutePlaceholderStringTags(gDungeon->faintStringBuffer,entity,0);
+    }
+
+    if (GetLeader() != NULL && unkArg != 0x21c && !entInfo->isTeamLeader && !gDungeon->unk10) {
+        sub_8084E00(entity,entInfo->monsterBehavior, unkArg == 500);
+        if (IS_DEOXYS_FORM_MONSTER(entInfo->apparentID) && !IsBossFight() && entInfo->isNotTeamMember) {
+            gDungeon->deoxysDefeat = 1;
+            DisplayDungeonLoggableMessageTrue(entity,*gUnknown_80FA580);
+            sub_803E178();
+            sub_8049ED4();
+        }
+    }
+
+    if (!entInfo->isNotTeamMember) {
+        PokemonStruct2 *mon2Ptr = &gRecruitedPokemonRef->pokemon2[entInfo->teamIndex];
+        sub_806C264(entInfo->teamIndex,entInfo);
+        if (sub_806A58C(mon2Ptr->unkA) != 0) {
+            bool8 uVar10;
+
+            if (IsLevelResetTo1(gDungeon->unk644.dungeonLocation.id) == 0) {
+                xxx_pokemon2_to_pokemonstruct_index_808DF2C(mon2Ptr->unkA, mon2Ptr);
+            }
+            if (!IsMakuhitaTrainingMaze()) {
+                ClearMonItemId(&gRecruitedPokemonRef->pokemon[mon2Ptr->unkA]);
+            }
+
+            uVar10 = FALSE;
+            if (entInfo->isTeamLeader) {
+                uVar10 = TRUE;
+            }
+            if (gDungeon->unk644.unk18 == 0 && entInfo->joinedAt.id == DUNGEON_JOIN_LOCATION_PARTNER) {
+                uVar10 = TRUE;
+            }
+
+            if (!uVar10) {
+                ClearOnTeamFlag(&gRecruitedPokemonRef->pokemon[mon2Ptr->unkA]);
+            }
+        }
+        mon2Ptr->unk0 = 0;
+    }
+
+    DeletePokemonDungeonSprite(entInfo->unk98);
+    gLeaderPointer = 0;
+    gDungeon->unkC = 1;
+    entity->type = ENTITY_NOTHING;
+    sub_8045ACC();
+}