summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-04-01 17:54:30 -0500
committerGitHub <noreply@github.com>2019-04-01 17:54:30 -0500
commit4d938cb622a50a5f6659fccc69fca6da78e83ed4 (patch)
tree6ddfad5ea68e51bcf4065054ff78ff0db833ae73 /src
parent1e8e5af033008e901271b3769142b81a22ba0765 (diff)
parent08f4d3e105a77531c3d817b16d0797b2be885f7f (diff)
Merge pull request #642 from PikalaxALT/union_room_player_avatar
Union Room event objects
Diffstat (limited to 'src')
-rw-r--r--src/union_room.c9
-rw-r--r--src/union_room_player_avatar.c611
2 files changed, 613 insertions, 7 deletions
diff --git a/src/union_room.c b/src/union_room.c
index 8aeaaf6fb..ad33112e4 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -46,6 +46,7 @@
#include "union_room_chat.h"
#include "berry_crush.h"
#include "mystery_gift.h"
+#include "union_room_player_avatar.h"
EWRAM_DATA u8 gUnknown_02022C20[12] = {};
EWRAM_DATA u8 gUnknown_02022C2C = 0;
@@ -106,15 +107,12 @@ s8 mevent_message_print_and_prompt_yes_no(u8 *textState, u8 *arg1, u8 arg2, cons
bool32 sub_8016F1C(struct UnkLinkRfuStruct_02022B14 *arg0, s16 arg1);
u8 sub_8016DF0(struct UnkStruct_Main4 *arg0, struct UnkStruct_Main4 *arg1, u32 arg2);
void sub_8019F2C(void);
-void sub_8019E70(u8 *arg0, s32 arg1);
bool32 sub_80180A0(u32 monId, struct TradeUnkStruct *arg1);
void sub_80180E8(u32 monId, struct TradeUnkStruct *arg1);
-bool32 sub_801A2A8(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3);
void sub_80181CC(void);
bool32 sub_8017940(void);
u8 sub_8016B00(void);
void sub_801A274(struct UnkStruct_URoom *arg0);
-void sub_801A284(struct UnkStruct_URoom *arg0);
bool32 sub_8017FD8(struct UnkStruct_URoom *arg0);
void sub_801689C(struct UnkStruct_URoom *arg0);
u8 sub_80181DC(struct UnkStruct_URoom *arg0);
@@ -123,7 +121,6 @@ bool32 sub_801704C(void);
s32 sub_8017CF8(s32 arg1, struct UnkStruct_Main0 *arg0);
s32 sub_80179D4(struct UnkStruct_Main0 *arg0, u8 arg1, u8 arg2, u32 playerGender);
void sub_801818C(bool32 arg0);
-void sub_801A3D0(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2);
s32 sub_8017178(u8 *arg0, u8 *arg1, u8 *arg2, const struct WindowTemplate *winTemplate, const struct ListMenuTemplate *menuTemplate);
s32 sub_80172A0(u8 *arg0, u8 *arg1, u8 *arg2, u8 *arg3, const struct WindowTemplate *winTemplate, const struct ListMenuTemplate *menuTemplate, struct UnkStruct_Main0 *arg6);
s32 sub_8017CB0(struct UnkStruct_x20 * arg, s32 arg1);
@@ -133,12 +130,10 @@ void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2);
void sub_8017D9C(u8 *dst, s32 arg1, u32 playerGender);
u32 sub_80179AC(struct UnkStruct_x20 *arg0);
void sub_8017E00(u8 *dst, u8 arg1);
-void sub_8019F04(u8 *spriteIds);
-void sub_8019E3C(void);
void sub_80173B0(void);
s32 sub_8017D04(u32 type, u32 species);
bool32 sub_8017020(const u8 *src);
-void sub_8019BA8(void *);
+u8 sub_8019BA8(struct UnkStruct_8019BA8 * );
s32 sub_8017EA0(u8 *dst, u32 gender, u16 *arg2, struct UnkStruct_URoom *arg3);
void sub_801697C(u8 taskId);
bool8 sub_8017630(struct UnkStruct_Shared* arg0, const struct UnkStruct_Shared* arg1);
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
new file mode 100644
index 000000000..61be86a37
--- /dev/null
+++ b/src/union_room_player_avatar.c
@@ -0,0 +1,611 @@
+#include "global.h"
+#include "constants/flags.h"
+#include "constants/event_object_movement_constants.h"
+#include "event_data.h"
+#include "event_object_movement.h"
+#include "script.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "union_room.h"
+#include "task.h"
+
+EWRAM_DATA struct UnkStruct_8019BA8 * gUnknown_02022C64 = NULL;
+EWRAM_DATA u32 gUnknown_02022C68 = 0;
+
+static u8 sub_8019DF4(void);
+static u32 sub_8019F8C(u32 playerIdx, u32 arg1);
+static void sub_801A3B0(s32 arg0, s32 arg1, u8 arg2);
+
+ALIGNED(4) const u8 gUnknown_082F072C[][10] = {
+ {0x21, 0x2c, 0x1f, 0x23, 0x25, 0x24, 0x41, 0x42},
+ {0x22, 0x28, 0x20, 0x2f, 0x2f, 0x0e, 0x14, 0x2d}
+};
+
+static const s16 gUnknown_082F0740[][2] = {
+ {0x4, 0x6},
+ {0xd, 0x8},
+ {0xa, 0x6},
+ {0x1, 0x8},
+ {0xd, 0x4},
+ {0x7, 0x4},
+ {0x1, 0x4},
+ {0x7, 0x8}
+};
+
+static const s8 gUnknown_082F0760[][2] = {
+ { 0, 0},
+ { 1, 0},
+ { 0, -1},
+ {-1, 0},
+ { 0, 1}
+};
+
+static const u8 gUnknown_082F076A[] = {
+ 0x00, 0x02, 0x01, 0x04, 0x03
+};
+
+static const u8 gUnknown_082F076F[] = {
+ 0x01, 0x03, 0x01, 0x04, 0x02
+};
+
+static const u8 gUnknown_082F0774[] = {
+ 0x09, 0x08, 0x07, 0x02, 0x06, 0x05, 0x04, 0x03,
+ 0xbf, 0x02, 0xc0, 0x02, 0xc1, 0x02, 0xc2, 0x02,
+ 0xc3, 0x02, 0xc4, 0x02, 0xc5, 0x02, 0xc6, 0x02
+};
+
+static const u8 gUnknown_082F078C[2] = {
+ MOVEMENT_ACTION_FLY_UP,
+ MOVEMENT_ACTION_STEP_END
+};
+
+static const u8 gUnknown_082F078E[2] = {
+ MOVEMENT_ACTION_FLY_DOWN,
+ MOVEMENT_ACTION_STEP_END
+};
+
+static bool32 is_walking_or_running(void)
+{
+ if (gPlayerAvatar.tileTransitionState == 2 || gPlayerAvatar.tileTransitionState == 0)
+ {
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+static u8 sub_8019978(u32 a0, u32 a1)
+{
+ return gUnknown_082F072C[a0][a1 % 8];
+}
+
+static void sub_8019990(u32 a0, u32 a1, s32 * a2, s32 * a3)
+{
+ *a2 = gUnknown_082F0740[a0][0] + gUnknown_082F0760[a1][0] + 7;
+ *a3 = gUnknown_082F0740[a0][1] + gUnknown_082F0760[a1][1] + 7;
+}
+
+static bool32 sub_80199E0(u32 a0, u32 a1, s32 a2, s32 a3)
+{
+ if (gUnknown_082F0740[a0][0] + gUnknown_082F0760[a1][0] + 7 != a2)
+ {
+ return FALSE;
+ }
+ else if (gUnknown_082F0740[a0][1] + gUnknown_082F0760[a1][1] + 7 != a3)
+ {
+ return FALSE;
+ }
+ else
+ {
+ return TRUE;
+ }
+}
+
+static bool32 IsUnionRoomPlayerHidden(u32 player_idx)
+{
+ return FlagGet(FLAG_HIDE_UNION_ROOM_PLAYER_1 + player_idx);
+}
+
+static void HideUnionRoomPlayer(u32 player_idx)
+{
+ FlagSet(FLAG_HIDE_UNION_ROOM_PLAYER_1 + player_idx);
+}
+
+static void ShowUnionRoomPlayer(u32 player_idx)
+{
+ FlagClear(FLAG_HIDE_UNION_ROOM_PLAYER_1 + player_idx);
+}
+
+static void SetUnionRoomPlayerGfx(u32 playerIdx, u32 gfxId)
+{
+ VarSet(VAR_OBJ_GFX_ID_0 + playerIdx, gfxId);
+}
+
+static void CreateUnionRoomPlayerEventObject(u32 playerIdx)
+{
+ show_sprite(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+}
+
+static void RemoveUnionRoomPlayerEventObject(u32 playerIdx)
+{
+ RemoveEventObjectByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+}
+
+static bool32 SetUnionRoomPlayerEnterExitMovement(u32 playerIdx, const u8 * movement)
+{
+ u8 objectId;
+ struct EventObject * object;
+ if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId))
+ {
+ return FALSE;
+ }
+ object = &gEventObjects[objectId];
+ if (EventObjectIsMovementOverridden(object))
+ {
+ return FALSE;
+ }
+ if (EventObjectSetHeldMovement(object, *movement))
+ {
+ return FALSE;
+ }
+ return TRUE;
+}
+
+static bool32 sub_8019B3C(u32 playerIdx)
+{
+ u8 objectId;
+ struct EventObject * object;
+ if (TryGetEventObjectIdByLocalIdAndMap(gUnknown_082F0774[playerIdx], gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectId))
+ {
+ return TRUE;
+ }
+ object = &gEventObjects[objectId];
+ if (!EventObjectClearHeldMovementIfFinished(object))
+ {
+ return FALSE;
+ }
+ if (!ScriptContext2_IsEnabled())
+ {
+ UnfreezeEventObject(object);
+ }
+ else
+ {
+ FreezeEventObject(object);
+ }
+ return TRUE;
+}
+
+u8 sub_8019BA8(struct UnkStruct_8019BA8 * ptr)
+{
+ s32 i;
+
+ gUnknown_02022C68 = 0;
+ gUnknown_02022C64 = ptr;
+ for (i = 0; i < 8; i++)
+ {
+ ptr[i].field_0 = 0;
+ ptr[i].field_1 = 0;
+ ptr[i].field_2 = 0;
+ ptr[i].field_3 = 0;
+ }
+ return sub_8019DF4();
+}
+
+static bool32 sub_8019BDC(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr)
+{
+ switch (*a0)
+ {
+ case 0:
+ if (SetUnionRoomPlayerEnterExitMovement(playerIdx, gUnknown_082F078C) == TRUE)
+ {
+ HideUnionRoomPlayer(playerIdx);
+ (*a0)++;
+ }
+ break;
+ case 1:
+ if (sub_8019B3C(playerIdx))
+ {
+ RemoveUnionRoomPlayerEventObject(playerIdx);
+ HideUnionRoomPlayer(playerIdx);
+ *a0 = 0;
+ return TRUE;
+ }
+ break;
+ }
+ return FALSE;
+}
+
+static bool32 sub_8019C38(s8 * a0, u32 playerIdx, struct UnkStruct_8019BA8 * ptr)
+{
+ s16 x, y;
+
+ switch (*a0)
+ {
+ case 0:
+ if (!is_walking_or_running())
+ {
+ break;
+ }
+ PlayerGetDestCoords(&x, &y);
+ if (sub_80199E0(playerIdx, 0, x, y) == 1)
+ {
+ break;
+ }
+ player_get_pos_including_state_based_drift(&x, &y);
+ if (sub_80199E0(playerIdx, 0, x, y) == 1)
+ {
+ break;
+ }
+ SetUnionRoomPlayerGfx(playerIdx, ptr->field_1);
+ CreateUnionRoomPlayerEventObject(playerIdx);
+ ShowUnionRoomPlayer(playerIdx);
+ (*a0)++;
+ // fallthrough
+ case 3: // incorrect?
+ if (SetUnionRoomPlayerEnterExitMovement(playerIdx, gUnknown_082F078E) == 1)
+ {
+ (*a0)++;
+ }
+ break;
+ case 2:
+ if (sub_8019B3C(playerIdx))
+ {
+ *a0 = 0;
+ return TRUE;
+ }
+ break;
+ }
+ return FALSE;
+}
+
+static bool32 sub_8019CF0(u32 playerIdx, u32 a1, u32 a2)
+{
+ struct UnkStruct_8019BA8 * ptr = &gUnknown_02022C64[playerIdx];
+ ptr->field_3 = 1;
+ ptr->field_1 = sub_8019978(a1, a2);
+ if (ptr->field_0 == 0)
+ {
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+static bool32 sub_8019D20(u32 playerIdx)
+{
+ struct UnkStruct_8019BA8 * ptr = &gUnknown_02022C64[playerIdx];
+ ptr->field_3 = 2;
+ if (ptr->field_0 == 1)
+ {
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+static void sub_8019D44(u32 playerIdx, struct UnkStruct_8019BA8 * ptr)
+{
+ switch (ptr->field_0)
+ {
+ case 0:
+ if (ptr->field_3 == 1)
+ {
+ ptr->field_0 = 2;
+ ptr->field_2 = 0;
+ }
+ else
+ {
+ break;
+ }
+ // fallthrough
+ case 2:
+ if (!sub_8019F8C(playerIdx, 0) && ptr->field_3 == 2)
+ {
+ ptr->field_0 = 0;
+ ptr->field_2 = 0;
+ RemoveUnionRoomPlayerEventObject(playerIdx);
+ HideUnionRoomPlayer(playerIdx);
+ }
+ else if (sub_8019C38(&ptr->field_2, playerIdx, ptr) == 1)
+ {
+ ptr->field_0 = 1;
+ }
+ break;
+ case 1:
+ if (ptr->field_3 == 2)
+ {
+ ptr->field_0 = 3;
+ ptr->field_2 = 0;
+ }
+ else
+ {
+ break;
+ }
+ // fallthrough
+ case 3:
+ if (sub_8019BDC(&ptr->field_2, playerIdx, ptr) == 1)
+ {
+ ptr->field_0 = 0;
+ }
+ break;
+ }
+ ptr->field_3 = 0;
+}
+
+static void sub_8019DD0(u8 taskId)
+{
+ s32 i;
+ for (i = 0; i < 8; i++)
+ {
+ sub_8019D44(i, &gUnknown_02022C64[i]);
+ }
+}
+
+static u8 sub_8019DF4(void)
+{
+ if (FuncIsActiveTask(sub_8019DD0) == 1)
+ {
+ return NUM_TASKS;
+ }
+ else
+ {
+ return CreateTask(sub_8019DD0, 5);
+ }
+}
+
+static void sub_8019E20(void)
+{
+ u8 taskId = FindTaskIdByFunc(sub_8019DD0);
+ if (taskId < NUM_TASKS)
+ {
+ DestroyTask(taskId);
+ }
+}
+
+void sub_8019E3C(void)
+{
+ s32 i;
+ for (i = 0; i < 8; i++)
+ {
+ if (!IsUnionRoomPlayerHidden(i))
+ {
+ RemoveUnionRoomPlayerEventObject(i);
+ HideUnionRoomPlayer(i);
+ }
+ }
+ gUnknown_02022C64 = NULL;
+ sub_8019E20();
+}
+
+void sub_8019E70(u8 * sp8, s32 r9)
+{
+ s32 r7;
+
+ for (r7 = 0; r7 < 5; r7++)
+ {
+ s32 r5 = 5 * r9 + r7;
+ sp8[r5] = sprite_new(0x41, r5 - 0x38, gUnknown_082F0740[r9][0] + gUnknown_082F0760[r7][0], gUnknown_082F0740[r9][1] + gUnknown_082F0760[r7][1], 3, 1);
+ sub_8097C44(r5 - 0x38, TRUE);
+ }
+}
+
+void sub_8019F04(u8 * r5)
+{
+ s32 i;
+ for (i = 0; i < 40; i++)
+ {
+ DestroySprite(&gSprites[r5[i]]);
+ }
+}
+
+void sub_8019F2C(void)
+{
+ s32 i, j, x, y;
+ for (i = 0; i < 8; i++)
+ {
+ for (j = 0; j < 5; j++)
+ {
+ sub_8019990(i, j, &x, &y);
+ sub_8088B94(x, y, 0);
+ }
+ }
+}
+
+static u8 sub_8019F64(u32 r1, u32 unused, struct UnkLinkRfuStruct_02022B14 * r2)
+{
+ if (r1 != 0)
+ {
+ return gUnknown_082F076F[r1];
+ }
+ else if (r2->unk_0a_0 == 0x45)
+ {
+ return 1;
+ }
+ else
+ {
+ return 4;
+ }
+}
+
+static u32 sub_8019F8C(u32 a0, u32 a1)
+{
+ return sub_8097C8C(5 * a0 + a1 - 0x38);
+}
+
+static void sub_8019FA4(u32 r5, u32 r6, u8 r8, struct UnkLinkRfuStruct_02022B14 * r9)
+{
+ s32 x, y;
+ s32 r7 = 5 * r5 + r6;
+ if (sub_8019F8C(r5, r6) == 1)
+ {
+ sub_8097C44(r7 - 0x38, FALSE);
+ sub_8097CC4(r7 - 0x38, 1);
+ }
+ sub_8097BB4(r7 - 0x38, r8);
+ sub_801A3B0(r6, r5, sub_8019F64(r6, r5, r9));
+ sub_8019990(r5, r6, &x, &y);
+ sub_8088B94(x, y, 1);
+}
+
+static void sub_801A02C(u32 a0, u32 a1)
+{
+ s32 x, y;
+ sub_8097CC4(5 * a0 + a1 - 0x38, 2);
+ sub_8019990(a0, a1, &x, &y);
+ sub_8088B94(x, y, 0);
+}
+
+static void sub_801A064(u32 r7, struct UnkLinkRfuStruct_02022B14 * r8)
+{
+ s16 x, y, x2, y2;
+ s32 i;
+
+ PlayerGetDestCoords(&x, &y);
+ player_get_pos_including_state_based_drift(&x2, &y2);
+ if (sub_8097C8C(5 * r7 - 0x38) == 1)
+ {
+ if (sub_80199E0(r7, 0, x, y) == 1 || sub_80199E0(r7, 0, x2, y2) == 1)
+ {
+ return;
+ }
+ sub_8019FA4(r7, 0, sub_8019978(r8->playerGender, r8->unk_00.playerTrainerId[0]), r8);
+ }
+ for (i = 1; i < 5; i++)
+ {
+ if (r8->unk_04[i - 1] == 0)
+ {
+ sub_801A02C(r7, i);
+ }
+ else if (sub_80199E0(r7, i, x, y) == 0 && sub_80199E0(r7, i, x2, y2) == 0)
+ {
+ sub_8019FA4(r7, i, sub_8019978((r8->unk_04[i - 1] >> 3) & 1, r8->unk_04[i - 1] & 7), r8);
+ }
+ }
+}
+
+static void sub_801A16C(u32 r5, struct UnkLinkRfuStruct_02022B14 * r4)
+{
+ u32 i;
+ switch (r4->unk_0a_0)
+ {
+ case 0x40:
+ case 0x54:
+ sub_8019CF0(r5, r4->playerGender, r4->unk_00.playerTrainerId[0]);
+ for (i = 0; i < 5; i++)
+ {
+ sub_801A02C(r5, i);
+ }
+ break;
+ case 0x41:
+ case 0x44:
+ case 0x45:
+ case 0x48:
+ case 0x51:
+ case 0x52:
+ case 0x53:
+ sub_8019D20(r5);
+ sub_801A064(r5, r4);
+ break;
+ }
+}
+
+static void sub_801A214(u32 r5, struct UnkLinkRfuStruct_02022B14 * unused)
+{
+ s32 i;
+ sub_8019D20(r5);
+ for (i = 0; i < 5; i++)
+ {
+ sub_801A02C(r5, i);
+ }
+}
+
+static void sub_801A234(struct UnkStruct_URoom *r0)
+{
+ s32 i;
+ struct UnkStruct_x20 * r4;
+ gUnknown_02022C68 = 0;
+ for (i = 0, r4 = r0->field_0->arr; i < 8; i++)
+ {
+ if (r4[i].field_1A_0 == 1)
+ {
+ sub_801A16C(i, &r4[i].unk.field_0);
+ }
+ else if (r4[i].field_1A_0 == 2)
+ {
+ sub_801A214(i, &r4[i].unk.field_0);
+ }
+ }
+}
+
+void sub_801A274(struct UnkStruct_URoom *unused)
+{
+ gUnknown_02022C68 = 300;
+}
+
+void sub_801A284(struct UnkStruct_URoom *r2)
+{
+ if (++gUnknown_02022C68 > 300)
+ {
+ sub_801A234(r2);
+ }
+}
+
+bool32 sub_801A2A8(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3)
+{
+ s16 x, y;
+ s32 i, j;
+ struct UnkStruct_x20 * r4;
+ if (!is_walking_or_running())
+ {
+ return FALSE;
+ }
+ GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
+ for (i = 0, r4 = arg0->arr; i < 8; i++)
+ {
+ for (j = 0; j < 5; j++)
+ {
+ s32 r3 = 5 * i + j;
+ if (x != gUnknown_082F0740[i][0] + gUnknown_082F0760[j][0] + 7)
+ {
+ continue;
+ }
+ if (y != gUnknown_082F0740[i][1] + gUnknown_082F0760[j][1] + 7)
+ {
+ continue;
+ }
+ if (sub_8097C8C(r3 - 0x38) != 0)
+ {
+ continue;
+ }
+ if (sub_8097D9C(r3 - 0x38) != 0)
+ {
+ continue;
+ }
+ if (r4[i].field_1A_0 != 1)
+ {
+ continue;
+ }
+ sub_801A3B0(j, i, gUnknown_082F076A[GetPlayerFacingDirection()]);
+ *arg1 = j;
+ *arg2 = i;
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+static void sub_801A3B0(s32 arg0, s32 arg1, u8 arg2)
+{
+ sub_8097B78(5 * arg1 - 0x38 + arg0, arg2);
+}
+
+void sub_801A3D0(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2)
+{
+ return sub_801A3B0(arg0, arg1, sub_8019F64(arg0, arg1, &arg2->arr[arg1].unk.field_0));
+}