From 85040e26fd82003e69aad6caac9d512319871877 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Feb 2019 17:37:41 -0600 Subject: [PATCH 1/7] Document battle pike --- include/global.h | 8 +- src/battle_factory.c | 2 - src/battle_pike.c | 759 ++++++++++++++++++++++--------------------- src/battle_pyramid.c | 6 +- 4 files changed, 398 insertions(+), 377 deletions(-) diff --git a/include/global.h b/include/global.h index 831b83042..bbf5d5e0a 100644 --- a/include/global.h +++ b/include/global.h @@ -356,10 +356,10 @@ struct BattleFrontier /*0xE04*/ u16 pikeWinStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2]; - /*0xE10*/ u8 field_E10_1:3; - /*0xE10*/ u8 field_E10_2:4; - /*0xE10*/ u8 field_E10_3:1; - /*0xE12*/ u16 field_E12[3]; + /*0xE10*/ u8 pikeHintedRoomIndex:3; + /*0xE10*/ u8 pikeHintedRoomType:4; + /*0xE10*/ u8 pikeHealingRoomsDisabled:1; + /*0xE12*/ u16 pikeHeldItemsBackup[3]; /*0xE18*/ u16 pyramidRewardItem; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; diff --git a/src/battle_factory.c b/src/battle_factory.c index 170a1b91e..d08ffe6e6 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -333,7 +333,6 @@ static void GenerateOpponentMons(void) for (k = firstMonId; k < firstMonId + i; k++) { - // BUG: Small undefined behavior bug, since species array values were not initialized. if (species[k] == gFacilityTrainerMons[monSetId].species) break; } @@ -342,7 +341,6 @@ static void GenerateOpponentMons(void) for (k = firstMonId; k < firstMonId + i; k++) { - // BUG: Small undefined behavior bug, since heldItems array values were not initialized. if (heldItems[k] != 0 && heldItems[k] == gBattleFrontierHeldItems[gFacilityTrainerMons[monSetId].itemTableId]) break; } diff --git a/src/battle_pike.c b/src/battle_pike.c index a93a5725d..f2f2025d7 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -16,6 +16,7 @@ #include "constants/event_objects.h" #include "constants/battle_frontier.h" #include "constants/abilities.h" +#include "constants/easy_chat.h" #include "constants/layouts.h" #include "constants/rgb.h" #include "constants/trainers.h" @@ -36,12 +37,12 @@ #define PIKE_STATUS_KIRLIA 0 #define PIKE_STATUS_DUSCLOPS 1 -struct Unk0861231C +struct PikeRoomNPC { - u16 unk0; - u8 unk2; - u8 unk3; - u8 unk4; + u16 graphicsId; + u8 speechId1; + u8 speechId2; + u8 speechId3; }; struct PikeWildMon @@ -56,50 +57,50 @@ static IWRAM_DATA u8 sRoomType; static IWRAM_DATA u8 sStatusMon; static IWRAM_DATA bool8 sUnknown_0300128E; static IWRAM_DATA u32 sStatusFlags; -static IWRAM_DATA u8 sUnknown_03001294; +static IWRAM_DATA u8 sNpcId; // This file's functions. -static void sub_81A705C(void); -static void sub_81A7140(void); -static void sub_81A7248(void); -static void sub_81A73B8(void); -static void sub_81A7070(void); -static void sub_81A73EC(void); +static void SetRoomType(void); +static void GetBattlePikeData(void); +static void SetBattlePikeData(void); +static void GetInFinalRoom(void); +static void SetupRoomEventObjects(void); +static void GetRoomType(void); static void sub_81A7400(void); static void sub_81A740C(void); static void sub_81A7418(void); static void nullsub_76(void); static void nullsub_124(void); -static void sub_81A7468(void); -static void sub_81A74CC(void); -static void sub_81A74E0(void); -static void sub_81A7508(void); -static void sub_81A7580(void); -static void sub_81A8090(void); -static void sub_81A80DC(void); -static void sub_81A825C(void); -static void sub_81A827C(void); -static void sub_81A84B4(void); -static void sub_81A84EC(void); -static void sub_81A863C(void); -static void sub_81A8658(void); -static void sub_81A869C(void); -static void sub_81A86C0(void); -static void sub_81A8794(void); -static void sub_81A87E8(void); -static void sub_81A8830(void); +static void GetRoomInflictedStatus(void); +static void GetRoomInflictedStatusMon(void); +static void HealOneOrTwoMons(void); +static void BufferNPCMessage(void); +static void StatusInflictionScreenFade(void); +static void GetInBattlePike(void); +static void SetHintedRoom(void); +static void GetHintedRoomIndex(void); +static void GetRoomTypeHint(void); +static void ClearPikeTrainerIds(void); +static void BufferRecordMixingTrainerMessage(void); +static void GetCurrentRoomPikeQueenFightType(void); +static void HealSomeMonsBeforePikeQueen(void); +static void SetHealingRoomsDisabled(void); +static void CanAnyPartyMonsBeHealed(void); +static void BackupMonHeldItems(void); +static void RestoreMonHeldItems(void); +static void InitPikeChallenge(void); static u8 GetNextRoomType(void); static void PrepareOneTrainer(bool8 difficult); -static u16 sub_81A7B58(void); +static u16 GetNPCRoomGraphicsId(void); static void PrepareTwoTrainers(void); static void TryHealMons(u8 healCount); -static void sub_81A7EE4(u8 taskId); +static void Task_DoStatusInflictionScreenFade(u8 taskId); static bool8 AtLeastTwoAliveMons(void); static u8 SpeciesToPikeMonId(u16 species); static bool8 CanEncounterWildMon(u8 monLevel); -static u8 sub_81A8590(u8); -static bool8 sub_81A7D8C(struct Task *task); -static bool8 sub_81A7DE8(struct Task *task); +static u8 GetPikeQueenFightType(u8); +static bool8 StatusInflictionFadeOut(struct Task *task); +static bool8 StatusInflictionFadeIn(struct Task *task); // Const rom data. static const struct PikeWildMon sLvl50_Mons1[] = @@ -276,253 +277,264 @@ static const struct PikeWildMon *const *const sWildMons[2] = [FRONTIER_LVL_OPEN] = sLvlOpenMons }; -static const struct Unk0861231C gUnknown_0861231C[] = +static const struct PikeRoomNPC sNPCTable[] = { { - .unk0 = 0x0012, - .unk2 = 0x03, - .unk3 = 0x05, - .unk4 = 0x06 + .graphicsId = EVENT_OBJ_GFX_POKEFAN_F, + .speechId1 = 3, + .speechId2 = 5, + .speechId3 = 6 }, { - .unk0 = 0x0005, - .unk2 = 0x0d, - .unk3 = 0x20, - .unk4 = 0x25 + .graphicsId = EVENT_OBJ_GFX_NINJA_BOY, + .speechId1 = 13, + .speechId2 = 32, + .speechId3 = 37 }, { - .unk0 = 0x0011, - .unk2 = 0x08, - .unk3 = 0x0b, - .unk4 = 0x0c + .graphicsId = EVENT_OBJ_GFX_FAT_MAN, + .speechId1 = 8, + .speechId2 = 11, + .speechId3 = 12 }, { - .unk0 = 0x0024, - .unk2 = 0x22, - .unk3 = 0x1e, - .unk4 = 0x21 + .graphicsId = EVENT_OBJ_GFX_BUG_CATCHER, + .speechId1 = 34, + .speechId2 = 30, + .speechId3 = 33 }, { - .unk0 = 0x0015, - .unk2 = 0x00, - .unk3 = 0x00, - .unk4 = 0x00 + .graphicsId = EVENT_OBJ_GFX_EXPERT_M, + .speechId1 = 0, + .speechId2 = 0, + .speechId3 = 0 }, { - .unk0 = 0x001e, - .unk2 = 0x01, - .unk3 = 0x01, - .unk4 = 0x01 + .graphicsId = EVENT_OBJ_GFX_OLD_WOMAN, + .speechId1 = 1, + .speechId2 = 1, + .speechId3 = 1 }, { - .unk0 = 0x002c, - .unk2 = 0x16, - .unk3 = 0x17, - .unk4 = 0x1b + .graphicsId = EVENT_OBJ_GFX_BLACK_BELT, + .speechId1 = 22, + .speechId2 = 23, + .speechId3 = 27 }, { - .unk0 = 0x0037, - .unk2 = 0x08, - .unk3 = 0x16, - .unk4 = 0x1f + .graphicsId = EVENT_OBJ_GFX_HIKER, + .speechId1 = 8, + .speechId2 = 22, + .speechId3 = 31 }, { - .unk0 = 0x000e, - .unk2 = 0x0d, - .unk3 = 0x27, - .unk4 = 0x15 + .graphicsId = EVENT_OBJ_GFX_GIRL_3, + .speechId1 = 13, + .speechId2 = 39, + .speechId3 = 21 }, { - .unk0 = 0x0014, - .unk2 = 0x02, - .unk3 = 0x04, - .unk4 = 0x11 + .graphicsId = EVENT_OBJ_GFX_WOMAN_2, + .speechId1 = 2, + .speechId2 = 4, + .speechId3 = 17 }, { - .unk0 = 0x0038, - .unk2 = 0x1e, - .unk3 = 0x14, - .unk4 = 0x24 + .graphicsId = EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, + .speechId1 = 30, + .speechId2 = 20, + .speechId3 = 36 }, { - .unk0 = 0x0042, - .unk2 = 0x1c, - .unk3 = 0x22, - .unk4 = 0x19 + .graphicsId = EVENT_OBJ_GFX_MAN_5, + .speechId1 = 28, + .speechId2 = 34, + .speechId3 = 25 }, { - .unk0 = 0x0026, - .unk2 = 0x17, - .unk3 = 0x26, - .unk4 = 0x1a + .graphicsId = EVENT_OBJ_GFX_SCHOOL_KID_M, + .speechId1 = 23, + .speechId2 = 38, + .speechId3 = 26 }, { - .unk0 = 0x0032, - .unk2 = 0x17, - .unk3 = 0x1e, - .unk4 = 0x0b + .graphicsId = EVENT_OBJ_GFX_FISHERMAN, + .speechId1 = 23, + .speechId2 = 30, + .speechId3 = 11 }, { - .unk0 = 0x002f, - .unk2 = 0x0f, - .unk3 = 0x13, - .unk4 = 0x0e + .graphicsId = EVENT_OBJ_GFX_LASS, + .speechId1 = 15, + .speechId2 = 19, + .speechId3 = 14 }, { - .unk0 = 0x0027, - .unk2 = 0x02, - .unk3 = 0x1d, - .unk4 = 0x1a + .graphicsId = EVENT_OBJ_GFX_MANIAC, + .speechId1 = 2, + .speechId2 = 29, + .speechId3 = 26 }, { - .unk0 = 0x0033, - .unk2 = 0x25, - .unk3 = 0x0c, - .unk4 = 0x20 + .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, + .speechId1 = 37, + .speechId2 = 12, + .speechId3 = 32 }, { - .unk0 = 0x0021, - .unk2 = 0x18, - .unk3 = 0x17, - .unk4 = 0x26 + .graphicsId = EVENT_OBJ_GFX_MAN_3, + .speechId1 = 24, + .speechId2 = 23, + .speechId3 = 38 }, { - .unk0 = 0x0018, - .unk2 = 0x05, - .unk3 = 0x16, - .unk4 = 0x04 + .graphicsId = EVENT_OBJ_GFX_WOMAN_3, + .speechId1 = 5, + .speechId2 = 22, + .speechId3 = 4 }, { - .unk0 = 0x000b, - .unk2 = 0x29, - .unk3 = 0x25, - .unk4 = 0x23 + .graphicsId = EVENT_OBJ_GFX_LITTLE_BOY, + .speechId1 = 41, + .speechId2 = 37, + .speechId3 = 35 }, { - .unk0 = 0x0035, - .unk2 = 0x27, - .unk3 = 0x0e, - .unk4 = 0x0d + .graphicsId = EVENT_OBJ_GFX_TUBER_F, + .speechId1 = 39, + .speechId2 = 14, + .speechId3 = 13 }, { - .unk0 = 0x0030, - .unk2 = 0x0a, - .unk3 = 0x07, - .unk4 = 0x09 + .graphicsId = EVENT_OBJ_GFX_GENTLEMAN, + .speechId1 = 10, + .speechId2 = 7, + .speechId3 = 9 }, { - .unk0 = 0x000c, - .unk2 = 0x28, - .unk3 = 0x14, - .unk4 = 0x10 + .graphicsId = EVENT_OBJ_GFX_LITTLE_GIRL, + .speechId1 = 40, + .speechId2 = 20, + .speechId3 = 16 }, { - .unk0 = 0x0034, - .unk2 = 0x12, - .unk3 = 0x0d, - .unk4 = 0x15 + .graphicsId = EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, + .speechId1 = 18, + .speechId2 = 13, + .speechId3 = 21 }, { - .unk0 = 0x0013, - .unk2 = 0x16, - .unk3 = 0x1f, - .unk4 = 0x1b + .graphicsId = EVENT_OBJ_GFX_MAN_1, + .speechId1 = 22, + .speechId2 = 31, + .speechId3 = 27 } }; -static const u16 gUnknown_086123E4[][6] = +static const u16 sNPCSpeeches[][6] = { - {0x0a29, 0x0630, 0x0a01, 0x140f, 0x1020, 0x270e}, - {0x0a2a, 0x081d, 0x061b, 0x1034, 0x1e20, 0x0a29}, - {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1a, 0x0c03}, - {0x1e0f, 0x100b, 0x1039, 0x200f, 0x102b, 0x0a14}, - {0x103b, 0x0a02, 0x161e, 0x1020, 0x143e, 0x0c03}, - {0x0a31, 0x0e02, 0x0e15, 0x1436, 0x1037, 0x1e0a}, - {0x0a29, 0x1025, 0x142a, 0x1034, 0x1e0f, 0x0a1b}, - {0x0a01, 0x0e07, 0x122a, 0x1e0f, 0x061f, 0xffff}, - {0x1a35, 0x1036, 0x0e0f, 0x0a01, 0x2621, 0x1e0f}, - {0x0e25, 0x102f, 0x062d, 0x201e, 0x0c03, 0xffff}, - {0x0c1d, 0x081d, 0x0a2b, 0x100f, 0x0a02, 0x0c03}, - {0x0a2a, 0x0a3e, 0x2000, 0x1027, 0x1c08, 0x0c04}, - {0x0a01, 0x1212, 0x0a01, 0x1000, 0x062d, 0xffff}, - {0x1e22, 0x1231, 0x0a01, 0x1018, 0x1c1c, 0x0c03}, - {0x0a01, 0x060b, 0x1030, 0x0a28, 0x2549, 0x0624}, - {0x1014, 0x0a2c, 0x0415, 0x1642, 0x1e1b, 0x0c03}, - {0x0628, 0x1a0f, 0x100b, 0x2017, 0x0c00, 0xffff}, - {0x0a01, 0x1015, 0x1647, 0x1e0f, 0x0e39, 0x0e36}, - {0x0a01, 0x1017, 0x1620, 0x0e19, 0x0a31, 0x0c38}, - {0x0c1d, 0x081d, 0x0c00, 0x1022, 0x1c12, 0x020b}, - {0x1029, 0x1404, 0x102f, 0x1006, 0x1e28, 0x1c1c}, - {0x1029, 0x0e20, 0x1028, 0x1c16, 0x1e29, 0x0c03}, - {0x1e0f, 0x100b, 0x0e2f, 0x0638, 0x100c, 0xffff}, - {0x0a29, 0x1408, 0x102f, 0x061e, 0x102c, 0xffff}, - {0x1023, 0x100b, 0x081d, 0x062d, 0x1037, 0x0a14}, - {0x0a29, 0x1022, 0x1408, 0x102f, 0x161e, 0x1029}, - {0x0601, 0x102c, 0x0a01, 0x1015, 0x0e39, 0x0e36}, - {0x1020, 0x020b, 0x103f, 0x1c12, 0x0c04, 0xffff}, - {0x1018, 0x0a02, 0x103a, 0x0446, 0x020e, 0x0c03}, - {0x1e10, 0x020b, 0x1e0a, 0x100b, 0x063a, 0xffff}, - {0x0a02, 0x1212, 0x1e0f, 0x100b, 0x0638, 0x0c03}, - {0x1e22, 0x1000, 0x161b, 0x103f, 0x1e0f, 0x0c03}, - {0x0a29, 0x0e1e, 0x1025, 0x1e26, 0x0c00, 0xffff}, - {0x0a01, 0x0e1e, 0x1236, 0x102f, 0x120b, 0x0c04}, - {0x2805, 0x1e0f, 0x0a1b, 0x100b, 0x1020, 0x063b}, - {0x0a01, 0x101f, 0x0a3e, 0x1037, 0x1020, 0x0628}, - {0x1026, 0x0a31, 0x1e29, 0x1c1c, 0x0a01, 0x1212}, - {0x0c0a, 0x0c00, 0x1029, 0x101c, 0x1e0f, 0x0c23}, - {0x0a28, 0x020e, 0x100f, 0x1039, 0x142a, 0x0c04}, - {0x0a28, 0x020e, 0x100f, 0x0620, 0x102f, 0x043c}, - {0x0c39, 0x0c39, 0x0c00, 0x0a29, 0x2017, 0x0c39}, - {0x265c, 0x100b, 0x1020, 0x1230, 0x1e05, 0x100c}, + {EC_WORD_I_AM, EC_WORD_LOST, EC_WORD_I, EC_WORD_NEED, EC_WORD_A, EC_MOVE2(HELPING_HAND)}, + {EC_WORD_I_VE, EC_WORD_NO, EC_WORD_SENSE, EC_WORD_OF, EC_WORD_WHERE, EC_WORD_I_AM}, + {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_NOW, EC_WORD_QUES}, + {EC_WORD_THIS, EC_WORD_IS, EC_WORD_TOO, EC_WORD_EXCITING, EC_WORD_FOR, EC_WORD_ME}, + {EC_WORD_DID, EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_A, EC_WORD_MISTAKE, EC_WORD_QUES}, + {EC_WORD_IT_S, EC_WORD_MEAN, EC_WORD_AND, EC_WORD_AWFUL, EC_WORD_IN, EC_WORD_HERE}, + {EC_WORD_I_AM, EC_WORD_SO, EC_WORD_TIRED, EC_WORD_OF, EC_WORD_THIS, EC_WORD_PLACE}, + {EC_WORD_I, EC_WORD_QUITE, EC_WORD_ENJOY, EC_WORD_THIS, EC_WORD_CHALLENGE, 0xFFFF}, + {EC_WORD_LOOK, EC_WORD_AT, EC_WORD_HOW, EC_WORD_I, EC_MOVE2(TACKLE), EC_WORD_THIS}, + {EC_WORD_READY, EC_WORD_TO, EC_WORD_GIVE_UP, EC_WORD_YET, EC_WORD_QUES, 0xFFFF}, + {EC_WORD_OH, EC_WORD_NO, EC_WORD_WHO, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_QUES}, + {EC_WORD_I_VE, EC_WORD_BEEN, EC_WORD_WANDERING, EC_WORD_ABOUT, EC_WORD_FOREVER, EC_WORD_ELLIPSIS}, + {EC_WORD_I, EC_WORD_THINK, EC_WORD_I, EC_WORD_WILL, EC_WORD_GIVE_UP, 0xFFFF}, + {EC_WORD_WHAT, EC_WORD_SHOULD, EC_WORD_I, EC_WORD_DO, EC_WORD_NEXT, EC_WORD_QUES}, + {EC_WORD_I, EC_WORD_CAN_WIN, EC_WORD_WITH, EC_WORD_MY, EC_MOVE(SHEER_COLD), EC_WORD_GENIUS}, + {EC_WORD_WON_T, EC_WORD_SOMEONE, EC_WORD_COOL, EC_WORD_SHOW, EC_WORD_UP, EC_WORD_QUES}, + {EC_WORD_BATTLE, EC_WORD_GAME, EC_WORD_IS, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF}, + {EC_WORD_I, EC_WORD_CAN_T, EC_WORD_TAKE, EC_WORD_THIS, EC_WORD_ANY, EC_WORD_MORE}, + {EC_WORD_I, EC_WORD_DON_T, EC_WORD_KNOW, EC_WORD_IF, EC_WORD_IT_S, EC_WORD_OKAY}, + {EC_WORD_OH, EC_WORD_NO, EC_WORD_EXCL, EC_WORD_NOT, EC_WORD_ANOTHER, EC_WORD_TRAINER}, + {EC_WORD_IT, EC_WORD_HAS, EC_WORD_TO, EC_WORD_BE, EC_WORD_LEFT, EC_WORD_NEXT}, + {EC_WORD_IT, EC_WORD_MUST_BE, EC_WORD_OVER, EC_WORD_SOON, EC_WORD_RIGHT, EC_WORD_QUES}, + {EC_WORD_THIS, EC_WORD_IS, EC_WORD_TOTALLY, EC_WORD_EASY, EC_WORD_ISN_T_IT_QUES, 0xFFFF}, + {EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_POWER, EC_WORD_ON, 0xFFFF}, + {EC_WORD_THERE, EC_WORD_IS, EC_WORD_NO, EC_WORD_GIVE_UP, EC_WORD_IN, EC_WORD_ME}, + {EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_IT}, + {EC_WORD_GO, EC_WORD_ON, EC_WORD_I, EC_WORD_CAN_T, EC_WORD_ANY, EC_WORD_MORE}, + {EC_WORD_A, EC_WORD_TRAINER, EC_WORD_AFTER, EC_WORD_ANOTHER, EC_WORD_ELLIPSIS, 0xFFFF}, + {EC_WORD_DO, EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_STEEL, EC_WORD_POKEMON, EC_WORD_QUES}, + {EC_WORD_EVERY, EC_WORD_TRAINER, EC_WORD_HERE, EC_WORD_IS, EC_WORD_TOO_WEAK, 0xFFFF}, + {EC_WORD_YOU, EC_WORD_THINK, EC_WORD_THIS, EC_WORD_IS, EC_WORD_EASY, EC_WORD_QUES}, + {EC_WORD_WHAT, EC_WORD_WILL, EC_WORD_COME, EC_WORD_AFTER, EC_WORD_THIS, EC_WORD_QUES}, + {EC_WORD_I_AM, EC_WORD_JUST, EC_WORD_SO, EC_WORD_CONFUSED, EC_WORD_EXCL, 0xFFFF}, + {EC_WORD_I, EC_WORD_JUST, EC_WORD_WANT, EC_WORD_TO, EC_WORD_GO_HOME, EC_WORD_ELLIPSIS}, + {EC_WORD_YEEHAW_EXCL, EC_WORD_THIS, EC_WORD_PLACE, EC_WORD_IS, EC_WORD_A, EC_WORD_PUSHOVER}, + {EC_WORD_I, EC_WORD_HAVEN_T, EC_WORD_BEEN, EC_WORD_IN, EC_WORD_A, EC_WORD_BATTLE}, + {EC_WORD_MAYBE, EC_WORD_IT_S, EC_WORD_RIGHT, EC_WORD_NEXT, EC_WORD_I, EC_WORD_THINK}, + {EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_IT, EC_WORD_WASN_T, EC_WORD_THIS, EC_WORD_WAY}, + {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_TOO, EC_WORD_TIRED, EC_WORD_ELLIPSIS}, + {EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_STRONG, EC_WORD_TO, EC_WORD_POISON}, + {EC_WORD_LALALA, EC_WORD_LALALA, EC_WORD_EXCL, EC_WORD_I_AM, EC_WORD_AWESOME, EC_WORD_LALALA}, + {EC_MOVE2(TOXIC), EC_WORD_IS, EC_WORD_A, EC_WORD_TERRIBLE, EC_WORD_THING, EC_WORD_ISN_T_IT_QUES}, }; -static const u8 gUnknown_086125DC[][4] = +// Only the 5th array in this data is used by the code. +static const u8 sPikeQueenWinStreakAppearances[][4] = { - {0x23, 0x46, 0x23, 0x01}, - {0x04, 0x09, 0x05, 0x00}, - {0x15, 0x2a, 0x15, 0x01}, - {0x1c, 0x38, 0x1c, 0x01}, - {0x15, 0x2a, 0x15, 0x01}, - {0x1c, 0x8c, 0x38, 0x01}, - {0x15, 0x46, 0x23, 0x00}, + {35, 70, 35, 1}, + { 4, 9, 5, 0}, + {21, 42, 21, 1}, + {28, 56, 28, 1}, + {21, 42, 21, 1}, + {28, 140, 56, 1}, + {21, 70, 35, 0}, }; static void (* const sBattlePikeFunctions[])(void) = { - sub_81A705C, - sub_81A7140, - sub_81A7248, - sub_81A73B8, - sub_81A7070, - sub_81A73EC, + SetRoomType, + GetBattlePikeData, + SetBattlePikeData, + GetInFinalRoom, + SetupRoomEventObjects, + GetRoomType, sub_81A7400, sub_81A740C, sub_81A7418, nullsub_76, nullsub_124, - sub_81A7468, - sub_81A74CC, - sub_81A74E0, - sub_81A7508, - sub_81A7580, - sub_81A8090, - sub_81A80DC, - sub_81A825C, - sub_81A827C, - sub_81A84B4, - sub_81A84EC, - sub_81A863C, - sub_81A8658, - sub_81A869C, - sub_81A86C0, - sub_81A8794, - sub_81A87E8, - sub_81A8830 + GetRoomInflictedStatus, + GetRoomInflictedStatusMon, + HealOneOrTwoMons, + BufferNPCMessage, + StatusInflictionScreenFade, + GetInBattlePike, + SetHintedRoom, + GetHintedRoomIndex, + GetRoomTypeHint, + ClearPikeTrainerIds, + BufferRecordMixingTrainerMessage, + GetCurrentRoomPikeQueenFightType, + HealSomeMonsBeforePikeQueen, + SetHealingRoomsDisabled, + CanAnyPartyMonsBeHealed, + BackupMonHeldItems, + RestoreMonHeldItems, + InitPikeChallenge }; -static const u8 gUnknown_0861266C[] = {3, 3, 1, 0, 0, 2, 2, 1, 4}; +static const u8 sRoomTypeHints[] = { + 3, // PIKE_ROOM_SINGLE_BATTLE + 3, // PIKE_ROOM_HEAL_FULL + 1, // PIKE_ROOM_NPC + 0, // PIKE_ROOM_STATUS + 0, // PIKE_ROOM_HEAL_PART + 2, // PIKE_ROOM_WILD_MONS + 2, // PIKE_ROOM_HARD_BATTLE + 1, // PIKE_ROOM_DOUBLE_BATTLE + 4, // PIKE_ROOM_BRAIN +}; -static const u8 gUnknown_08612675[][3] = +static const u8 sNumMonsToHealBeforePikeQueen[][3] = { {2, 1, 0}, {2, 0, 1}, @@ -532,9 +544,9 @@ static const u8 gUnknown_08612675[][3] = {0, 1, 2}, }; -static bool8 (* const gUnknown_08612688[])(struct Task *) = +static bool8 (* const sStatusInflictionScreenFadeFuncs[])(struct Task *) = { - sub_81A7D8C, sub_81A7DE8 + StatusInflictionFadeOut, StatusInflictionFadeIn }; static const u32 gUnknown_08612690[] = {0x400, 0x800}; @@ -545,78 +557,78 @@ void CallBattlePikeFunction(void) sBattlePikeFunctions[gSpecialVar_0x8004](); } -static void sub_81A705C(void) +static void SetRoomType(void) { u8 roomType = GetNextRoomType(); sRoomType = roomType; } -static void sub_81A7070(void) +static void SetupRoomEventObjects(void) { - bool32 setPerson1, setPerson2; - u32 person1; - u16 person2; + bool32 setObjGfx1, setObjGfx2; + u32 objGfx1; + u16 objGfx2; VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST); VarSet(VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_DUSCLOPS); - setPerson1 = TRUE; - setPerson2 = FALSE; - person1 = 0; - person2 = 0; + setObjGfx1 = TRUE; + setObjGfx2 = FALSE; + objGfx1 = 0; + objGfx2 = 0; switch (sRoomType) { case PIKE_ROOM_SINGLE_BATTLE: PrepareOneTrainer(FALSE); - setPerson1 = FALSE; + setObjGfx1 = FALSE; break; case PIKE_ROOM_HEAL_FULL: - person1 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + objGfx1 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; break; case PIKE_ROOM_NPC: - person1 = (u8)(sub_81A7B58()); + objGfx1 = (u8)(GetNPCRoomGraphicsId()); break; case PIKE_ROOM_STATUS: - person1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; if (sStatusMon == PIKE_STATUS_DUSCLOPS) - person2 = EVENT_OBJ_GFX_DUSCLOPS; + objGfx2 = EVENT_OBJ_GFX_DUSCLOPS; else - person2 = EVENT_OBJ_GFX_KIRLIA; - setPerson2 = TRUE; + objGfx2 = EVENT_OBJ_GFX_KIRLIA; + setObjGfx2 = TRUE; break; case PIKE_ROOM_HEAL_PART: - person1 = EVENT_OBJ_GFX_GENTLEMAN; + objGfx1 = EVENT_OBJ_GFX_GENTLEMAN; break; case PIKE_ROOM_WILD_MONS: - setPerson1 = FALSE; + setObjGfx1 = FALSE; break; case PIKE_ROOM_HARD_BATTLE: PrepareOneTrainer(TRUE); - person2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; - setPerson1 = FALSE; - setPerson2 = TRUE; + objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + setObjGfx1 = FALSE; + setObjGfx2 = TRUE; break; case PIKE_ROOM_DOUBLE_BATTLE: PrepareTwoTrainers(); - setPerson1 = FALSE; + setObjGfx1 = FALSE; break; case PIKE_ROOM_BRAIN: SetFrontierBrainEventObjGfx(FRONTIER_FACILITY_PIKE); - person2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; - setPerson1 = FALSE; - setPerson2 = TRUE; + objGfx2 = EVENT_OBJ_GFX_LINK_RECEPTIONIST; + setObjGfx1 = FALSE; + setObjGfx2 = TRUE; break; default: return; } - if (setPerson1 == TRUE) - VarSet(VAR_OBJ_GFX_ID_0, person1); - if (setPerson2 == TRUE) - VarSet(VAR_OBJ_GFX_ID_1, person2); + if (setObjGfx1 == TRUE) + VarSet(VAR_OBJ_GFX_ID_0, objGfx1); + if (setObjGfx2 == TRUE) + VarSet(VAR_OBJ_GFX_ID_1, objGfx2); } -static void sub_81A7140(void) +static void GetBattlePikeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -643,7 +655,7 @@ static void sub_81A7140(void) } } -static void sub_81A7248(void) +static void SetBattlePikeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -683,15 +695,15 @@ static void sub_81A7248(void) } } -static void sub_81A73B8(void) +static void GetInFinalRoom(void) { - if (gSaveBlock2Ptr->frontier.curChallengeBattleNum >= 15) + if (gSaveBlock2Ptr->frontier.curChallengeBattleNum > 14) gSpecialVar_Result = TRUE; else gSpecialVar_Result = FALSE; } -static void sub_81A73EC(void) +static void GetRoomType(void) { gSpecialVar_Result = sRoomType; } @@ -725,7 +737,7 @@ static void nullsub_124(void) } -static void sub_81A7468(void) +static void GetRoomInflictedStatus(void) { switch (sStatusFlags) { @@ -747,35 +759,35 @@ static void sub_81A7468(void) } } -static void sub_81A74CC(void) +static void GetRoomInflictedStatusMon(void) { gSpecialVar_Result = sStatusMon; } -static void sub_81A74E0(void) +static void HealOneOrTwoMons(void) { u16 toHeal = (Random() % 2) + 1; TryHealMons(toHeal); gSpecialVar_Result = toHeal; } -static void sub_81A7508(void) +static void BufferNPCMessage(void) { - s32 id; + int speechId; if (gSaveBlock2Ptr->frontier.curChallengeBattleNum <= 4) - id = gUnknown_0861231C[sUnknown_03001294].unk2; + speechId = sNPCTable[sNpcId].speechId1; else if (gSaveBlock2Ptr->frontier.curChallengeBattleNum <= 10) - id = gUnknown_0861231C[sUnknown_03001294].unk3; + speechId = sNPCTable[sNpcId].speechId2; else - id = gUnknown_0861231C[sUnknown_03001294].unk4; + speechId = sNPCTable[sNpcId].speechId3; - FrontierSpeechToString(gUnknown_086123E4[id]); + FrontierSpeechToString(sNPCSpeeches[speechId]); } -static void sub_81A7580(void) +static void StatusInflictionScreenFade(void) { - CreateTask(sub_81A7EE4, 2); + CreateTask(Task_DoStatusInflictionScreenFade, 2); } static void HealMon(struct Pokemon *mon) @@ -1014,81 +1026,88 @@ static bool8 AtLeastOneHealthyMon(void) static u8 GetNextRoomType(void) { - u8 sp[8]; + u8 roomTypesAvailability[8]; u8 i; - u8 ret; - u8 var; - u8 count; - u8 *allocated; + u8 nextRoomType; + u8 roomTypeGroup; + u8 numRoomCandidates; + u8 *roomCandidates; u8 id; - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_BRAIN) - return gSaveBlock2Ptr->frontier.field_E10_2; - if (gSpecialVar_0x8007 == gSaveBlock2Ptr->frontier.field_E10_1) + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_BRAIN) + return gSaveBlock2Ptr->frontier.pikeHintedRoomType; + + // Check if the player walked into the same room that the lady gave a hint about. + if (gSpecialVar_0x8007 == gSaveBlock2Ptr->frontier.pikeHintedRoomIndex) { - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_STATUS) + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_STATUS) TryInflictRandomStatus(); - return gSaveBlock2Ptr->frontier.field_E10_2; + return gSaveBlock2Ptr->frontier.pikeHintedRoomType; } for (i = 0; i < 8; i++) - sp[i] = 0; + roomTypesAvailability[i] = 0; - count = 8; - var = gUnknown_0861266C[gSaveBlock2Ptr->frontier.field_E10_2]; + numRoomCandidates = 8; + + // The room types associated with the lady's hint cannot be in the other two rooms. + roomTypeGroup = sRoomTypeHints[gSaveBlock2Ptr->frontier.pikeHintedRoomType]; for (i = 0; i < 8; i++) { - if (gUnknown_0861266C[i] == var) + if (sRoomTypeHints[i] == roomTypeGroup) { - sp[i] = 1; - count--; + roomTypesAvailability[i] = 1; + numRoomCandidates--; } } - if (sp[7] != 1 && !AtLeastTwoAliveMons()) + // Remove room type candidates that would have no effect on the player's party. + if (roomTypesAvailability[PIKE_ROOM_DOUBLE_BATTLE] != 1 && !AtLeastTwoAliveMons()) { - sp[7] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_DOUBLE_BATTLE] = 1; + numRoomCandidates--; } - if (sp[3] != 1 && !AtLeastOneHealthyMon()) + if (roomTypesAvailability[PIKE_ROOM_STATUS] != 1 && !AtLeastOneHealthyMon()) { - sp[3] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_STATUS] = 1; + numRoomCandidates--; } - if (gSaveBlock2Ptr->frontier.field_E10_3) + + // Remove healing room type candidates if healing rooms are disabled. + if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) { - if (sp[1] != 1) + if (roomTypesAvailability[PIKE_ROOM_HEAL_FULL] != 1) { - sp[1] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_HEAL_FULL] = 1; + numRoomCandidates--; } - if (sp[4] != 1) + if (roomTypesAvailability[PIKE_ROOM_HEAL_PART] != 1) { - sp[4] = 1; - count--; + roomTypesAvailability[PIKE_ROOM_HEAL_PART] = 1; + numRoomCandidates--; } } - allocated = AllocZeroed(count); + roomCandidates = AllocZeroed(numRoomCandidates); id = 0; for (i = 0; i < 8; i++) { - if (sp[i] == 0) - allocated[id++] = i; + if (roomTypesAvailability[i] == 0) + roomCandidates[id++] = i; } - ret = allocated[Random() % count]; - free(allocated); - if (ret == PIKE_ROOM_STATUS) + nextRoomType = roomCandidates[Random() % numRoomCandidates]; + free(roomCandidates); + if (nextRoomType == PIKE_ROOM_STATUS) TryInflictRandomStatus(); - return ret; + return nextRoomType; } -static u16 sub_81A7B58(void) +static u16 GetNPCRoomGraphicsId(void) { - sUnknown_03001294 = Random() % 25; - return gUnknown_0861231C[sUnknown_03001294].unk0; + sNpcId = Random() % ARRAY_COUNT(sNPCTable); + return sNPCTable[sNpcId].graphicsId; } static u8 sub_81A7B84(void) @@ -1163,12 +1182,12 @@ u8 GetBattlePikeWildMonHeaderId(void) return headerId; } -static void sub_81A7D54(u8 taskId) +static void DoStatusInflictionScreenFade(u8 taskId) { - while (gUnknown_08612688[gTasks[taskId].data[0]](&gTasks[taskId])); + while (sStatusInflictionScreenFadeFuncs[gTasks[taskId].data[0]](&gTasks[taskId])); } -static bool8 sub_81A7D8C(struct Task *task) +static bool8 StatusInflictionFadeOut(struct Task *task) { if (task->data[6] == 0 || --task->data[6] == 0) { @@ -1187,7 +1206,7 @@ static bool8 sub_81A7D8C(struct Task *task) return FALSE; } -static bool8 sub_81A7DE8(struct Task *task) +static bool8 StatusInflictionFadeIn(struct Task *task) { if (task->data[6] == 0 || --task->data[6] == 0) { @@ -1202,7 +1221,7 @@ static bool8 sub_81A7DE8(struct Task *task) { if (--task->data[3] == 0) { - DestroyTask(FindTaskIdByFunc(sub_81A7D54)); + DestroyTask(FindTaskIdByFunc(DoStatusInflictionScreenFade)); } else { @@ -1213,36 +1232,36 @@ static bool8 sub_81A7DE8(struct Task *task) return FALSE; } -static void sub_81A7E60(s16 a0, s16 a1, s16 a2, s16 a3, s16 a4) +static void StartStatusInflictionScreenFade(s16 fadeOutDelay, s16 fadeInDelay, s16 numFades, s16 fadeOutSpeed, s16 fadeInSpped) { - u8 taskId = CreateTask(sub_81A7D54, 3); + u8 taskId = CreateTask(DoStatusInflictionScreenFade, 3); - gTasks[taskId].data[1] = a0; - gTasks[taskId].data[2] = a1; - gTasks[taskId].data[3] = a2; - gTasks[taskId].data[4] = a3; - gTasks[taskId].data[5] = a4; - gTasks[taskId].data[6] = a0; + gTasks[taskId].data[1] = fadeOutDelay; + gTasks[taskId].data[2] = fadeInDelay; + gTasks[taskId].data[3] = numFades; + gTasks[taskId].data[4] = fadeOutSpeed; + gTasks[taskId].data[5] = fadeInSpped; + gTasks[taskId].data[6] = fadeOutDelay; } -static bool8 sub_81A7EC4(void) +static bool8 IsStatusInflictionScreenFadeTaskFinished(void) { - if (FindTaskIdByFunc(sub_81A7D54) == 0xFF) + if (FindTaskIdByFunc(DoStatusInflictionScreenFade) == 0xFF) return TRUE; else return FALSE; } -static void sub_81A7EE4(u8 taskId) +static void Task_DoStatusInflictionScreenFade(u8 taskId) { if (gTasks[taskId].data[0] == 0) { gTasks[taskId].data[0]++; - sub_81A7E60(0, 0, 3, 2, 2); + StartStatusInflictionScreenFade(0, 0, 3, 2, 2); } else { - if (sub_81A7EC4()) + if (IsStatusInflictionScreenFadeTaskFinished()) { EnableBothScriptContexts(); DestroyTask(taskId); @@ -1308,7 +1327,7 @@ static void TryHealMons(u8 healCount) } } -static void sub_81A8090(void) +static void GetInBattlePike(void) { gSpecialVar_Result = InBattlePike(); } @@ -1321,61 +1340,65 @@ bool8 InBattlePike(void) || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; } -static void sub_81A80DC(void) +static void SetHintedRoom(void) { u8 i, count, id; - u8 *allocated; + u8 *roomCandidates; gSpecialVar_Result = 0; - if (sub_81A8590(1)) + if (GetPikeQueenFightType(1)) { gSpecialVar_Result = 1; - gSaveBlock2Ptr->frontier.field_E10_1 = Random() % 6; - gSaveBlock2Ptr->frontier.field_E10_2 = PIKE_ROOM_BRAIN; + gSaveBlock2Ptr->frontier.pikeHintedRoomIndex = Random() % 6; + gSaveBlock2Ptr->frontier.pikeHintedRoomType = PIKE_ROOM_BRAIN; } else { - gSaveBlock2Ptr->frontier.field_E10_1 = Random() % 3; - if (gSaveBlock2Ptr->frontier.field_E10_3) + gSaveBlock2Ptr->frontier.pikeHintedRoomIndex = Random() % 3; + if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) count = 6; else count = 8; - allocated = AllocZeroed(count); + roomCandidates = AllocZeroed(count); for (i = 0, id = 0; i < count; i++) { - if (gSaveBlock2Ptr->frontier.field_E10_3) + if (gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled) { if (i != PIKE_ROOM_HEAL_FULL && i != PIKE_ROOM_HEAL_PART) - allocated[id++] = i; + roomCandidates[id++] = i; } else { - allocated[i] = i; + roomCandidates[i] = i; } } - gSaveBlock2Ptr->frontier.field_E10_2 = allocated[Random() % count]; - free(allocated); - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_STATUS && !AtLeastOneHealthyMon()) - gSaveBlock2Ptr->frontier.field_E10_2 = PIKE_ROOM_NPC; - if (gSaveBlock2Ptr->frontier.field_E10_2 == PIKE_ROOM_DOUBLE_BATTLE && !AtLeastTwoAliveMons()) - gSaveBlock2Ptr->frontier.field_E10_2 = PIKE_ROOM_NPC; + + gSaveBlock2Ptr->frontier.pikeHintedRoomType = roomCandidates[Random() % count]; + free(roomCandidates); + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_STATUS && !AtLeastOneHealthyMon()) + gSaveBlock2Ptr->frontier.pikeHintedRoomType = PIKE_ROOM_NPC; + if (gSaveBlock2Ptr->frontier.pikeHintedRoomType == PIKE_ROOM_DOUBLE_BATTLE && !AtLeastTwoAliveMons()) + gSaveBlock2Ptr->frontier.pikeHintedRoomType = PIKE_ROOM_NPC; } } -static void sub_81A825C(void) +static void GetHintedRoomIndex(void) { - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E10_1; + // 0 = left room + // 1 = center room + // 2 = right room + gSpecialVar_Result = gSaveBlock2Ptr->frontier.pikeHintedRoomIndex; } -static void sub_81A827C(void) +static void GetRoomTypeHint(void) { - gSpecialVar_Result = gUnknown_0861266C[gSaveBlock2Ptr->frontier.field_E10_2]; + gSpecialVar_Result = sRoomTypeHints[gSaveBlock2Ptr->frontier.pikeHintedRoomType]; } static void PrepareOneTrainer(bool8 difficult) { - s32 i; + int i; u8 lvlMode; u8 battleNum; u16 challengeNum; @@ -1407,7 +1430,7 @@ static void PrepareOneTrainer(bool8 difficult) static void PrepareTwoTrainers(void) { - s32 i; + int i; u16 trainerId; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u16 challengeNum = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode] / 14; @@ -1444,7 +1467,7 @@ static void PrepareTwoTrainers(void) gSaveBlock2Ptr->frontier.trainerIds[gSaveBlock2Ptr->frontier.curChallengeBattleNum - 2] = gTrainerBattleOpponent_B; } -static void sub_81A84B4(void) +static void ClearPikeTrainerIds(void) { u8 i; @@ -1452,7 +1475,7 @@ static void sub_81A84B4(void) gSaveBlock2Ptr->frontier.trainerIds[i] = 0xFFFF; } -static void sub_81A84EC(void) +static void BufferRecordMixingTrainerMessage(void) { if (gSpecialVar_0x8005 == 0) { @@ -1485,31 +1508,31 @@ static bool8 AtLeastTwoAliveMons(void) return TRUE; } -static u8 sub_81A8590(u8 arg0) +static u8 GetPikeQueenFightType(u8 nextRoom) { - u8 symbolsCount; + u8 numPikeSymbols; u8 var = 5; u8 ret = 0; u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; - u16 wins = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode]; - wins += arg0; - symbolsCount = GetPlayerSymbolCountForFacility(FRONTIER_FACILITY_PIKE); + u16 winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[lvlMode]; + winStreak += nextRoom; + numPikeSymbols = GetPlayerSymbolCountForFacility(FRONTIER_FACILITY_PIKE); - switch (symbolsCount) + switch (numPikeSymbols) { case 0: case 1: - if (wins == gUnknown_086125DC[var][symbolsCount] - gUnknown_086125DC[var][3]) - ret = symbolsCount + 1; + if (winStreak == sPikeQueenWinStreakAppearances[var][numPikeSymbols] - sPikeQueenWinStreakAppearances[var][3]) + ret = numPikeSymbols + 1; break; case 2: default: - if (wins == gUnknown_086125DC[var][0] - gUnknown_086125DC[var][3]) + if (winStreak == sPikeQueenWinStreakAppearances[var][0] - sPikeQueenWinStreakAppearances[var][3]) ret = 3; - else if (wins == gUnknown_086125DC[var][1] - gUnknown_086125DC[var][3] - || (wins > gUnknown_086125DC[var][1] - && (wins - gUnknown_086125DC[var][1] + gUnknown_086125DC[var][3]) % gUnknown_086125DC[var][2] == 0)) + else if (winStreak == sPikeQueenWinStreakAppearances[var][1] - sPikeQueenWinStreakAppearances[var][3] + || (winStreak > sPikeQueenWinStreakAppearances[var][1] + && (winStreak - sPikeQueenWinStreakAppearances[var][1] + sPikeQueenWinStreakAppearances[var][3]) % sPikeQueenWinStreakAppearances[var][2] == 0)) ret = 4; break; } @@ -1517,25 +1540,25 @@ static u8 sub_81A8590(u8 arg0) return ret; } -static void sub_81A863C(void) +static void GetCurrentRoomPikeQueenFightType(void) { - gSpecialVar_Result = sub_81A8590(0); + gSpecialVar_Result = GetPikeQueenFightType(0); } -static void sub_81A8658(void) +static void HealSomeMonsBeforePikeQueen(void) { - u8 toHealCount = gUnknown_08612675[gSaveBlock2Ptr->frontier.field_E10_1][gSpecialVar_0x8007]; + u8 toHealCount = sNumMonsToHealBeforePikeQueen[gSaveBlock2Ptr->frontier.pikeHintedRoomIndex][gSpecialVar_0x8007]; TryHealMons(toHealCount); gSpecialVar_Result = toHealCount; } -static void sub_81A869C(void) +static void SetHealingRoomsDisabled(void) { - gSaveBlock2Ptr->frontier.field_E10_3 = gSpecialVar_0x8005; + gSaveBlock2Ptr->frontier.pikeHealingRoomsDisabled = gSpecialVar_0x8005; } -static void sub_81A86C0(void) +static void CanAnyPartyMonsBeHealed(void) { u8 i, j; @@ -1574,19 +1597,19 @@ static void sub_81A86C0(void) } } -static void sub_81A8794(void) +static void BackupMonHeldItems(void) { u8 i; for (i = 0; i < 3; i++) { - s32 heldItem = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], + int heldItem = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_HELD_ITEM); - gSaveBlock2Ptr->frontier.field_E12[i] = heldItem; + gSaveBlock2Ptr->frontier.pikeHeldItemsBackup[i] = heldItem; } } -static void sub_81A87E8(void) +static void RestoreMonHeldItems(void) { u8 i; @@ -1594,11 +1617,11 @@ static void sub_81A87E8(void) { SetMonData(&gPlayerParty[gSaveBlock2Ptr->frontier.selectedPartyMons[i] - 1], MON_DATA_HELD_ITEM, - &gSaveBlock2Ptr->frontier.field_E12[i]); + &gSaveBlock2Ptr->frontier.pikeHeldItemsBackup[i]); } } -static void sub_81A8830(void) +static void InitPikeChallenge(void) { u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 824a2946d..a2fa4120f 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -97,7 +97,7 @@ struct PyramidTrainerEncounterMusic }; // This file's functions. -static void InitPyramidBag(void); +static void InitPyramidChallenge(void); static void GetBattlePyramidData(void); static void SetBattlePyramidData(void); static void sub_81A9134(void); @@ -814,7 +814,7 @@ static const u8 sHintTextTypes[] = static void (* const sBattlePyramidFunctions[])(void) = { - InitPyramidBag, + InitPyramidChallenge, GetBattlePyramidData, SetBattlePyramidData, sub_81A9134, @@ -865,7 +865,7 @@ void CallBattlePyramidFunction(void) sBattlePyramidFunctions[gSpecialVar_0x8004](); } -static void InitPyramidBag(void) +static void InitPyramidChallenge(void) { bool32 isCurrent; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; From 3a40f5203baafb29f94dda8abdce6489d81635ae Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 7 Feb 2019 17:41:44 -0600 Subject: [PATCH 2/7] Remove old rom_818CFC8.h header --- include/rom_818CFC8.h | 11 ----------- src/event_object_movement.c | 4 ++-- src/field_poison.c | 2 +- src/item_menu.c | 2 +- src/item_use.c | 2 +- src/map_name_popup.c | 2 +- src/start_menu.c | 1 - 7 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 include/rom_818CFC8.h diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h deleted file mode 100644 index c1fc78e1e..000000000 --- a/include/rom_818CFC8.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// Created by Scott Norton on 9/6/17. -// - -#ifndef GUARD_ROM_818CFC8_H -#define GUARD_ROM_818CFC8_H - -bool8 InBattlePyramid(void); -u8 GetNumBattlePyramidEventObjects(void); - -#endif //GUARD_ROM_818CFC8_H diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 845e41dad..ba62db10d 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1,4 +1,6 @@ #include "global.h" +#include "alloc.h" +#include "battle_pyramid.h" #include "berry.h" #include "decoration.h" #include "event_data.h" @@ -9,14 +11,12 @@ #include "field_effect_helpers.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "alloc.h" #include "mauville_old_man.h" #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" #include "pokenav.h" #include "random.h" -#include "rom_818CFC8.h" #include "sprite.h" #include "task.h" #include "trainer_see.h" diff --git a/src/field_poison.c b/src/field_poison.c index 89cd02728..532c7f027 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_pike.h" +#include "battle_pyramid.h" #include "event_data.h" #include "field_message_box.h" #include "field_poison.h" @@ -8,7 +9,6 @@ #include "frontier_util.h" #include "party_menu.h" #include "pokenav.h" -#include "rom_818CFC8.h" #include "script.h" #include "string_util.h" #include "strings.h" diff --git a/src/item_menu.c b/src/item_menu.c index 24a50aa9a..43f2afce3 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2,6 +2,7 @@ #include "item_menu.h" #include "battle.h" #include "battle_controllers.h" +#include "battle_pyramid.h" #include "frontier_util.h" #include "berry_tag_screen.h" #include "bg.h" @@ -33,7 +34,6 @@ #include "player_pc.h" #include "pokemon.h" #include "pokemon_summary_screen.h" -#include "rom_818CFC8.h" #include "scanline_effect.h" #include "script.h" #include "shop.h" diff --git a/src/item_use.c b/src/item_use.c index 0ea5f6acf..97d6292c4 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -1,6 +1,7 @@ #include "global.h" #include "item_use.h" #include "battle.h" +#include "battle_pyramid.h" #include "battle_pyramid_bag.h" #include "berry.h" #include "bike.h" @@ -24,7 +25,6 @@ #include "party_menu.h" #include "pokeblock.h" #include "pokemon.h" -#include "rom_818CFC8.h" #include "script.h" #include "sound.h" #include "strings.h" diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 0d88815c0..cdb4c3330 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle_pyramid.h" #include "bg.h" #include "event_data.h" #include "gpu_regs.h" @@ -7,7 +8,6 @@ #include "map_name_popup.h" #include "palette.h" #include "region_map.h" -#include "rom_818CFC8.h" #include "start_menu.h" #include "string_util.h" #include "task.h" diff --git a/src/start_menu.c b/src/start_menu.c index 334330b67..d5eec76d2 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -15,7 +15,6 @@ #include "overworld.h" #include "link.h" #include "frontier_util.h" -#include "rom_818CFC8.h" #include "field_specials.h" #include "event_object_movement.h" #include "script.h" From 4570e3b6a5fc1d652c224069a711d9f2fbee50e0 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 09:41:36 -0600 Subject: [PATCH 3/7] Document battle arena --- ...ymbols.png => arena_judgement_symbols.png} | Bin include/battle_arena.h | 4 +- include/global.h | 2 +- include/graphics.h | 4 +- src/battle_arena.c | 134 ++++++++++-------- src/battle_script_commands.c | 4 +- src/graphics.c | 4 +- 7 files changed, 84 insertions(+), 68 deletions(-) rename graphics/battle_frontier/{symbols.png => arena_judgement_symbols.png} (100%) diff --git a/graphics/battle_frontier/symbols.png b/graphics/battle_frontier/arena_judgement_symbols.png similarity index 100% rename from graphics/battle_frontier/symbols.png rename to graphics/battle_frontier/arena_judgement_symbols.png diff --git a/include/battle_arena.h b/include/battle_arena.h index bf305ea4e..c3bdd4ea7 100644 --- a/include/battle_arena.h +++ b/include/battle_arena.h @@ -8,7 +8,7 @@ void BattleArena_AddMindPoints(u8 battler); void BattleArena_AddSkillPoints(u8 battler); void BattleArena_DeductMindPoints(u8 battler, u16 stringId); void sub_81A586C(u8 battler); -void sub_81A5BF8(void); -void sub_81A5D44(void); +void DrawArenaRefereeTextBox(void); +void RemoveArenaRefereeTextBox(void); #endif //GUARD_BATTLE_ARENA_H diff --git a/include/global.h b/include/global.h index bbf5d5e0a..14a6387cd 100644 --- a/include/global.h +++ b/include/global.h @@ -345,7 +345,7 @@ struct BattleFrontier /*0xDC6*/ u16 field_DC6; /*0xDC8*/ u16 palaceWinStreaks[2][2]; /*0xDD0*/ u16 palaceRecordWinStreaks[2][2]; - /*0xDD8*/ u16 field_DD8; + /*0xDD8*/ u16 arenaRewardItem; /*0xDDA*/ u16 arenaWinStreaks[2]; /*0xDDE*/ u16 arenaRecordStreaks[2]; /*0xDE2*/ u16 factoryWinStreaks[2][2]; diff --git a/include/graphics.h b/include/graphics.h index 0f7c604e7..f86a04085 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4105,8 +4105,8 @@ extern const u32 gUnknown_08D83C3C[]; extern const u32 gUnknown_08D83900[]; extern const u32 gBattleFrontierGfx_DomeOptions[]; -extern const u32 gUnknown_08D854E8[]; -extern const u32 gUnknown_08D855E8[]; +extern const u32 gBattleArenaJudgementSymbolsGfx[]; +extern const u32 gBattleArenaJudgementSymbolsPalette[]; extern const u32 gContest2Pal[]; extern const u32 gBattleAnimSpriteSheet_000[]; diff --git a/src/battle_arena.c b/src/battle_arena.c index cfcb10a0d..8146f5b38 100644 --- a/src/battle_arena.c +++ b/src/battle_arena.c @@ -22,18 +22,20 @@ #include "constants/songs.h" #include "constants/battle_string_ids.h" #include "constants/battle_frontier.h" +#include "constants/items.h" #include "constants/moves.h" +#include "constants/rgb.h" // This file's functions. -static void sub_81A58B4(void); -static void sub_81A5964(void); -static void sub_81A59FC(void); +static void InitArenaChallenge(void); +static void GetArenaData(void); +static void SetArenaData(void); static void sub_81A5AC4(void); -static void sub_81A5B08(void); -static void sub_81A5B88(void); -static void sub_81A5BE0(void); +static void SetArenaRewardItem(void); +static void GiveArenaRewardItem(void); +static void BufferArenaOpponentName(void); static void SpriteCb_JudgmentIcon(struct Sprite *sprite); -static void ShowJudgmentSprite(u8 x, u8 y, u8 arg2, u8 battler); +static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler); // Const rom data. static const s8 sMindRatings[] = @@ -395,7 +397,9 @@ static const s8 sMindRatings[] = [MOVE_PSYCHO_BOOST] = 1, }; -static const struct OamData sOamData_8611F24 = +#define TAG_JUDGEMENT_ICON 1000 + +static const struct OamData sJudgementIconOamData = { .y = 0, .affineMode = 0, @@ -412,74 +416,87 @@ static const struct OamData sOamData_8611F24 = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_8611F2C[] = +static const union AnimCmd sJudgementIconAnimCmd0[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8611F34[] = +static const union AnimCmd sJudgementIconAnimCmd1[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8611F3C[] = +static const union AnimCmd sJudgementIconAnimCmd2[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_8611F44[] = +static const union AnimCmd sJudgementIconAnimCmd3[] = { ANIMCMD_FRAME(12, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_8611F4C[] = +static const union AnimCmd *const sJudgementIconAnimCmds[] = { - sSpriteAnim_8611F2C, - sSpriteAnim_8611F34, - sSpriteAnim_8611F3C, - sSpriteAnim_8611F44 + sJudgementIconAnimCmd0, + sJudgementIconAnimCmd1, + sJudgementIconAnimCmd2, + sJudgementIconAnimCmd3 }; static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon = { - .tileTag = 0x3E8, + .tileTag = TAG_JUDGEMENT_ICON, .paletteTag = 0xFFFF, - .oam = &sOamData_8611F24, - .anims = sSpriteAnimTable_8611F4C, + .oam = &sJudgementIconOamData, + .anims = sJudgementIconAnimCmds, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCb_JudgmentIcon, }; -static const struct CompressedSpriteSheet gUnknown_08611F74[] = +static const struct CompressedSpriteSheet sBattleArenaJudgementSymbolsSpriteSheet[] = { - {gUnknown_08D854E8, 0x200, 0x3E8}, + {gBattleArenaJudgementSymbolsGfx, 0x200, TAG_JUDGEMENT_ICON}, {0} }; static void (* const sArenaFunctions[])(void) = { - sub_81A58B4, - sub_81A5964, - sub_81A59FC, + InitArenaChallenge, + GetArenaData, + SetArenaData, sub_81A5AC4, - sub_81A5B08, - sub_81A5B88, - sub_81A5BE0, + SetArenaRewardItem, + GiveArenaRewardItem, + BufferArenaOpponentName, }; -static const u16 gUnknown_08611FA0[6] = +static const u16 sShortStreakRewardItems[] = { - 0x003f, 0x0040, 0x0041, 0x0043, 0x0042, 0x0046 + ITEM_HP_UP, + ITEM_PROTEIN, + ITEM_IRON, + ITEM_CALCIUM, + ITEM_CARBOS, + ITEM_ZINC, }; -static const u16 gUnknown_08611FAC[9] = +static const u16 sLongStreakRewardItems[] = { - 0x00b3, 0x00b4, 0x00b7, 0x00c8, 0x00b9, 0x00bb, 0x00c4, 0x00c6, 0x00ba + ITEM_BRIGHT_POWDER, + ITEM_WHITE_HERB, + ITEM_QUICK_CLAW, + ITEM_LEFTOVERS, + ITEM_MENTAL_HERB, + ITEM_KINGS_ROCK, + ITEM_FOCUS_BAND, + ITEM_SCOPE_LENS, + ITEM_CHOICE_BAND, }; // code @@ -490,15 +507,15 @@ void CallBattleArenaFunction(void) u8 BattleArena_ShowJudgmentWindow(u8 *state) { - s32 i; + int i; u8 ret = 0; switch (*state) { case 0: - BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, 0); + BeginNormalPaletteFade(0x7FFFFF1C, 4, 0, 8, RGB_BLACK); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); - LoadCompressedSpriteSheet(gUnknown_08611F74); - LoadCompressedPalette(gUnknown_08D855E8, 0x1F0, 0x20); + LoadCompressedSpriteSheet(sBattleArenaJudgementSymbolsSpriteSheet); + LoadCompressedPalette(gBattleArenaJudgementSymbolsPalette, 0x1F0, 0x20); gBattle_WIN0H = 0xFF; gBattle_WIN0V = 0x70; (*state)++; @@ -536,7 +553,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); for (i = 0; i < 8; i++) { - u8 spriteId = CreateSprite(&sSpriteTemplate_JudgmentIcon, 0x40 + (i * 0x10), 84, 0); + u8 spriteId = CreateSprite(&sSpriteTemplate_JudgmentIcon, 64 + i * 16, 84, 0); StartSpriteAnim(&gSprites[spriteId], 3); } ret = 1; @@ -596,14 +613,14 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) HandleBattleWindow(5, 0, 24, 13, WINDOW_CLEAR); CopyBgTilemapBufferToVram(0); m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); - BeginNormalPaletteFade(0x7FFFFF1C, 4, 8, 0, 0); + BeginNormalPaletteFade(0x7FFFFF1C, 4, 8, 0, RGB_BLACK); (*state)++; break; case 10: if (!gPaletteFade.active) { SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR | WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR); - FreeSpriteTilesByTag(0x3E8); + FreeSpriteTilesByTag(TAG_JUDGEMENT_ICON); ret = 1; (*state)++; } @@ -615,9 +632,9 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state) static void ShowJudgmentSprite(u8 x, u8 y, u8 category, u8 battler) { - s32 animNum = 0; - s32 pointsPlayer = 0; - s32 pointsOpponent = 0; + int animNum = 0; + int pointsPlayer = 0; + int pointsOpponent = 0; s8 *mindPoints = gBattleStruct->arenaMindPoints; s8 *skillPoints = gBattleStruct->arenaSkillPoints; u16 *hpAtStart = gBattleStruct->arenaStartHp; @@ -686,7 +703,6 @@ void BattleArena_InitPoints(void) void BattleArena_AddMindPoints(u8 battler) { s8 *mindPoints = gBattleStruct->arenaMindPoints; - mindPoints[battler] += sMindRatings[gCurrentMove]; } @@ -707,7 +723,7 @@ void BattleArena_AddSkillPoints(u8 battler) if (!(gMoveResultFlags & MOVE_RESULT_MISSED) || gBattleCommunication[6] != 1) skillPoints[battler] -= 2; } - else if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE && gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) + else if ((gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) && (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)) { skillPoints[battler] += 1; } @@ -765,7 +781,7 @@ void sub_81A586C(u8 battler) // Unused. hpAtStart[BATTLE_OPPOSITE(battler)] = gBattleMons[BATTLE_OPPOSITE(battler)].hp; } -static void sub_81A58B4(void) +static void InitArenaChallenge(void) { bool32 isCurrent; u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -786,14 +802,14 @@ static void sub_81A58B4(void) gTrainerBattleOpponent_A = 0; } -static void sub_81A5964(void) +static void GetArenaData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; switch (gSpecialVar_0x8005) { case 0: - gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_DD8; + gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaRewardItem; break; case 1: gSpecialVar_Result = gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode]; @@ -807,14 +823,14 @@ static void sub_81A5964(void) } } -static void sub_81A59FC(void) +static void SetArenaData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; switch (gSpecialVar_0x8005) { case 0: - gSaveBlock2Ptr->frontier.field_DD8 = gSpecialVar_0x8006; + gSaveBlock2Ptr->frontier.arenaRewardItem = gSpecialVar_0x8006; break; case 1: gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] = gSpecialVar_0x8006; @@ -846,22 +862,22 @@ static void sub_81A5AC4(void) sub_81A4C30(); } -static void sub_81A5B08(void) +static void SetArenaRewardItem(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; if (gSaveBlock2Ptr->frontier.arenaWinStreaks[lvlMode] > 41) - gSaveBlock2Ptr->frontier.field_DD8 = gUnknown_08611FAC[Random() % ARRAY_COUNT(gUnknown_08611FAC)]; + gSaveBlock2Ptr->frontier.arenaRewardItem = sLongStreakRewardItems[Random() % ARRAY_COUNT(sLongStreakRewardItems)]; else - gSaveBlock2Ptr->frontier.field_DD8 = gUnknown_08611FA0[Random() % ARRAY_COUNT(gUnknown_08611FA0)]; + gSaveBlock2Ptr->frontier.arenaRewardItem = sShortStreakRewardItems[Random() % ARRAY_COUNT(sShortStreakRewardItems)]; } -static void sub_81A5B88(void) +static void GiveArenaRewardItem(void) { - if (AddBagItem(gSaveBlock2Ptr->frontier.field_DD8, 1) == TRUE) + if (AddBagItem(gSaveBlock2Ptr->frontier.arenaRewardItem, 1) == TRUE) { - CopyItemName(gSaveBlock2Ptr->frontier.field_DD8, gStringVar1); - gSaveBlock2Ptr->frontier.field_DD8 = 0; + CopyItemName(gSaveBlock2Ptr->frontier.arenaRewardItem, gStringVar1); + gSaveBlock2Ptr->frontier.arenaRewardItem = 0; gSpecialVar_Result = TRUE; } else @@ -870,12 +886,12 @@ static void sub_81A5B88(void) } } -static void sub_81A5BE0(void) +static void BufferArenaOpponentName(void) { GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A); } -void sub_81A5BF8(void) +void DrawArenaRefereeTextBox(void) { u8 width = 27; u8 palNum = 7; @@ -898,7 +914,7 @@ void sub_81A5BF8(void) FillBgTilemapBufferRect(0, 0x836, 29, 19, 1, 1, palNum); } -void sub_81A5D44(void) +void RemoveArenaRefereeTextBox(void) { u8 width; u8 height; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6023b2c1b..a53fa30f2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6721,10 +6721,10 @@ static void atk76_various(void) MarkBattlerForControllerExec(gActiveBattler); break; case 14: - sub_81A5BF8(); + DrawArenaRefereeTextBox(); break; case 15: - sub_81A5D44(); + RemoveArenaRefereeTextBox(); break; case VARIOUS_ARENA_JUDGMENT_STRING: BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]); diff --git a/src/graphics.c b/src/graphics.c index 1fc106dcc..c6af13477 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -984,8 +984,8 @@ const u32 gUnknown_08D85358[] = INCBIN_U32("graphics/battle_frontier/options_pal const u32 gUnknown_08D85444[] = INCBIN_U32("graphics/battle_frontier/options_pal2.gbapal.lz"); // pokeball pal const u32 gUnknown_08D854C8[] = INCBIN_U32("graphics/battle_frontier/options_pal3.gbapal.lz"); // arrow pal -const u32 gUnknown_08D854E8[] = INCBIN_U32("graphics/battle_frontier/symbols.4bpp.lz"); -const u32 gUnknown_08D855E8[] = INCBIN_U32("graphics/battle_frontier/symbols.gbapal.lz"); +const u32 gBattleArenaJudgementSymbolsGfx[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.4bpp.lz"); +const u32 gBattleArenaJudgementSymbolsPalette[] = INCBIN_U32("graphics/battle_frontier/arena_judgement_symbols.gbapal.lz"); const u32 gUnknown_08D85600[] = INCBIN_U32("graphics/battle_frontier/text.gbapal.lz"); const u16 gUnknown_08D85620[] = INCBIN_U16("graphics/battle_frontier/text_pp.gbapal"); From 6add3e17944402eab6419d217c98d14d93f38a55 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 11:08:25 -0600 Subject: [PATCH 4/7] Document some battle dome stuff --- data/event_scripts.s | 228 +++++------ include/battle_dome.h | 4 +- include/strings.h | 118 ++++++ src/battle_dome.c | 871 ++++++++++++++++++------------------------ 4 files changed, 611 insertions(+), 610 deletions(-) diff --git a/data/event_scripts.s b/data/event_scripts.s index c6ebcd695..cf9590ce5 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -5631,346 +5631,346 @@ LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E .include "data/text/match_call.inc" .include "data/scripts/apprentice.inc" -gBattleDomeOpponentPotential1:: +gBattleDomeOpponentPotentialText1:: .string "The best candidate to be a champ!$" -gBattleDomeOpponentPotential2:: +gBattleDomeOpponentPotentialText2:: .string "A sure-finalist team.$" -gBattleDomeOpponentPotential3:: +gBattleDomeOpponentPotentialText3:: .string "A likely top-three finisher.$" -gBattleDomeOpponentPotential4:: +gBattleDomeOpponentPotentialText4:: .string "A candidate to finish first.$" -gBattleDomeOpponentPotential5:: +gBattleDomeOpponentPotentialText5:: .string "A team with top-class potential.$" -gBattleDomeOpponentPotential6:: +gBattleDomeOpponentPotentialText6:: .string "The dark horse team this tournament.$" -gBattleDomeOpponentPotential7:: +gBattleDomeOpponentPotentialText7:: .string "A better-than-average team.$" -gBattleDomeOpponentPotential8:: +gBattleDomeOpponentPotentialText8:: .string "This tournament's average team.$" -gBattleDomeOpponentPotential9:: +gBattleDomeOpponentPotentialText9:: .string "A team with average potential.$" -gBattleDomeOpponentPotential10:: +gBattleDomeOpponentPotentialText10:: .string "A weaker-than-average team.$" -gBattleDomeOpponentPotential11:: +gBattleDomeOpponentPotentialText11:: .string "A team looking for its first win.$" -gBattleDomeOpponentPotential12:: +gBattleDomeOpponentPotentialText12:: .string "One win will make this team proud.$" -gBattleDomeOpponentPotential13:: +gBattleDomeOpponentPotentialText13:: .string "Overall, a weak team.$" -gBattleDomeOpponentPotential14:: +gBattleDomeOpponentPotentialText14:: .string "A team with very low potential.$" -gBattleDomeOpponentPotential15:: +gBattleDomeOpponentPotentialText15:: .string "A team unlikely to win the tournament.$" -gBattleDomeOpponentPotential16:: +gBattleDomeOpponentPotentialText16:: .string "The team most unlikely to win.$" -gBattleDomeOpponentPotential17:: +gBattleDomeOpponentPotentialText17:: .string "The perfect, invincible superstar!$" -gBattleDomeOpponentStyle1:: +gBattleDomeOpponentStyleText1:: .string "Willing to risk total disaster at times.$" -gBattleDomeOpponentStyle2:: +gBattleDomeOpponentStyleText2:: .string "Skilled at enduring long battles.$" -gBattleDomeOpponentStyle3:: +gBattleDomeOpponentStyleText3:: .string "Varies tactics to suit the opponent.$" -gBattleDomeOpponentStyle4:: +gBattleDomeOpponentStyleText4:: .string "Has a tough winning pattern.$" -gBattleDomeOpponentStyle5:: +gBattleDomeOpponentStyleText5:: .string "Occasionally uses a very rare move.$" -gBattleDomeOpponentStyle6:: +gBattleDomeOpponentStyleText6:: .string "Uses startling and disruptive moves.$" -gBattleDomeOpponentStyle7:: +gBattleDomeOpponentStyleText7:: .string "Constantly watches HP in battle.$" -gBattleDomeOpponentStyle8:: +gBattleDomeOpponentStyleText8:: .string "Good at storing then loosing power.$" -gBattleDomeOpponentStyle9:: +gBattleDomeOpponentStyleText9:: .string "Skilled at enfeebling foes.$" -gBattleDomeOpponentStyle10:: +gBattleDomeOpponentStyleText10:: .string "Prefers tactics that rely on luck.$" -gBattleDomeOpponentStyle11:: +gBattleDomeOpponentStyleText11:: .string "Attacks with a regal atmosphere.$" -gBattleDomeOpponentStyle12:: +gBattleDomeOpponentStyleText12:: .string "Attacks with powerful, low-PP moves.$" -gBattleDomeOpponentStyle13:: +gBattleDomeOpponentStyleText13:: .string "Skilled at enfeebling, then attacking.$" -gBattleDomeOpponentStyle14:: +gBattleDomeOpponentStyleText14:: .string "Battles while enduring all attacks.$" -gBattleDomeOpponentStyle15:: +gBattleDomeOpponentStyleText15:: .string "Skilled at upsetting foes emotionally.$" -gBattleDomeOpponentStyle16:: +gBattleDomeOpponentStyleText16:: .string "Uses strong and straightforward moves.$" -gBattleDomeOpponentStyle17:: +gBattleDomeOpponentStyleText17:: .string "Aggressively uses strong moves.$" -gBattleDomeOpponentStyle18:: +gBattleDomeOpponentStyleText18:: .string "Battles while cleverly dodging attacks.$" -gBattleDomeOpponentStyle19:: +gBattleDomeOpponentStyleText19:: .string "Skilled at using upsetting attacks.$" -gBattleDomeOpponentStyle20:: +gBattleDomeOpponentStyleText20:: .string "Uses many popular moves.$" -gBattleDomeOpponentStyle21:: +gBattleDomeOpponentStyleText21:: .string "Has moves for powerful combinations.$" -gBattleDomeOpponentStyle22:: +gBattleDomeOpponentStyleText22:: .string "Uses high-probability attacks.$" -gBattleDomeOpponentStyle23:: +gBattleDomeOpponentStyleText23:: .string "Aggressively uses spectacular moves.$" -gBattleDomeOpponentStyle24:: +gBattleDomeOpponentStyleText24:: .string "Emphasizes offense over defense.$" -gBattleDomeOpponentStyle25:: +gBattleDomeOpponentStyleText25:: .string "Emphasizes defense over offense.$" -gBattleDomeOpponentStyle26:: +gBattleDomeOpponentStyleText26:: .string "Attacks quickly with strong moves.$" -gBattleDomeOpponentStyle27:: +gBattleDomeOpponentStyleText27:: .string "Often uses moves with added effects.$" -gBattleDomeOpponentStyle28:: +gBattleDomeOpponentStyleText28:: .string "Uses a well-balanced mix of moves.$" -gBattleDomeOpponentStyleUnused1:: +gBattleDomeOpponentStyleTextUnused1:: .string "This is sample message 1.$" -gBattleDomeOpponentStyleUnused2:: +gBattleDomeOpponentStyleTextUnused2:: .string "This is sample message 2.$" -gBattleDomeOpponentStyleUnused3:: +gBattleDomeOpponentStyleTextUnused3:: .string "This is sample message 3.$" -gBattleDomeOpponentStyleUnused4:: +gBattleDomeOpponentStyleTextUnused4:: .string "This is sample message 4.$" -gBattleDomeOpponentStats1:: +gBattleDomeOpponentStatsText1:: .string "Emphasizes HP and ATTACK.$" -gBattleDomeOpponentStats2:: +gBattleDomeOpponentStatsText2:: .string "Emphasizes HP and DEFENSE.$" -gBattleDomeOpponentStats3:: +gBattleDomeOpponentStatsText3:: .string "Emphasizes HP and SPEED.$" -gBattleDomeOpponentStats4:: +gBattleDomeOpponentStatsText4:: .string "Emphasizes HP and SP. ATTACK.$" -gBattleDomeOpponentStats5:: +gBattleDomeOpponentStatsText5:: .string "Emphasizes HP and SP. DEFENSE.$" -gBattleDomeOpponentStats6:: +gBattleDomeOpponentStatsText6:: .string "Emphasizes ATTACK and DEFENSE.$" -gBattleDomeOpponentStats7:: +gBattleDomeOpponentStatsText7:: .string "Emphasizes ATTACK and SPEED.$" -gBattleDomeOpponentStats8:: +gBattleDomeOpponentStatsText8:: .string "Emphasizes ATTACK and SP. ATTACK.$" -gBattleDomeOpponentStats9:: +gBattleDomeOpponentStatsText9:: .string "Emphasizes ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats10:: +gBattleDomeOpponentStatsText10:: .string "Emphasizes DEFENSE and SPEED.$" -gBattleDomeOpponentStats11:: +gBattleDomeOpponentStatsText11:: .string "Emphasizes DEFENSE and SP. ATTACK.$" -gBattleDomeOpponentStats12:: +gBattleDomeOpponentStatsText12:: .string "Emphasizes DEFENSE and SP. DEFENSE.$" -gBattleDomeOpponentStats13:: +gBattleDomeOpponentStatsText13:: .string "Emphasizes SPEED and SP. ATTACK.$" -gBattleDomeOpponentStats14:: +gBattleDomeOpponentStatsText14:: .string "Emphasizes SPEED and SP. DEFENSE.$" -gBattleDomeOpponentStats15:: +gBattleDomeOpponentStatsText15:: .string "Emphasizes SP. ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats16:: +gBattleDomeOpponentStatsText16:: .string "Emphasizes HP.$" -gBattleDomeOpponentStats17:: +gBattleDomeOpponentStatsText17:: .string "Emphasizes ATTACK.$" -gBattleDomeOpponentStats18:: +gBattleDomeOpponentStatsText18:: .string "Emphasizes DEFENSE.$" -gBattleDomeOpponentStats19:: +gBattleDomeOpponentStatsText19:: .string "Emphasizes SPEED.$" -gBattleDomeOpponentStats20:: +gBattleDomeOpponentStatsText20:: .string "Emphasizes SP. ATTACK.$" -gBattleDomeOpponentStats21:: +gBattleDomeOpponentStatsText21:: .string "Emphasizes SP. DEFENSE.$" -gBattleDomeOpponentStats22:: +gBattleDomeOpponentStatsText22:: .string "Neglects HP and ATTACK.$" -gBattleDomeOpponentStats23:: +gBattleDomeOpponentStatsText23:: .string "Neglects HP and DEFENSE.$" -gBattleDomeOpponentStats24:: +gBattleDomeOpponentStatsText24:: .string "Neglects HP and SPEED.$" -gBattleDomeOpponentStats25:: +gBattleDomeOpponentStatsText25:: .string "Neglects HP and SP. ATTACK.$" -gBattleDomeOpponentStats26:: +gBattleDomeOpponentStatsText26:: .string "Neglects HP and SP. DEFENSE.$" -gBattleDomeOpponentStats27:: +gBattleDomeOpponentStatsText27:: .string "Neglects ATTACK and DEFENSE.$" -gBattleDomeOpponentStats28:: +gBattleDomeOpponentStatsText28:: .string "Neglects ATTACK and SPEED.$" -gBattleDomeOpponentStats29:: +gBattleDomeOpponentStatsText29:: .string "Neglects ATTACK and SP. ATTACK.$" -gBattleDomeOpponentStats30:: +gBattleDomeOpponentStatsText30:: .string "Neglects ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats31:: +gBattleDomeOpponentStatsText31:: .string "Neglects DEFENSE and SPEED.$" -gBattleDomeOpponentStats32:: +gBattleDomeOpponentStatsText32:: .string "Neglects DEFENSE and SP. ATTACK.$" -gBattleDomeOpponentStats33:: +gBattleDomeOpponentStatsText33:: .string "Neglects DEFENSE and SP. DEFENSE.$" -gBattleDomeOpponentStats34:: +gBattleDomeOpponentStatsText34:: .string "Neglects SPEED and SP. ATTACK.$" -gBattleDomeOpponentStats35:: +gBattleDomeOpponentStatsText35:: .string "Neglects SPEED and SP. DEFENSE.$" -gBattleDomeOpponentStats36:: +gBattleDomeOpponentStatsText36:: .string "Neglects SP. ATTACK and SP. DEFENSE.$" -gBattleDomeOpponentStats37:: +gBattleDomeOpponentStatsText37:: .string "Neglects HP.$" -gBattleDomeOpponentStats38:: +gBattleDomeOpponentStatsText38:: .string "Neglects ATTACK.$" -gBattleDomeOpponentStats39:: +gBattleDomeOpponentStatsText39:: .string "Neglects DEFENSE.$" -gBattleDomeOpponentStats40:: +gBattleDomeOpponentStatsText40:: .string "Neglects SPEED.$" -gBattleDomeOpponentStats41:: +gBattleDomeOpponentStatsText41:: .string "Neglects SP. ATTACK.$" -gBattleDomeOpponentStats42:: +gBattleDomeOpponentStatsText42:: .string "Neglects SP. DEFENSE.$" -gBattleDomeOpponentStats43:: +gBattleDomeOpponentStatsText43:: .string "Raises POKéMON in a well-balanced way.$" -gBattleDomeWinStrings1:: +gBattleDomeWinText1:: .string "Let the battle begin!$" -gBattleDomeWinStrings2:: +gBattleDomeWinText2:: .string "{STR_VAR_1} won using {STR_VAR_2}!$" -gBattleDomeWinStrings3:: +gBattleDomeWinText3:: .string "{STR_VAR_1} became the champ!$" -gBattleDomeWinStrings4:: +gBattleDomeWinText4:: .string "{STR_VAR_1} won by default!$" -gBattleDomeWinStrings5:: +gBattleDomeWinText5:: .string "{STR_VAR_1} won outright by default!$" -gBattleDomeWinStrings6:: +gBattleDomeWinText6:: .string "{STR_VAR_1} won without using a move!$" -gBattleDomeWinStrings7:: +gBattleDomeWinText7:: .string "{STR_VAR_1} won outright with no moves!$" -gBattleDomeMatchNumber1:: +gBattleDomeMatchNumberText1:: .string "Round 1, Match 1$" -gBattleDomeMatchNumber2:: +gBattleDomeMatchNumberText2:: .string "Round 1, Match 2$" -gBattleDomeMatchNumber3:: +gBattleDomeMatchNumberText3:: .string "Round 1, Match 3$" -gBattleDomeMatchNumber4:: +gBattleDomeMatchNumberText4:: .string "Round 1, Match 4$" -gBattleDomeMatchNumber5:: +gBattleDomeMatchNumberText5:: .string "Round 1, Match 5$" -gBattleDomeMatchNumber6:: +gBattleDomeMatchNumberText6:: .string "Round 1, Match 6$" -gBattleDomeMatchNumber7:: +gBattleDomeMatchNumberText7:: .string "Round 1, Match 7$" -gBattleDomeMatchNumber8:: +gBattleDomeMatchNumberText8:: .string "Round 1, Match 8$" -gBattleDomeMatchNumber9:: +gBattleDomeMatchNumberText9:: .string "Round 2, Match 1$" -gBattleDomeMatchNumber10:: +gBattleDomeMatchNumberText10:: .string "Round 2, Match 2$" -gBattleDomeMatchNumber11:: +gBattleDomeMatchNumberText11:: .string "Round 2, Match 3$" -gBattleDomeMatchNumber12:: +gBattleDomeMatchNumberText12:: .string "Round 2, Match 4$" -gBattleDomeMatchNumber13:: +gBattleDomeMatchNumberText13:: .string "Semifinal Match 1$" -gBattleDomeMatchNumber14:: +gBattleDomeMatchNumberText14:: .string "Semifinal Match 2$" -gBattleDomeMatchNumber15:: +gBattleDomeMatchNumberText15:: .string "Final Match$" BattleFrontier_BattlePikeRandomRoom1_MapScripts_2C3E1B: @ 82C3E1B diff --git a/include/battle_dome.h b/include/battle_dome.h index 2265f14ce..d1dfdb100 100644 --- a/include/battle_dome.h +++ b/include/battle_dome.h @@ -3,7 +3,7 @@ extern u32 gUnknown_0203CD70; -s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); -s32 TrainerIdToDomeTournamentId(u16 trainerId); +int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId); +int TrainerIdToDomeTournamentId(u16 trainerId); #endif // GUARD_BATTLE_DOME_H diff --git a/include/strings.h b/include/strings.h index 15acde0f7..9557dcca2 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1687,6 +1687,122 @@ extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24692B[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_246ACF[]; extern const u8 BattleFrontier_BattleTowerMultiBattleRoom_Text_24649D[]; +// Battle Dome. +extern const u8 gBattleDomeOpponentPotentialText1[]; +extern const u8 gBattleDomeOpponentPotentialText2[]; +extern const u8 gBattleDomeOpponentPotentialText3[]; +extern const u8 gBattleDomeOpponentPotentialText4[]; +extern const u8 gBattleDomeOpponentPotentialText5[]; +extern const u8 gBattleDomeOpponentPotentialText6[]; +extern const u8 gBattleDomeOpponentPotentialText7[]; +extern const u8 gBattleDomeOpponentPotentialText8[]; +extern const u8 gBattleDomeOpponentPotentialText9[]; +extern const u8 gBattleDomeOpponentPotentialText10[]; +extern const u8 gBattleDomeOpponentPotentialText11[]; +extern const u8 gBattleDomeOpponentPotentialText12[]; +extern const u8 gBattleDomeOpponentPotentialText13[]; +extern const u8 gBattleDomeOpponentPotentialText14[]; +extern const u8 gBattleDomeOpponentPotentialText15[]; +extern const u8 gBattleDomeOpponentPotentialText16[]; +extern const u8 gBattleDomeOpponentPotentialText17[]; +extern const u8 gBattleDomeOpponentStyleText1[]; +extern const u8 gBattleDomeOpponentStyleText2[]; +extern const u8 gBattleDomeOpponentStyleText3[]; +extern const u8 gBattleDomeOpponentStyleText4[]; +extern const u8 gBattleDomeOpponentStyleText5[]; +extern const u8 gBattleDomeOpponentStyleText6[]; +extern const u8 gBattleDomeOpponentStyleText7[]; +extern const u8 gBattleDomeOpponentStyleText8[]; +extern const u8 gBattleDomeOpponentStyleText9[]; +extern const u8 gBattleDomeOpponentStyleText10[]; +extern const u8 gBattleDomeOpponentStyleText11[]; +extern const u8 gBattleDomeOpponentStyleText12[]; +extern const u8 gBattleDomeOpponentStyleText13[]; +extern const u8 gBattleDomeOpponentStyleText14[]; +extern const u8 gBattleDomeOpponentStyleText15[]; +extern const u8 gBattleDomeOpponentStyleText16[]; +extern const u8 gBattleDomeOpponentStyleText17[]; +extern const u8 gBattleDomeOpponentStyleText18[]; +extern const u8 gBattleDomeOpponentStyleText19[]; +extern const u8 gBattleDomeOpponentStyleText20[]; +extern const u8 gBattleDomeOpponentStyleText21[]; +extern const u8 gBattleDomeOpponentStyleText22[]; +extern const u8 gBattleDomeOpponentStyleText23[]; +extern const u8 gBattleDomeOpponentStyleText24[]; +extern const u8 gBattleDomeOpponentStyleText25[]; +extern const u8 gBattleDomeOpponentStyleText26[]; +extern const u8 gBattleDomeOpponentStyleText27[]; +extern const u8 gBattleDomeOpponentStyleText28[]; +extern const u8 gBattleDomeOpponentStyleTextUnused1[]; +extern const u8 gBattleDomeOpponentStyleTextUnused2[]; +extern const u8 gBattleDomeOpponentStyleTextUnused3[]; +extern const u8 gBattleDomeOpponentStyleTextUnused4[]; +extern const u8 gBattleDomeOpponentStatsText1[]; +extern const u8 gBattleDomeOpponentStatsText2[]; +extern const u8 gBattleDomeOpponentStatsText3[]; +extern const u8 gBattleDomeOpponentStatsText4[]; +extern const u8 gBattleDomeOpponentStatsText5[]; +extern const u8 gBattleDomeOpponentStatsText6[]; +extern const u8 gBattleDomeOpponentStatsText7[]; +extern const u8 gBattleDomeOpponentStatsText8[]; +extern const u8 gBattleDomeOpponentStatsText9[]; +extern const u8 gBattleDomeOpponentStatsText10[]; +extern const u8 gBattleDomeOpponentStatsText11[]; +extern const u8 gBattleDomeOpponentStatsText12[]; +extern const u8 gBattleDomeOpponentStatsText13[]; +extern const u8 gBattleDomeOpponentStatsText14[]; +extern const u8 gBattleDomeOpponentStatsText15[]; +extern const u8 gBattleDomeOpponentStatsText16[]; +extern const u8 gBattleDomeOpponentStatsText17[]; +extern const u8 gBattleDomeOpponentStatsText18[]; +extern const u8 gBattleDomeOpponentStatsText19[]; +extern const u8 gBattleDomeOpponentStatsText20[]; +extern const u8 gBattleDomeOpponentStatsText21[]; +extern const u8 gBattleDomeOpponentStatsText22[]; +extern const u8 gBattleDomeOpponentStatsText23[]; +extern const u8 gBattleDomeOpponentStatsText24[]; +extern const u8 gBattleDomeOpponentStatsText25[]; +extern const u8 gBattleDomeOpponentStatsText26[]; +extern const u8 gBattleDomeOpponentStatsText27[]; +extern const u8 gBattleDomeOpponentStatsText28[]; +extern const u8 gBattleDomeOpponentStatsText29[]; +extern const u8 gBattleDomeOpponentStatsText30[]; +extern const u8 gBattleDomeOpponentStatsText31[]; +extern const u8 gBattleDomeOpponentStatsText32[]; +extern const u8 gBattleDomeOpponentStatsText33[]; +extern const u8 gBattleDomeOpponentStatsText34[]; +extern const u8 gBattleDomeOpponentStatsText35[]; +extern const u8 gBattleDomeOpponentStatsText36[]; +extern const u8 gBattleDomeOpponentStatsText37[]; +extern const u8 gBattleDomeOpponentStatsText38[]; +extern const u8 gBattleDomeOpponentStatsText39[]; +extern const u8 gBattleDomeOpponentStatsText40[]; +extern const u8 gBattleDomeOpponentStatsText41[]; +extern const u8 gBattleDomeOpponentStatsText42[]; +extern const u8 gBattleDomeOpponentStatsText43[]; +extern const u8 gBattleDomeMatchNumberText1[]; +extern const u8 gBattleDomeMatchNumberText2[]; +extern const u8 gBattleDomeMatchNumberText3[]; +extern const u8 gBattleDomeMatchNumberText4[]; +extern const u8 gBattleDomeMatchNumberText5[]; +extern const u8 gBattleDomeMatchNumberText6[]; +extern const u8 gBattleDomeMatchNumberText7[]; +extern const u8 gBattleDomeMatchNumberText8[]; +extern const u8 gBattleDomeMatchNumberText9[]; +extern const u8 gBattleDomeMatchNumberText10[]; +extern const u8 gBattleDomeMatchNumberText11[]; +extern const u8 gBattleDomeMatchNumberText12[]; +extern const u8 gBattleDomeMatchNumberText13[]; +extern const u8 gBattleDomeMatchNumberText14[]; +extern const u8 gBattleDomeMatchNumberText15[]; +extern const u8 gBattleDomeWinText1[]; +extern const u8 gBattleDomeWinText2[]; +extern const u8 gBattleDomeWinText3[]; +extern const u8 gBattleDomeWinText4[]; +extern const u8 gBattleDomeWinText5[]; +extern const u8 gBattleDomeWinText6[]; +extern const u8 gBattleDomeWinText7[]; + // Battle Pyramid. extern const u8 BattlePyramid_ExitHintUp_Text1[]; extern const u8 BattlePyramid_ExitHintLeft_Text1[]; @@ -1815,6 +1931,8 @@ extern const u8 BattlePyramid_FiveTrainersRemaining_Text6[]; extern const u8 BattlePyramid_SixTrainersRemaining_Text6[]; extern const u8 BattlePyramid_SevenTrainersRemaining_Text6[]; + + // PC strings extern const u8 gText_ExitFromBox[]; extern const u8 gText_WhatDoYouWantToDo[]; diff --git a/src/battle_dome.c b/src/battle_dome.c index b9e27675b..f6327f31f 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -17,6 +17,7 @@ #include "text.h" #include "bg.h" #include "window.h" +#include "strings.h" #include "palette.h" #include "decompress.h" #include "party_menu.h" @@ -59,177 +60,62 @@ struct UnkStruct_860DD10 }; // text -extern const u8 gTrainerClassNames[][0xD]; - -extern const u8 gBattleDomeOpponentPotential1[]; -extern const u8 gBattleDomeOpponentPotential2[]; -extern const u8 gBattleDomeOpponentPotential3[]; -extern const u8 gBattleDomeOpponentPotential4[]; -extern const u8 gBattleDomeOpponentPotential5[]; -extern const u8 gBattleDomeOpponentPotential6[]; -extern const u8 gBattleDomeOpponentPotential7[]; -extern const u8 gBattleDomeOpponentPotential8[]; -extern const u8 gBattleDomeOpponentPotential9[]; -extern const u8 gBattleDomeOpponentPotential10[]; -extern const u8 gBattleDomeOpponentPotential11[]; -extern const u8 gBattleDomeOpponentPotential12[]; -extern const u8 gBattleDomeOpponentPotential13[]; -extern const u8 gBattleDomeOpponentPotential14[]; -extern const u8 gBattleDomeOpponentPotential15[]; -extern const u8 gBattleDomeOpponentPotential16[]; -extern const u8 gBattleDomeOpponentPotential17[]; -extern const u8 gBattleDomeOpponentStyle1[]; -extern const u8 gBattleDomeOpponentStyle2[]; -extern const u8 gBattleDomeOpponentStyle3[]; -extern const u8 gBattleDomeOpponentStyle4[]; -extern const u8 gBattleDomeOpponentStyle5[]; -extern const u8 gBattleDomeOpponentStyle6[]; -extern const u8 gBattleDomeOpponentStyle7[]; -extern const u8 gBattleDomeOpponentStyle8[]; -extern const u8 gBattleDomeOpponentStyle9[]; -extern const u8 gBattleDomeOpponentStyle10[]; -extern const u8 gBattleDomeOpponentStyle11[]; -extern const u8 gBattleDomeOpponentStyle12[]; -extern const u8 gBattleDomeOpponentStyle13[]; -extern const u8 gBattleDomeOpponentStyle14[]; -extern const u8 gBattleDomeOpponentStyle15[]; -extern const u8 gBattleDomeOpponentStyle16[]; -extern const u8 gBattleDomeOpponentStyle17[]; -extern const u8 gBattleDomeOpponentStyle18[]; -extern const u8 gBattleDomeOpponentStyle19[]; -extern const u8 gBattleDomeOpponentStyle20[]; -extern const u8 gBattleDomeOpponentStyle21[]; -extern const u8 gBattleDomeOpponentStyle22[]; -extern const u8 gBattleDomeOpponentStyle23[]; -extern const u8 gBattleDomeOpponentStyle24[]; -extern const u8 gBattleDomeOpponentStyle25[]; -extern const u8 gBattleDomeOpponentStyle26[]; -extern const u8 gBattleDomeOpponentStyle27[]; -extern const u8 gBattleDomeOpponentStyle28[]; -extern const u8 gBattleDomeOpponentStyleUnused1[]; -extern const u8 gBattleDomeOpponentStyleUnused2[]; -extern const u8 gBattleDomeOpponentStyleUnused3[]; -extern const u8 gBattleDomeOpponentStyleUnused4[]; -extern const u8 gBattleDomeOpponentStats1[]; -extern const u8 gBattleDomeOpponentStats2[]; -extern const u8 gBattleDomeOpponentStats3[]; -extern const u8 gBattleDomeOpponentStats4[]; -extern const u8 gBattleDomeOpponentStats5[]; -extern const u8 gBattleDomeOpponentStats6[]; -extern const u8 gBattleDomeOpponentStats7[]; -extern const u8 gBattleDomeOpponentStats8[]; -extern const u8 gBattleDomeOpponentStats9[]; -extern const u8 gBattleDomeOpponentStats10[]; -extern const u8 gBattleDomeOpponentStats11[]; -extern const u8 gBattleDomeOpponentStats12[]; -extern const u8 gBattleDomeOpponentStats13[]; -extern const u8 gBattleDomeOpponentStats14[]; -extern const u8 gBattleDomeOpponentStats15[]; -extern const u8 gBattleDomeOpponentStats16[]; -extern const u8 gBattleDomeOpponentStats17[]; -extern const u8 gBattleDomeOpponentStats18[]; -extern const u8 gBattleDomeOpponentStats19[]; -extern const u8 gBattleDomeOpponentStats20[]; -extern const u8 gBattleDomeOpponentStats21[]; -extern const u8 gBattleDomeOpponentStats22[]; -extern const u8 gBattleDomeOpponentStats23[]; -extern const u8 gBattleDomeOpponentStats24[]; -extern const u8 gBattleDomeOpponentStats25[]; -extern const u8 gBattleDomeOpponentStats26[]; -extern const u8 gBattleDomeOpponentStats27[]; -extern const u8 gBattleDomeOpponentStats28[]; -extern const u8 gBattleDomeOpponentStats29[]; -extern const u8 gBattleDomeOpponentStats30[]; -extern const u8 gBattleDomeOpponentStats31[]; -extern const u8 gBattleDomeOpponentStats32[]; -extern const u8 gBattleDomeOpponentStats33[]; -extern const u8 gBattleDomeOpponentStats34[]; -extern const u8 gBattleDomeOpponentStats35[]; -extern const u8 gBattleDomeOpponentStats36[]; -extern const u8 gBattleDomeOpponentStats37[]; -extern const u8 gBattleDomeOpponentStats38[]; -extern const u8 gBattleDomeOpponentStats39[]; -extern const u8 gBattleDomeOpponentStats40[]; -extern const u8 gBattleDomeOpponentStats41[]; -extern const u8 gBattleDomeOpponentStats42[]; -extern const u8 gBattleDomeOpponentStats43[]; -extern const u8 gBattleDomeMatchNumber1[]; -extern const u8 gBattleDomeMatchNumber2[]; -extern const u8 gBattleDomeMatchNumber3[]; -extern const u8 gBattleDomeMatchNumber4[]; -extern const u8 gBattleDomeMatchNumber5[]; -extern const u8 gBattleDomeMatchNumber6[]; -extern const u8 gBattleDomeMatchNumber7[]; -extern const u8 gBattleDomeMatchNumber8[]; -extern const u8 gBattleDomeMatchNumber9[]; -extern const u8 gBattleDomeMatchNumber10[]; -extern const u8 gBattleDomeMatchNumber11[]; -extern const u8 gBattleDomeMatchNumber12[]; -extern const u8 gBattleDomeMatchNumber13[]; -extern const u8 gBattleDomeMatchNumber14[]; -extern const u8 gBattleDomeMatchNumber15[]; -extern const u8 gBattleDomeWinStrings1[]; -extern const u8 gBattleDomeWinStrings2[]; -extern const u8 gBattleDomeWinStrings3[]; -extern const u8 gBattleDomeWinStrings4[]; -extern const u8 gBattleDomeWinStrings5[]; -extern const u8 gBattleDomeWinStrings6[]; -extern const u8 gBattleDomeWinStrings7[]; +extern const u8 gTrainerClassNames[][13]; // This file's functions. static u8 GetDomeTrainerMonIvs(u16 trainerId); -static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray); -static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats); -static void CreateDomeTrainerMons(u16 tournamentTrainerId); -static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1); -static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1); -static s32 GetTypeEffectivenessPoints(s32 move, s32 species, s32 arg2); -static s32 sub_818FEB4(s32 *arr, bool8 arg1); -static void sub_8190400(u8 taskId); +static void SwapDomeTrainers(int id1, int id2, u16 *statsArray); +static void CalcDomeMonStats(u16 species, int level, int ivs, u8 evBits, u8 nature, int *stats); +static void CreateDomeOpponentMons(u16 tournamentTrainerId); +static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1); +static int sub_818FDB8(u16 tournamentTrainerId, bool8 arg1); +static int GetTypeEffectivenessPoints(int move, int species, int arg2); +static int sub_818FEB4(int *arr, bool8 arg1); +static void Task_ShowOpponentInfo(u8 taskId); static void sub_8190CD4(u8 taskId); static u8 sub_819221C(u8 taskId); -static void sub_8194D48(void); -static s32 TrainerIdToTournamentId(u16 trainerId); +static void InitDomeFacilityTrainersAndMons(void); +static int TrainerIdToTournamentId(u16 trainerId); static u16 TrainerIdOfPlayerOpponent(void); -static void sub_8194220(u8 taskId); +static void Task_ShowTourneyTree(u8 taskId); static void sub_8194950(u8 taskId); static void CB2_BattleDome(void); static void VblankCb0_BattleDome(void); static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo); static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId); -static s32 sub_8192F08(u8, u8*); +static int sub_8192F08(u8, u8*); static u8 GetDomeBrainTrainerPicId(void); static u8 GetDomeBrainTrainerClass(void); -static void CopyDomeBrainTrainerName(u8 *dst); -static void CopyDomeTrainerName(u8 *dst, u16 trainerId); +static void CopyDomeBrainTrainerName(u8 *str); +static void CopyDomeTrainerName(u8 *str, u16 trainerId); static void HblankCb_BattleDome(void); static void VblankCb1_BattleDome(void); -static u8 sub_8193BDC(u8 taskId); +static u8 UpdateTourneyTreeCursor(u8 taskId); static void DecideRoundWinners(u8 roundId); static u8 sub_81953E8(u8 tournamentId, u8); static void sub_81948EC(u8, u8); static void sub_8190B40(struct Sprite *sprite); static void sub_8190C6C(struct Sprite *sprite); -static void sub_818E9CC(void); -static void sub_818EA84(void); -static void sub_818ED28(void); -static void sub_818F9B0(void); -static void sub_818F9E0(void); -static void sub_818FA20(void); +static void InitDomeChallenge(void); +static void GetDomeData(void); +static void SetDomeData(void); +static void BufferDomeRoundText(void); +static void BufferDomeOpponentName(void); +static void InitDomeOpponentParty(void); static void ShowDomeOpponentInfo(void); -static void sub_81938A4(void); -static void sub_81938E0(void); -static void sub_8190298(void); -static void sub_81902E4(void); -static void sub_8193D40(void); -static void sub_8193D7C(void); +static void ShowDomeTourneyTree(void); +static void ShowPreviousDomeResultsTourneyTree(void); +static void SetDomeOpponentId(void); +static void SetDomeOpponentGraphicsId(void); +static void ShowNonInteractiveDomeTourneyTree(void); +static void ResolveDomeRoundWinners(void); static void sub_81902F8(void); -static void sub_819033C(void); -static void sub_8194D68(void); -static void sub_8194E44(void); -static void sub_8194EB4(void); -static void sub_8194EC0(void); -static void sub_8194EF8(void); +static void UpdateDomeStreaks(void); +static void RestoreDomePlayerParty(void); +static void RestoreDomePlayerPartyHeldItems(void); +static void ReduceDomePlayerPartyTo3Mons(void); +static void GetPlayerSeededBeforeOpponent(void); +static void BufferLastDomeWinnerName(void); static void sub_8194F58(void); static void InitDomeTrainers(void); @@ -240,7 +126,7 @@ static EWRAM_DATA struct BattleDomeStruct *sBattleDomeStruct = {0}; static EWRAM_DATA u8 *sTilemapBuffer = NULL; // Const rom data. -static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = +static const u8 sMovePointsForDomeTrainers[][DOME_TOURNAMENT_TRAINERS_COUNT] = { [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, @@ -645,7 +531,7 @@ static const u8 sUnusedArray[] = 0, 0, 0, 254, 0, 0, 0, 0, 0, }; -static const u8 gUnknown_0860CBF1[][5][4]= +static const u8 sTourneyTreeCursorMovementMap[][5][4]= { {{0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}, {0x07, 0x01, 0x08, 0x10}}, {{0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}, {0x00, 0x02, 0x09, 0x10}}, @@ -960,14 +846,14 @@ static const struct WindowTemplate gUnknown_0860CEB4[] = // UB: No DUMMY_WIN_TEMPLATE at the array's end. }; -static const struct ScanlineEffectParams gUnknown_0860CF44 = +static const struct ScanlineEffectParams sTourneyTreeScanlineEffectParams = { .dmaDest = (void *)REG_ADDR_BG3CNT, - .dmaControl = 0xa2600001, + .dmaControl = SCANLINE_EFFECT_DMACNT_16BIT, .initState = 1, }; -static const struct CompressedSpriteSheet gUnknown_0860CF50[] = +static const struct CompressedSpriteSheet sDomeOptionsSpriteSheet[] = { {gBattleFrontierGfx_DomeOptions, 0x0600, 0x0000}, {}, @@ -1191,34 +1077,31 @@ static const struct SpriteTemplate gUnknown_0860D068 = .callback = sub_8190C6C }; -static const u8 gUnknown_0860D080[DOME_TOURNAMENT_TRAINERS_COUNT] = -{ - 0x00, 0x08, 0x0c, 0x04, 0x07, 0x0f, 0x0b, 0x03, 0x02, 0x0a, 0x0e, 0x06, 0x05, 0x0d, 0x09, 0x01 -}; +static const u8 sTourneyTreeTrainerIds[] = {0, 8, 12, 4, 7, 15, 11, 3, 2, 10, 14, 6, 5, 13, 9, 1}; -static void (* const gUnknown_0860D090[])(void) = +static void (* const sBattleDomeFunctions[])(void) = { - sub_818E9CC, - sub_818EA84, - sub_818ED28, - sub_818F9B0, - sub_818F9E0, - sub_818FA20, + InitDomeChallenge, + GetDomeData, + SetDomeData, + BufferDomeRoundText, + BufferDomeOpponentName, + InitDomeOpponentParty, ShowDomeOpponentInfo, - sub_81938A4, - sub_81938E0, - sub_8190298, - sub_81902E4, - sub_8193D40, - sub_8193D7C, + ShowDomeTourneyTree, + ShowPreviousDomeResultsTourneyTree, + SetDomeOpponentId, + SetDomeOpponentGraphicsId, + ShowNonInteractiveDomeTourneyTree, + ResolveDomeRoundWinners, sub_81902F8, - sub_819033C, - sub_8194D48, - sub_8194D68, - sub_8194E44, - sub_8194EB4, - sub_8194EC0, - sub_8194EF8, + UpdateDomeStreaks, + InitDomeFacilityTrainersAndMons, + RestoreDomePlayerParty, + RestoreDomePlayerPartyHeldItems, + ReduceDomePlayerPartyTo3Mons, + GetPlayerSeededBeforeOpponent, + BufferLastDomeWinnerName, sub_8194F58, InitDomeTrainers, }; @@ -1293,108 +1176,108 @@ static const u8 gUnknown_0860D1A0[][4] = static const u8 gUnknown_0860D1C0[] = {0x00, 0x0f, 0x08, 0x07, 0x03, 0x0c, 0x0b, 0x04, 0x01, 0x0e, 0x09, 0x06, 0x02, 0x0d, 0x0a, 0x05}; -static const u8 *const gBattleDomePotentialPointers[] = +static const u8 *const sBattleDomePotentialTexts[] = { - gBattleDomeOpponentPotential1, - gBattleDomeOpponentPotential2, - gBattleDomeOpponentPotential3, - gBattleDomeOpponentPotential4, - gBattleDomeOpponentPotential5, - gBattleDomeOpponentPotential6, - gBattleDomeOpponentPotential7, - gBattleDomeOpponentPotential8, - gBattleDomeOpponentPotential9, - gBattleDomeOpponentPotential10, - gBattleDomeOpponentPotential11, - gBattleDomeOpponentPotential12, - gBattleDomeOpponentPotential13, - gBattleDomeOpponentPotential14, - gBattleDomeOpponentPotential15, - gBattleDomeOpponentPotential16, - gBattleDomeOpponentPotential17, + gBattleDomeOpponentPotentialText1, + gBattleDomeOpponentPotentialText2, + gBattleDomeOpponentPotentialText3, + gBattleDomeOpponentPotentialText4, + gBattleDomeOpponentPotentialText5, + gBattleDomeOpponentPotentialText6, + gBattleDomeOpponentPotentialText7, + gBattleDomeOpponentPotentialText8, + gBattleDomeOpponentPotentialText9, + gBattleDomeOpponentPotentialText10, + gBattleDomeOpponentPotentialText11, + gBattleDomeOpponentPotentialText12, + gBattleDomeOpponentPotentialText13, + gBattleDomeOpponentPotentialText14, + gBattleDomeOpponentPotentialText15, + gBattleDomeOpponentPotentialText16, + gBattleDomeOpponentPotentialText17, }; -static const u8 *const gBattleDomeOpponentStylePointers[] = +static const u8 *const sBattleDomeOpponentStyleTexts[] = { - gBattleDomeOpponentStyle1, - gBattleDomeOpponentStyle2, - gBattleDomeOpponentStyle3, - gBattleDomeOpponentStyle4, - gBattleDomeOpponentStyle5, - gBattleDomeOpponentStyle6, - gBattleDomeOpponentStyle7, - gBattleDomeOpponentStyle8, - gBattleDomeOpponentStyle9, - gBattleDomeOpponentStyle10, - gBattleDomeOpponentStyle11, - gBattleDomeOpponentStyle12, - gBattleDomeOpponentStyle13, - gBattleDomeOpponentStyle14, - gBattleDomeOpponentStyle15, - gBattleDomeOpponentStyle16, - gBattleDomeOpponentStyle17, - gBattleDomeOpponentStyle18, - gBattleDomeOpponentStyle19, - gBattleDomeOpponentStyle20, - gBattleDomeOpponentStyle21, - gBattleDomeOpponentStyle22, - gBattleDomeOpponentStyle23, - gBattleDomeOpponentStyle24, - gBattleDomeOpponentStyle25, - gBattleDomeOpponentStyle26, - gBattleDomeOpponentStyle27, - gBattleDomeOpponentStyle28, - gBattleDomeOpponentStyleUnused1, - gBattleDomeOpponentStyleUnused2, - gBattleDomeOpponentStyleUnused3, - gBattleDomeOpponentStyleUnused4, + gBattleDomeOpponentStyleText1, + gBattleDomeOpponentStyleText2, + gBattleDomeOpponentStyleText3, + gBattleDomeOpponentStyleText4, + gBattleDomeOpponentStyleText5, + gBattleDomeOpponentStyleText6, + gBattleDomeOpponentStyleText7, + gBattleDomeOpponentStyleText8, + gBattleDomeOpponentStyleText9, + gBattleDomeOpponentStyleText10, + gBattleDomeOpponentStyleText11, + gBattleDomeOpponentStyleText12, + gBattleDomeOpponentStyleText13, + gBattleDomeOpponentStyleText14, + gBattleDomeOpponentStyleText15, + gBattleDomeOpponentStyleText16, + gBattleDomeOpponentStyleText17, + gBattleDomeOpponentStyleText18, + gBattleDomeOpponentStyleText19, + gBattleDomeOpponentStyleText20, + gBattleDomeOpponentStyleText21, + gBattleDomeOpponentStyleText22, + gBattleDomeOpponentStyleText23, + gBattleDomeOpponentStyleText24, + gBattleDomeOpponentStyleText25, + gBattleDomeOpponentStyleText26, + gBattleDomeOpponentStyleText27, + gBattleDomeOpponentStyleText28, + gBattleDomeOpponentStyleTextUnused1, + gBattleDomeOpponentStyleTextUnused2, + gBattleDomeOpponentStyleTextUnused3, + gBattleDomeOpponentStyleTextUnused4, }; -static const u8 *const gBattleDomeOpponentStatsPointers[] = +static const u8 *const sBattleDomeOpponentStatsTexts[] = { - gBattleDomeOpponentStats1, - gBattleDomeOpponentStats2, - gBattleDomeOpponentStats3, - gBattleDomeOpponentStats4, - gBattleDomeOpponentStats5, - gBattleDomeOpponentStats6, - gBattleDomeOpponentStats7, - gBattleDomeOpponentStats8, - gBattleDomeOpponentStats9, - gBattleDomeOpponentStats10, - gBattleDomeOpponentStats11, - gBattleDomeOpponentStats12, - gBattleDomeOpponentStats13, - gBattleDomeOpponentStats14, - gBattleDomeOpponentStats15, - gBattleDomeOpponentStats16, - gBattleDomeOpponentStats17, - gBattleDomeOpponentStats18, - gBattleDomeOpponentStats19, - gBattleDomeOpponentStats20, - gBattleDomeOpponentStats21, - gBattleDomeOpponentStats22, - gBattleDomeOpponentStats23, - gBattleDomeOpponentStats24, - gBattleDomeOpponentStats25, - gBattleDomeOpponentStats26, - gBattleDomeOpponentStats27, - gBattleDomeOpponentStats28, - gBattleDomeOpponentStats29, - gBattleDomeOpponentStats30, - gBattleDomeOpponentStats31, - gBattleDomeOpponentStats32, - gBattleDomeOpponentStats33, - gBattleDomeOpponentStats34, - gBattleDomeOpponentStats35, - gBattleDomeOpponentStats36, - gBattleDomeOpponentStats37, - gBattleDomeOpponentStats38, - gBattleDomeOpponentStats39, - gBattleDomeOpponentStats40, - gBattleDomeOpponentStats41, - gBattleDomeOpponentStats42, - gBattleDomeOpponentStats43, + gBattleDomeOpponentStatsText1, + gBattleDomeOpponentStatsText2, + gBattleDomeOpponentStatsText3, + gBattleDomeOpponentStatsText4, + gBattleDomeOpponentStatsText5, + gBattleDomeOpponentStatsText6, + gBattleDomeOpponentStatsText7, + gBattleDomeOpponentStatsText8, + gBattleDomeOpponentStatsText9, + gBattleDomeOpponentStatsText10, + gBattleDomeOpponentStatsText11, + gBattleDomeOpponentStatsText12, + gBattleDomeOpponentStatsText13, + gBattleDomeOpponentStatsText14, + gBattleDomeOpponentStatsText15, + gBattleDomeOpponentStatsText16, + gBattleDomeOpponentStatsText17, + gBattleDomeOpponentStatsText18, + gBattleDomeOpponentStatsText19, + gBattleDomeOpponentStatsText20, + gBattleDomeOpponentStatsText21, + gBattleDomeOpponentStatsText22, + gBattleDomeOpponentStatsText23, + gBattleDomeOpponentStatsText24, + gBattleDomeOpponentStatsText25, + gBattleDomeOpponentStatsText26, + gBattleDomeOpponentStatsText27, + gBattleDomeOpponentStatsText28, + gBattleDomeOpponentStatsText29, + gBattleDomeOpponentStatsText30, + gBattleDomeOpponentStatsText31, + gBattleDomeOpponentStatsText32, + gBattleDomeOpponentStatsText33, + gBattleDomeOpponentStatsText34, + gBattleDomeOpponentStatsText35, + gBattleDomeOpponentStatsText36, + gBattleDomeOpponentStatsText37, + gBattleDomeOpponentStatsText38, + gBattleDomeOpponentStatsText39, + gBattleDomeOpponentStatsText40, + gBattleDomeOpponentStatsText41, + gBattleDomeOpponentStatsText42, + gBattleDomeOpponentStatsText43, }; static const u8 sInfoTrainerMonX[] = {0x68, 0x88, 0x68}; @@ -1403,34 +1286,34 @@ static const u8 gUnknown_0860D346[] = {0x00, 0x04, 0x00}; static const u8 gUnknown_0860D349[] = {0x00, 0x05, 0x09, 0x0c, 0x0e, 0x00, 0x00}; -static const u8 *const gBattleDomeMatchNumberPointers[] = +static const u8 *const sBattleDomeMatchNumberTexts[] = { - gBattleDomeMatchNumber1, - gBattleDomeMatchNumber2, - gBattleDomeMatchNumber3, - gBattleDomeMatchNumber4, - gBattleDomeMatchNumber5, - gBattleDomeMatchNumber6, - gBattleDomeMatchNumber7, - gBattleDomeMatchNumber8, - gBattleDomeMatchNumber9, - gBattleDomeMatchNumber10, - gBattleDomeMatchNumber11, - gBattleDomeMatchNumber12, - gBattleDomeMatchNumber13, - gBattleDomeMatchNumber14, - gBattleDomeMatchNumber15, + gBattleDomeMatchNumberText1, + gBattleDomeMatchNumberText2, + gBattleDomeMatchNumberText3, + gBattleDomeMatchNumberText4, + gBattleDomeMatchNumberText5, + gBattleDomeMatchNumberText6, + gBattleDomeMatchNumberText7, + gBattleDomeMatchNumberText8, + gBattleDomeMatchNumberText9, + gBattleDomeMatchNumberText10, + gBattleDomeMatchNumberText11, + gBattleDomeMatchNumberText12, + gBattleDomeMatchNumberText13, + gBattleDomeMatchNumberText14, + gBattleDomeMatchNumberText15, }; -static const u8 *const gBattleDomeWinStringsPointers[] = +static const u8 *const sBattleDomeWinTexts[] = { - gBattleDomeWinStrings1, - gBattleDomeWinStrings2, - gBattleDomeWinStrings3, - gBattleDomeWinStrings4, - gBattleDomeWinStrings5, - gBattleDomeWinStrings6, - gBattleDomeWinStrings7, + gBattleDomeWinText1, + gBattleDomeWinText2, + gBattleDomeWinText3, + gBattleDomeWinText4, + gBattleDomeWinText5, + gBattleDomeWinText6, + gBattleDomeWinText7, }; static const u8 sFirstTrainerMonX[] = {0x60, 0x60, 0x60}; @@ -2373,10 +2256,10 @@ static const u8 gUnknown_0860DE10[DOME_TOURNAMENT_TRAINERS_COUNT][4] = // code void CallBattleDomeFunction(void) { - gUnknown_0860D090[gSpecialVar_0x8004](); + sBattleDomeFunctions[gSpecialVar_0x8004](); } -static void sub_818E9CC(void) +static void InitDomeChallenge(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -2392,7 +2275,7 @@ static void sub_818E9CC(void) gTrainerBattleOpponent_A = 0; } -static void sub_818EA84(void) +static void GetDomeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -2460,7 +2343,7 @@ static void sub_818EA84(void) } } -static void sub_818ED28(void) +static void SetDomeData(void) { u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u32 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -2528,21 +2411,21 @@ static void sub_818ED28(void) static void InitDomeTrainers(void) { - s32 i, j, k; - s32 monLevel; - s32 species[3]; - s32 monTypesBits, monTypesCount; - s32 trainerId; - s32 monSetId; + int i, j, k; + int monLevel; + int species[3]; + int monTypesBits, monTypesCount; + int trainerId; + int monSetId; u16 *statSums; - s32 *statValues; + int *statValues; u8 ivs = 0; species[0] = 0; species[1] = 0; species[2] = 0; statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); - statValues = AllocZeroed(sizeof(s32) * 6); + statValues = AllocZeroed(sizeof(int) * 6); gSaveBlock2Ptr->frontier.field_D0A = gSaveBlock2Ptr->frontier.lvlMode + 1; gSaveBlock2Ptr->frontier.field_D0B = VarGet(VAR_FRONTIER_BATTLE_MODE) + 1; @@ -2599,7 +2482,7 @@ static void InitDomeTrainers(void) monSetId = RandomizeFacilityTrainerMonSet(trainerId); for (k = 0; k < j; k++) { - s32 checkingMonSetId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; + int checkingMonSetId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; if (checkingMonSetId == monSetId || species[0] == gFacilityTrainerMons[monSetId].species || species[1] == gFacilityTrainerMons[monSetId].species @@ -2729,12 +2612,12 @@ static void InitDomeTrainers(void) stats[statIndex] = (u8) ModifyStatByNature(nature, stats[statIndex], statIndex); \ } -static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 nature, s32 *stats) +static void CalcDomeMonStats(u16 species, int level, int ivs, u8 evBits, u8 nature, int *stats) { - s32 i, count; + int i, count; u8 bits; u16 resultingEvs; - s32 evs[NUM_STATS]; + int evs[NUM_STATS]; count = 0, bits = evBits; for (i = 0; i < NUM_STATS; bits >>= 1, i++) @@ -2757,7 +2640,7 @@ static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 natu } else { - s32 n = 2 * gBaseStats[species].baseHP; + int n = 2 * gBaseStats[species].baseHP; stats[STAT_HP] = (((n + ivs + evs[STAT_HP] / 4) * level) / 100) + level + 10; } @@ -2768,9 +2651,9 @@ static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 natu CALC_STAT(baseSpDefense, STAT_SPDEF); } -static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray) +static void SwapDomeTrainers(int id1, int id2, u16 *statsArray) { - s32 i; + int i; u16 temp; SWAP(statsArray[id1], statsArray[id2], temp); @@ -2780,29 +2663,29 @@ static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray) SWAP(gSaveBlock2Ptr->frontier.domeMonIds[id1][i], gSaveBlock2Ptr->frontier.domeMonIds[id2][i], temp); } -static void sub_818F9B0(void) +static void BufferDomeRoundText(void) { StringCopy(gStringVar1, gRoundsStringTable[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); } -static void sub_818F9E0(void) +static void BufferDomeOpponentName(void) { StringCopy(gStringVar1, gRoundsStringTable[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); CopyDomeTrainerName(gStringVar2, gTrainerBattleOpponent_A); } -static void sub_818FA20(void) +static void InitDomeOpponentParty(void) { gUnknown_0203CD70 = 0; gUnknown_0203CD74 = GetMonData(&gPlayerParty[0], MON_DATA_MAX_HP, NULL); gUnknown_0203CD74 += GetMonData(&gPlayerParty[1], MON_DATA_MAX_HP, NULL); CalculatePlayerPartyCount(); - CreateDomeTrainerMons(TrainerIdToTournamentId(gTrainerBattleOpponent_A)); + CreateDomeOpponentMons(TrainerIdToTournamentId(gTrainerBattleOpponent_A)); } -static void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentMonId, u32 otId) +static void CreateDomeOpponentMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentMonId, u32 otId) { - s32 i; + int i; u8 happiness = 0xFF; u8 fixedIv = GetDomeTrainerMonIvs(tournamentTrainerId); // BUG: Should be using trainerId instead of tournamentTrainerId. As a result, all Pokemon have ivs of 3. u8 level = SetFacilityPtrsGetLevel(); @@ -2827,11 +2710,11 @@ static void CreateDomeMon(u8 monPartyId, u16 tournamentTrainerId, u8 tournamentM &gBattleFrontierHeldItems[gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[tournamentTrainerId][tournamentMonId]].itemTableId]); } -static void CreateDomeTrainerMons(u16 tournamentTrainerId) +static void CreateDomeOpponentMons(u16 tournamentTrainerId) { u8 monsCount = 0; u32 otId = 0; - s32 i, bits; + int i, bits; ZeroEnemyPartyMons(); bits = GetDomeTrainerMonCountInBits(tournamentTrainerId); @@ -2842,7 +2725,7 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId) { if (bits & 1) { - CreateDomeMon(monsCount, tournamentTrainerId, i, otId); + CreateDomeOpponentMon(monsCount, tournamentTrainerId, i, otId); monsCount++; } bits >>= 1; @@ -2854,7 +2737,7 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId) { if (bits & 4) { - CreateDomeMon(monsCount, tournamentTrainerId, i, otId); + CreateDomeOpponentMon(monsCount, tournamentTrainerId, i, otId); monsCount++; } bits <<= 1; @@ -2862,9 +2745,9 @@ static void CreateDomeTrainerMons(u16 tournamentTrainerId) } } -s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId) +int GetDomeTrainerMonCountInBits(u16 tournamentTrainerId) { - s32 bits; + int bits; if (Random() & 1) { bits = sub_818FCBC(tournamentTrainerId, FALSE); @@ -2881,10 +2764,10 @@ s32 GetDomeTrainerMonCountInBits(u16 tournamentTrainerId) return bits; } -static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) +static int sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) { - s32 i, moveId, playerMonId; - s32 array[3]; + int i, moveId, playerMonId; + int array[3]; for (i = 0; i < 3; i++) { @@ -2909,10 +2792,10 @@ static s32 sub_818FCBC(u16 tournamentTrainerId, bool8 arg1) return sub_818FEB4(array, arg1); } -static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) +static int sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) { - s32 i, moveId, playerMonId; - s32 array[3]; + int i, moveId, playerMonId; + int array[3]; for (i = 0; i < 3; i++) { @@ -2937,11 +2820,11 @@ static s32 sub_818FDB8(u16 tournamentTrainerId, bool8 arg1) return sub_818FEB4(array, arg1); } -static s32 sub_818FEB4(s32 *arr, bool8 arg1) +static int sub_818FEB4(int *arr, bool8 arg1) { - s32 i, j; - s32 bits = 0; - s32 array[3]; + int i, j; + int bits = 0; + int array[3]; for (i = 0; i < 3; i++) array[i] = i; @@ -2968,7 +2851,7 @@ static s32 sub_818FEB4(s32 *arr, bool8 arg1) { for (j = i + 1; j < 3; j++) { - s32 temp; + int temp; if (arr[i] < arr[j]) { @@ -3012,11 +2895,11 @@ static s32 sub_818FEB4(s32 *arr, bool8 arg1) // Functionally equivalent, while loop is impossible to match. #ifdef NONMATCHING -static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) +static int GetTypeEffectivenessPoints(int move, int targetSpecies, int arg2) { - s32 defType1, defType2, defAbility, moveType; - s32 i = 0; - s32 typePower = TYPE_x1; + int defType1, defType2, defAbility, moveType; + int i = 0; + int typePower = TYPE_x1; if (move == MOVE_NONE || move == 0xFFFF || gBattleMoves[move].power == 0) return 0; @@ -3131,7 +3014,7 @@ static s32 GetTypeEffectivenessPoints(s32 move, s32 targetSpecies, s32 arg2) } #else NAKED -static s32 GetTypeEffectivenessPoints(s32 move, s32 species, s32 arg2) +static int GetTypeEffectivenessPoints(int move, int species, int arg2) { asm_unified("\n\ push {r4-r7,lr}\n\ @@ -3394,9 +3277,9 @@ static u8 GetDomeTrainerMonIvs(u16 trainerId) return fixedIv; } -static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) +static int TournamentIdOfOpponent(int roundId, int trainerId) { - s32 i, j, val; + int i, j, val; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -3431,7 +3314,7 @@ static s32 TournamentIdOfOpponent(s32 roundId, s32 trainerId) } } -static void sub_8190298(void) +static void SetDomeOpponentId(void) { gTrainerBattleOpponent_A = TrainerIdOfPlayerOpponent(); } @@ -3441,7 +3324,7 @@ static u16 TrainerIdOfPlayerOpponent(void) return gSaveBlock2Ptr->frontier.domeTrainers[TournamentIdOfOpponent(gSaveBlock2Ptr->frontier.curChallengeBattleNum, TRAINER_PLAYER)].trainerId; } -static void sub_81902E4(void) +static void SetDomeOpponentGraphicsId(void) { SetBattleFacilityTrainerGfxId(gTrainerBattleOpponent_A, 0); } @@ -3454,7 +3337,7 @@ static void sub_81902F8(void) sub_81A4C30(); } -static void sub_819033C(void) +static void UpdateDomeStreaks(void) { u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); @@ -3470,7 +3353,7 @@ static void sub_819033C(void) static void ShowDomeOpponentInfo(void) { - u8 taskId = CreateTask(sub_8190400, 0); + u8 taskId = CreateTask(Task_ShowOpponentInfo, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = TrainerIdToTournamentId(TrainerIdOfPlayerOpponent()); gTasks[taskId].data[2] = 0; @@ -3479,12 +3362,12 @@ static void ShowDomeOpponentInfo(void) SetMainCallback2(CB2_BattleDome); } -static void sub_8190400(u8 taskId) +static void Task_ShowOpponentInfo(u8 taskId) { - s32 i; - s32 r5 = gTasks[taskId].data[1]; - s32 r9 = gTasks[taskId].data[2]; - s32 r7 = gTasks[taskId].data[3]; + int i; + int r5 = gTasks[taskId].data[1]; + int r9 = gTasks[taskId].data[2]; + int r7 = gTasks[taskId].data[3]; switch (gTasks[taskId].data[0]) { @@ -3531,7 +3414,7 @@ static void sub_8190400(u8 taskId) DecompressAndLoadBgGfxUsingHeap(2, gUnknown_08D83D50, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gUnknown_08D84970, 0x2000, 0, 1); DecompressAndLoadBgGfxUsingHeap(3, gUnknown_08D84F00, 0x800, 0, 1); - LoadCompressedSpriteSheet(gUnknown_0860CF50); + LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); @@ -3774,10 +3657,10 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite) static void sub_8190B40(struct Sprite *sprite) { - s32 taskId1 = sprite->data[0]; - s32 arrId = gTasks[gTasks[taskId1].data[4]].data[1]; - s32 tournmanetTrainerId = gUnknown_0860D080[arrId]; - s32 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; + int taskId1 = sprite->data[0]; + int arrId = gTasks[gTasks[taskId1].data[4]].data[1]; + int tournmanetTrainerId = sTourneyTreeTrainerIds[arrId]; + int roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (gTasks[taskId1].data[3] == 1) { @@ -3843,7 +3726,7 @@ static void sub_8190B40(struct Sprite *sprite) static void sub_8190C6C(struct Sprite *sprite) { - s32 taskId1 = sprite->data[0]; + int taskId1 = sprite->data[0]; if (gTasks[taskId1].data[3] == 1) { @@ -3873,12 +3756,12 @@ static void sub_8190C6C(struct Sprite *sprite) static void sub_8190CD4(u8 taskId) { - s32 i; - s32 windowId = 0; - s32 r9 = gTasks[taskId].data[3]; - s32 taskId2 = gTasks[taskId].data[4]; - s32 trainerTournamentId = 0; - s32 matchNo = 0; + int i; + int windowId = 0; + int r9 = gTasks[taskId].data[3]; + int taskId2 = gTasks[taskId].data[4]; + int trainerTournamentId = 0; + int matchNo = 0; switch (gTasks[taskId].data[0]) { @@ -3946,14 +3829,14 @@ static void sub_8190CD4(u8 taskId) { gBattle_BG2_X = 0; gBattle_BG2_Y = 320; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 0x10, trainerTournamentId); } else { gBattle_BG2_X = 256; gBattle_BG2_Y = 0; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 0x10, trainerTournamentId); sBattleDomeStruct->unk_10 = 0; } @@ -4062,14 +3945,14 @@ static void sub_8190CD4(u8 taskId) { gBattle_BG2_X = 0; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 4, trainerTournamentId); } else { gBattle_BG2_X = 0; gBattle_BG2_Y = 0; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 4, trainerTournamentId); sBattleDomeStruct->unk_10 = 0; } @@ -4175,7 +4058,7 @@ static void sub_8190CD4(u8 taskId) { gBattle_BG2_X = 256; gBattle_BG2_Y = 160; - trainerTournamentId = gUnknown_0860D080[gTasks[taskId2].data[1]]; + trainerTournamentId = sTourneyTreeTrainerIds[gTasks[taskId2].data[1]]; DisplayTrainerInfoOnCard(gTasks[taskId].data[2] | 8, trainerTournamentId); } else @@ -4574,7 +4457,7 @@ static void sub_8190CD4(u8 taskId) } else { - i = CreateTask(sub_8194220, 0); + i = CreateTask(Task_ShowTourneyTree, 0); gTasks[i].data[0] = 0; gTasks[i].data[1] = 0; gTasks[i].data[2] = 3; @@ -4590,9 +4473,9 @@ static void sub_8190CD4(u8 taskId) static u8 sub_819221C(u8 taskId) { u8 retVal = 0; - s32 taskId2 = gTasks[taskId].data[4]; - s32 r5 = gTasks[taskId2].data[1]; - u8 r10 = gUnknown_0860D080[r5]; + int taskId2 = gTasks[taskId].data[4]; + int r5 = gTasks[taskId2].data[1]; + u8 r10 = sTourneyTreeTrainerIds[r5]; u16 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (gMain.newKeys & (A_BUTTON | B_BUTTON)) @@ -4699,12 +4582,12 @@ static u8 sub_819221C(u8 taskId) static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) { struct TextPrinterTemplate textPrinter; - s32 i, j, k; - s32 trainerId = 0; + int i, j, k; + int trainerId = 0; u8 nature = 0; - s32 arrId = 0; - s32 windowId = 0; - s32 x = 0, y = 0; + int arrId = 0; + int windowId = 0; + int x = 0, y = 0; u8 palSlot = 0; s16 *allocatedArray = AllocZeroed(sizeof(s16) * 18); trainerId = gSaveBlock2Ptr->frontier.domeTrainers[trainerTournamentId].trainerId; @@ -4835,9 +4718,9 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) PutWindowTilemap(windowId + 4); CopyWindowToVram(windowId + 4, 3); if (trainerId == TRAINER_FRONTIER_BRAIN) - textPrinter.currentChar = gBattleDomePotentialPointers[16]; + textPrinter.currentChar = sBattleDomePotentialTexts[16]; else - textPrinter.currentChar = gBattleDomePotentialPointers[trainerTournamentId]; + textPrinter.currentChar = sBattleDomePotentialTexts[trainerTournamentId]; textPrinter.fontId = 1; textPrinter.windowId = windowId + 4; @@ -4864,7 +4747,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) for (i = 0; i < ARRAY_COUNT(gUnknown_0860C988); i++) { - s32 r4 = 0; + int r4 = 0; for (k = 0, j = 0; j < DOME_TOURNAMENT_TRAINERS_COUNT; j++) { @@ -4879,7 +4762,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) break; } - textPrinter.currentChar = gBattleDomeOpponentStylePointers[i]; + textPrinter.currentChar = sBattleDomeOpponentStyleTexts[i]; textPrinter.y = 20; textPrinter.currentY = 20; AddTextPrinter(&textPrinter, 0, NULL); @@ -4930,7 +4813,7 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) { for (i = 0; i < 3; i++) { - s32 evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread; + int evBits = gFacilityTrainerMons[gSaveBlock2Ptr->frontier.domeMonIds[trainerTournamentId][i]].evSpread; for (k = 0, j = 0; j < NUM_STATS; j++) { allocatedArray[j] = 0; @@ -5051,19 +4934,19 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTournamentId) else i = 42; - textPrinter.currentChar = gBattleDomeOpponentStatsPointers[i]; + textPrinter.currentChar = sBattleDomeOpponentStatsTexts[i]; textPrinter.y = 36; textPrinter.currentY = 36; AddTextPrinter(&textPrinter, 0, NULL); Free(allocatedArray); } -static s32 sub_8192F08(u8 arg0, u8 *arg1) +static int sub_8192F08(u8 arg0, u8 *arg1) { - s32 i; + int i; u8 tournamentId; - s32 retVal = 0; - s32 count = 0; + int retVal = 0; + int count = 0; for (i = gUnknown_0860D3C4[arg0][0]; i < gUnknown_0860D3C4[arg0][0] + gUnknown_0860D3C4[arg0][1]; i++) { @@ -5123,14 +5006,14 @@ static s32 sub_8192F08(u8 arg0, u8 *arg1) static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) { struct TextPrinterTemplate textPrinter; - s32 tournamentIds[2]; - s32 trainerIds[2]; + int tournamentIds[2]; + int trainerIds[2]; bool32 lost[2]; - s32 i; - s32 winStringId = 0; - s32 arrId = 0; - s32 windowId = 0; - s32 x = 0, y = 0; + int i; + int winStringId = 0; + int arrId = 0; + int windowId = 0; + int x = 0, y = 0; u8 palSlot = 0; if (flags & 1) @@ -5274,7 +5157,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) textPrinter.fgColor = 14; textPrinter.bgColor = 0; textPrinter.shadowColor = 13; - StringExpandPlaceholders(gStringVar4, gBattleDomeWinStringsPointers[winStringId]); + StringExpandPlaceholders(gStringVar4, sBattleDomeWinTexts[winStringId]); textPrinter.currentChar = gStringVar4; textPrinter.windowId = windowId + 8; textPrinter.fontId = 1; @@ -5320,7 +5203,7 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) // Print match number. textPrinter.letterSpacing = 0; - textPrinter.currentChar = gBattleDomeMatchNumberPointers[matchNo]; + textPrinter.currentChar = sBattleDomeMatchNumberTexts[matchNo]; textPrinter.windowId = windowId + 5; textPrinter.currentX = GetStringCenterAlignXOffsetWithLetterSpacing(textPrinter.fontId, textPrinter.currentChar, 0xA0, textPrinter.letterSpacing); textPrinter.currentY = textPrinter.y = 2; @@ -5329,9 +5212,9 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo) AddTextPrinter(&textPrinter, 0, NULL); } -static void sub_81938A4(void) +static void ShowDomeTourneyTree(void) { - u8 taskId = CreateTask(sub_8194220, 0); + u8 taskId = CreateTask(Task_ShowTourneyTree, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; gTasks[taskId].data[2] = 2; @@ -5339,14 +5222,14 @@ static void sub_81938A4(void) SetMainCallback2(CB2_BattleDome); } -static void sub_81938E0(void) +static void ShowPreviousDomeResultsTourneyTree(void) { u8 taskId; - sub_8194D48(); + InitDomeFacilityTrainersAndMons(); gSaveBlock2Ptr->frontier.lvlMode = gSaveBlock2Ptr->frontier.field_D0A - 1; gSaveBlock2Ptr->frontier.curChallengeBattleNum = 3; - taskId = CreateTask(sub_8194220, 0); + taskId = CreateTask(Task_ShowTourneyTree, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 0; gTasks[taskId].data[2] = 2; @@ -5357,7 +5240,7 @@ static void sub_81938E0(void) static void sub_819395C(u8 taskId) { u8 newTaskId = 0; - s32 spriteId = gTasks[taskId].data[1]; + int spriteId = gTasks[taskId].data[1]; switch (gTasks[taskId].data[0]) { @@ -5374,7 +5257,7 @@ static void sub_819395C(u8 taskId) gTasks[taskId].data[0] = 2; break; case 2: - switch (sub_8193BDC(taskId)) + switch (UpdateTourneyTreeCursor(taskId)) { case 0: default: @@ -5399,9 +5282,9 @@ static void sub_819395C(u8 taskId) FreeAllWindowBuffers(); ScanlineEffect_Stop(); FREE_AND_SET_NULL(sTilemapBuffer); - newTaskId = CreateTask(sub_8190400, 0); + newTaskId = CreateTask(Task_ShowOpponentInfo, 0); gTasks[newTaskId].data[0] = 0; - gTasks[newTaskId].data[1] = gUnknown_0860D080[spriteId]; + gTasks[newTaskId].data[1] = sTourneyTreeTrainerIds[spriteId]; gTasks[newTaskId].data[2] = 1; gTasks[newTaskId].data[3] = taskId; @@ -5417,7 +5300,7 @@ static void sub_819395C(u8 taskId) FreeAllWindowBuffers(); ScanlineEffect_Stop(); FREE_AND_SET_NULL(sTilemapBuffer); - newTaskId = CreateTask(sub_8190400, 0); + newTaskId = CreateTask(Task_ShowOpponentInfo, 0); gTasks[newTaskId].data[0] = 0; gTasks[newTaskId].data[1] = spriteId - 16; gTasks[newTaskId].data[2] = 2; @@ -5442,21 +5325,21 @@ static void sub_819395C(u8 taskId) } } -static u8 sub_8193BDC(u8 taskId) +static u8 UpdateTourneyTreeCursor(u8 taskId) { u8 retVal = 1; - s32 arrId = 4; - s32 spriteId = gTasks[taskId].data[1]; - s32 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; + int direction = 4; + int tourneyTreeCursorSpriteId = gTasks[taskId].data[1]; + int roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; - if (gMain.newKeys == B_BUTTON || (gMain.newKeys & A_BUTTON && spriteId == 31)) + if (gMain.newKeys == B_BUTTON || (gMain.newKeys & A_BUTTON && tourneyTreeCursorSpriteId == 31)) { PlaySE(SE_SELECT); retVal = 0; } else if (gMain.newKeys & A_BUTTON) { - if (spriteId < 16) + if (tourneyTreeCursorSpriteId < 16) { PlaySE(SE_SELECT); retVal = 2; @@ -5469,31 +5352,31 @@ static u8 sub_8193BDC(u8 taskId) } else { - if (gMain.newKeys == DPAD_UP && gUnknown_0860CBF1[spriteId][roundId][0] != 0xFF) - arrId = 0; - else if (gMain.newKeys == DPAD_DOWN && gUnknown_0860CBF1[spriteId][roundId][1] != 0xFF) - arrId = 1; - else if (gMain.newKeys == DPAD_LEFT && gUnknown_0860CBF1[spriteId][roundId][2] != 0xFF) - arrId = 2; - else if (gMain.newKeys == DPAD_RIGHT && gUnknown_0860CBF1[spriteId][roundId][3] != 0xFF) - arrId = 3; + if (gMain.newKeys == DPAD_UP && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][0] != 0xFF) + direction = 0; + else if (gMain.newKeys == DPAD_DOWN && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][1] != 0xFF) + direction = 1; + else if (gMain.newKeys == DPAD_LEFT && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][2] != 0xFF) + direction = 2; + else if (gMain.newKeys == DPAD_RIGHT && sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][3] != 0xFF) + direction = 3; } - if (arrId != 4) + if (direction != 4) { PlaySE(SE_SELECT); - StartSpriteAnim(&gSprites[spriteId], 0); - spriteId = gUnknown_0860CBF1[spriteId][roundId][arrId]; - StartSpriteAnim(&gSprites[spriteId], 1); - gTasks[taskId].data[1] = spriteId; + StartSpriteAnim(&gSprites[tourneyTreeCursorSpriteId], 0); + tourneyTreeCursorSpriteId = sTourneyTreeCursorMovementMap[tourneyTreeCursorSpriteId][roundId][direction]; + StartSpriteAnim(&gSprites[tourneyTreeCursorSpriteId], 1); + gTasks[taskId].data[1] = tourneyTreeCursorSpriteId; } return retVal; } -static void sub_8193D40(void) +static void ShowNonInteractiveDomeTourneyTree(void) { - u8 taskId = CreateTask(sub_8194220, 0); + u8 taskId = CreateTask(Task_ShowTourneyTree, 0); gTasks[taskId].data[0] = 0; gTasks[taskId].data[1] = 1; gTasks[taskId].data[2] = 2; @@ -5501,9 +5384,9 @@ static void sub_8193D40(void) SetMainCallback2(CB2_BattleDome); } -static void sub_8193D7C(void) +static void ResolveDomeRoundWinners(void) { - s32 i; + int i; if (gSpecialVar_0x8005 == 1) { @@ -5525,14 +5408,14 @@ static void sub_8193D7C(void) } } -static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roundId) +static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roundId) { - s32 i, j, k; - s32 moveScores[4 * 3]; + int i, j, k; + int moveScores[4 * 3]; u16 moveIds[4 * 3]; u16 bestScore = 0; u16 bestId = 0; - s32 movePower = 0; + int movePower = 0; SetFacilityPtrsGetLevel(); // Calc move points of all 4 moves for all 3 pokemon hitting all 3 target mons. @@ -5639,12 +5522,12 @@ static u16 GetWinningMove(s32 winnerTournamentId, s32 loserTournamentId, u8 roun return moveIds[j]; } -static void sub_8194220(u8 taskId) +static void Task_ShowTourneyTree(u8 taskId) { - s32 i; + int i; struct TextPrinterTemplate textPrinter; - s32 r10 = gTasks[taskId].data[1]; - s32 r4 = gTasks[taskId].data[2]; + int r10 = gTasks[taskId].data[1]; + int r4 = gTasks[taskId].data[2]; switch (gTasks[taskId].data[0]) { @@ -5703,7 +5586,7 @@ static void sub_8194220(u8 taskId) gTasks[taskId].data[0]++; break; case 3: - LoadCompressedSpriteSheet(gUnknown_0860CF50); + LoadCompressedSpriteSheet(sDomeOptionsSpriteSheet); if (r10 == 0) { for (i = 0; i < (unsigned) 31; i++) @@ -5734,7 +5617,7 @@ static void sub_8194220(u8 taskId) AddTextPrinter(&textPrinter, 0, NULL); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { - s32 roundId, var2; + int roundId, var2; CopyDomeTrainerName(gDisplayedStringBattle, gSaveBlock2Ptr->frontier.domeTrainers[i].trainerId); if (r10 == 1) @@ -5851,19 +5734,19 @@ static void sub_8194220(u8 taskId) i = 0; while (i < 91) { - gScanlineEffectRegBuffers[0][i] = 0x1F0A; - gScanlineEffectRegBuffers[1][i] = 0x1F0A; + gScanlineEffectRegBuffers[0][i] = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; + gScanlineEffectRegBuffers[1][i] = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; i++; } while (i < 160) { - gScanlineEffectRegBuffers[0][i] = 0x1F09; - gScanlineEffectRegBuffers[1][i] = 0x1F09; + gScanlineEffectRegBuffers[0][i] = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; + gScanlineEffectRegBuffers[1][i] = BGCNT_PRIORITY(1) | BGCNT_SCREENBASE(31) | BGCNT_16COLOR | BGCNT_CHARBASE(2) | BGCNT_TXT256x256; i++; } - ScanlineEffect_SetParams(gUnknown_0860CF44); + ScanlineEffect_SetParams(sTourneyTreeScanlineEffectParams); DestroyTask(taskId); break; } @@ -5871,7 +5754,7 @@ static void sub_8194220(u8 taskId) static void sub_81948EC(u8 tournamentId, u8 arg1) { - s32 i; + int i; const struct UnkStruct_860DD10 *structPtr = gUnknown_0860DD10[tournamentId][arg1]; for (i = 0; i < gUnknown_0860DE10[tournamentId][arg1]; i++) @@ -5882,7 +5765,7 @@ static void sub_81948EC(u8 tournamentId, u8 arg1) static void sub_8194950(u8 taskId) { - s32 i; + int i; struct TextPrinterTemplate textPrinter; switch (gTasks[taskId].data[0]) @@ -5923,7 +5806,7 @@ static void sub_8194950(u8 taskId) } if (!gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated) { - s32 roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; + int roundId = gSaveBlock2Ptr->frontier.curChallengeBattleNum - 1; sub_81948EC(i, roundId); } } @@ -6050,20 +5933,20 @@ static void VblankCb1_BattleDome(void) ScanlineEffect_InitHBlankDmaTransfer(); } -static void sub_8194D48(void) +static void InitDomeFacilityTrainersAndMons(void) { gFacilityTrainerMons = gBattleFrontierMons; gFacilityTrainers = gBattleFrontierTrainers; } -static void sub_8194D68(void) +static void RestoreDomePlayerParty(void) { - s32 i, moveSlot; + int i, moveSlot; for (i = 0; i < 2; i++) { - s32 playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; - s32 count; + int playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; + int count; for (moveSlot = 0; moveSlot < MAX_MON_MOVES; moveSlot++) { @@ -6082,24 +5965,24 @@ static void sub_8194D68(void) } } -static void sub_8194E44(void) +static void RestoreDomePlayerPartyHeldItems(void) { - s32 i; + int i; for (i = 0; i < 2; i++) { - s32 playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; + int playerMonId = gSaveBlock2Ptr->frontier.selectedPartyMons[gSelectedOrderFromParty[i] - 1] - 1; u16 item = GetMonData(&gSaveBlock1Ptr->playerParty[playerMonId], MON_DATA_HELD_ITEM, NULL); SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &item); } } -static void sub_8194EB4(void) +static void ReduceDomePlayerPartyTo3Mons(void) { ReducePlayerPartyToSelectedMons(); } -static void sub_8194EC0(void) +static void GetPlayerSeededBeforeOpponent(void) { if (TrainerIdToTournamentId(gTrainerBattleOpponent_A) > TrainerIdToTournamentId(TRAINER_PLAYER)) gSpecialVar_Result = 1; @@ -6107,11 +5990,11 @@ static void sub_8194EC0(void) gSpecialVar_Result = 2; } -static void sub_8194EF8(void) +static void BufferLastDomeWinnerName(void) { - s32 i; + int i; - sub_8194D48(); + InitDomeFacilityTrainersAndMons(); for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { if (!gSaveBlock2Ptr->frontier.domeTrainers[i].isEliminated) @@ -6122,15 +6005,15 @@ static void sub_8194EF8(void) static void sub_8194F58(void) { - s32 i, j, k; - s32 monLevel; - s32 species[3]; - s32 monTypesBits; - s32 trainerId; - s32 monSetId; + int i, j, k; + int monLevel; + int species[3]; + int monTypesBits; + int trainerId; + int monSetId; u8 lvlMode; u16 *statSums; - s32 *statValues; + int *statValues; u8 ivs = 0; species[0] = 0; @@ -6140,7 +6023,7 @@ static void sub_8194F58(void) return; statSums = AllocZeroed(sizeof(u16) * DOME_TOURNAMENT_TRAINERS_COUNT); - statValues = AllocZeroed(sizeof(s32) * 6); + statValues = AllocZeroed(sizeof(int) * 6); lvlMode = gSaveBlock2Ptr->frontier.lvlMode; gSaveBlock2Ptr->frontier.lvlMode = 0; // This one, I'd like to call a 'C fakematching'. @@ -6177,7 +6060,7 @@ static void sub_8194F58(void) monSetId = RandomizeFacilityTrainerMonSet(trainerId); for (k = 0; k < j; k++) { - s32 checkingMonId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; + int checkingMonId = gSaveBlock2Ptr->frontier.domeMonIds[i][k]; if (checkingMonId == monSetId || species[0] == gFacilityTrainerMons[monSetId].species || species[1] == gFacilityTrainerMons[monSetId].species @@ -6253,9 +6136,9 @@ static void sub_8194F58(void) gSaveBlock2Ptr->frontier.lvlMode = lvlMode; } -static s32 TrainerIdToTournamentId(u16 trainerId) +static int TrainerIdToTournamentId(u16 trainerId) { - s32 i; + int i; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -6267,9 +6150,9 @@ static s32 TrainerIdToTournamentId(u16 trainerId) } // The same as the above one, but has global scope. -s32 TrainerIdToDomeTournamentId(u16 trainerId) +int TrainerIdToDomeTournamentId(u16 trainerId) { - s32 i; + int i; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -6280,10 +6163,10 @@ s32 TrainerIdToDomeTournamentId(u16 trainerId) return i; } -static u8 sub_81953E8(u8 tournamentId, u8 arg1) +static u8 sub_81953E8(u8 tournamentId, u8 round) { u8 arr[2]; - sub_8192F08(gUnknown_0860D1A0[gUnknown_0860D1C0[tournamentId] / 2][arg1] - 16, arr); + sub_8192F08(gUnknown_0860D1A0[gUnknown_0860D1C0[tournamentId] / 2][round] - 16, arr); if (tournamentId == arr[0]) return arr[1]; else @@ -6292,11 +6175,11 @@ static u8 sub_81953E8(u8 tournamentId, u8 arg1) static void DecideRoundWinners(u8 roundId) { - s32 i; - s32 moveSlot, monId1, monId2; - s32 tournamentId1, tournamentId2; - s32 species; - s32 points1 = 0, points2 = 0; + int i; + int moveSlot, monId1, monId2; + int tournamentId1, tournamentId2; + int species; + int points1 = 0, points2 = 0; for (i = 0; i < DOME_TOURNAMENT_TRAINERS_COUNT; i++) { @@ -6400,28 +6283,28 @@ static void DecideRoundWinners(u8 roundId) } } -static void CopyDomeTrainerName(u8 *dst, u16 trainerId) +static void CopyDomeTrainerName(u8 *str, u16 trainerId) { - s32 i = 0; + int i = 0; SetFacilityPtrsGetLevel(); if (trainerId == TRAINER_FRONTIER_BRAIN) { - CopyDomeBrainTrainerName(dst); + CopyDomeBrainTrainerName(str); } else { if (trainerId == TRAINER_PLAYER) { for (i = 0; i < PLAYER_NAME_LENGTH; i++) - dst[i] = gSaveBlock2Ptr->playerName[i]; + str[i] = gSaveBlock2Ptr->playerName[i]; } else if (trainerId < 300) { for (i = 0; i < PLAYER_NAME_LENGTH; i++) - dst[i] = gFacilityTrainers[trainerId].trainerName[i]; + str[i] = gFacilityTrainers[trainerId].trainerName[i]; } - dst[i] = EOS; + str[i] = EOS; } } @@ -6435,11 +6318,11 @@ static u8 GetDomeBrainTrainerClass(void) return gTrainers[TRAINER_TUCKER].trainerClass; } -static void CopyDomeBrainTrainerName(u8 *dst) +static void CopyDomeBrainTrainerName(u8 *str) { - s32 i; + int i; for (i = 0; i < PLAYER_NAME_LENGTH; i++) - dst[i] = gTrainers[TRAINER_TUCKER].trainerName[i]; - dst[i] = EOS; + str[i] = gTrainers[TRAINER_TUCKER].trainerName[i]; + str[i] = EOS; } From abebd2b8648313deeee52ef5be1d6cc0927193ad Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 11:48:51 -0600 Subject: [PATCH 5/7] Cleanup externs in overworld.c --- include/cable_club.h | 1 + include/field_camera.h | 1 + include/field_control_avatar.h | 2 + include/field_effect.h | 1 + include/field_message_box.h | 1 + include/field_player_avatar.h | 3 ++ include/field_screen_effect.h | 1 + include/field_specials.h | 2 + include/field_weather.h | 1 + include/fieldmap.h | 6 +++ include/link.h | 2 + include/link_rfu.h | 1 + include/match_call.h | 1 + include/secret_base.h | 2 + include/tileset_anims.h | 9 +++++ src/field_specials.c | 2 +- src/new_game.c | 2 +- src/overworld.c | 69 +++------------------------------- 18 files changed, 42 insertions(+), 65 deletions(-) create mode 100755 include/tileset_anims.h diff --git a/include/cable_club.h b/include/cable_club.h index ebdc82b46..60d56460d 100644 --- a/include/cable_club.h +++ b/include/cable_club.h @@ -15,5 +15,6 @@ void sub_80B360C(void); bool32 sub_80B2AF4(u16 *arg0, u16 *arg1); void sub_80B3AF8(u8 taskId); void task00_08081A90(u8 taskId); +bool32 sub_80B39D4(u8 linkPlayerIndex); #endif //GUARD_CABLE_CLUB_H diff --git a/include/field_camera.h b/include/field_camera.h index fdc4c5450..fecea244e 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -32,5 +32,6 @@ void SetCameraPanningCallback(void (*a)(void)); void SetCameraPanning(s16 a, s16 b); void InstallCameraPanAheadCallback(void); void UpdateCameraPanning(void); +void FieldUpdateBgTilemapScroll(void); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h index 3cc4a8324..738cceb3e 100644 --- a/include/field_control_avatar.h +++ b/include/field_control_avatar.h @@ -37,5 +37,7 @@ u8 sub_8068F18(void); bool8 dive_warp(struct MapPosition *position, u16 b); int SetCableClubWarp(void); u8 TrySetDiveWarp(void); +const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction); +u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *position); #endif // GUARD_FIELDCONTROLAVATAR_H diff --git a/include/field_effect.h b/include/field_effect.h index 7620cedcd..205dbb68a 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -13,6 +13,7 @@ extern bool8 (*gFieldCallback2)(void); u32 FieldEffectStart(u8); bool8 FieldEffectActiveListContains(u8 id); +void FieldEffectActiveListClear(void); void sub_80B69DC(void); u8 AddNewGameBirchObject(s16, s16, u8); void FieldEffectStop(struct Sprite *sprite, u8 id); diff --git a/include/field_message_box.h b/include/field_message_box.h index 9515a54fd..58f782d9c 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -17,5 +17,6 @@ void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); u8 GetFieldMessageBoxMode(void); void sub_8098374(void); +void InitFieldMessageBox(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 3aedec5de..45cd0dbd9 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -60,5 +60,8 @@ bool8 IsPlayerFacingSurfableFishableWater(void); bool8 IsPlayerSurfingNorth(void); void sub_808C228(u8 direction); u8 sub_808BCD0(void); +void sub_808B578(void); +u8 GetFRLGAvatarGraphicsIdByGender(u8); +u8 GetRSAvatarGraphicsIdByGender(u8); #endif // GUARD_FIELD_PLAYER_AVATAR_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 7f12bcd36..2b8b3a5a3 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -40,5 +40,6 @@ void sub_80B0268(void); void sub_80B0534(void); void sub_80B058C(void); void sub_80B05B4(void); +void WriteFlashScanlineEffectBuffer(u8 flashLevel); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/include/field_specials.h b/include/field_specials.h index 10433299b..981d65c0a 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -23,5 +23,7 @@ bool8 sub_813B9C0(void); void SetShoalItemFlag(u16 v0); void UpdateFrontierManiac(u16 a0); void UpdateFrontierGambler(u16 a0); +void ResetCyclingRoadChallengeData(void); +bool8 warp0_in_pokecenter(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/field_weather.h b/include/field_weather.h index 91dcef1dc..2d73f2b94 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -233,5 +233,6 @@ void SetSav1WeatherFromCurrMapHeader(void); void SetWeather(u32 weather); void DoCurrentWeather(void); void UpdateWeatherPerDay(u16 increment); +void sub_80AEE84(void); #endif // GUARD_WEATHER_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 3c7b7536d..24bc4989a 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -33,6 +33,12 @@ void InitMap(void); void InitMapFromSavedGame(void); void InitTrainerHillMap(void); void InitBattlePyramidMap(bool8 setPlayerPosition); +void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout); +void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout); +void apply_map_tileset2_palette(struct MapLayout const *mapLayout); +void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout); +extern void copy_map_tileset1_to_vram(const struct MapLayout *); +extern void copy_map_tileset2_to_vram(const struct MapLayout *); void SpriteCB_PokeballGlow(struct Sprite *); void SpriteCB_PokecenterMonitor(struct Sprite *); diff --git a/include/link.h b/include/link.h index 9552f062c..52a631570 100644 --- a/include/link.h +++ b/include/link.h @@ -312,5 +312,7 @@ void sub_800AB18(void); void sub_8009F18(void); bool8 sub_800AA60(void); void sub_800ABF4(u16 a0); +bool32 sub_8009F3C(void); +u32 sub_800B4DC(void); #endif // GUARD_LINK_H diff --git a/include/link_rfu.h b/include/link_rfu.h index 08cab616c..d468d6c49 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -282,5 +282,6 @@ void sub_800EF7C(void); bool8 sub_800DE7C(struct UnkLinkRfuStruct_02022B14 *buff1, u8 *buff2, u8 idx); s32 sub_800E87C(u8 idx); void sub_8011BA4(void); +void sub_8010198(void); #endif //GUARD_LINK_RFU_H diff --git a/include/match_call.h b/include/match_call.h index 1f431bfaf..17d40d41c 100644 --- a/include/match_call.h +++ b/include/match_call.h @@ -11,5 +11,6 @@ enum { }; s32 GetRematchIdxByTrainerIdx(s32 trainerIdx); +void InitMatchCallCounters(void); #endif //GUARD_MATCH_CALL_H diff --git a/include/secret_base.h b/include/secret_base.h index 4b44d4678..57ad81fee 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -22,6 +22,8 @@ void sub_80EB56C(void); void sub_80EB9E0(void); void sub_80EBB28(void); void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events); +bool8 sub_80E909C(void); +void sub_80EB218(void); // SetCurrentSecretBaseFromPosition void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events); diff --git a/include/tileset_anims.h b/include/tileset_anims.h new file mode 100755 index 000000000..17d883cd2 --- /dev/null +++ b/include/tileset_anims.h @@ -0,0 +1,9 @@ +#ifndef GUARD_TILESET_ANIMS_H +#define GUARD_TILESET_ANIMS_H + +void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); +void sub_80A0A2C(void); +void sub_80A0A38(void); +void TransferTilesetAnimsBuffer(void); + +#endif // GUARD_TILESET_ANIMS_H diff --git a/src/field_specials.c b/src/field_specials.c index f2ebf2b8e..3c26085dd 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1956,7 +1956,7 @@ void sub_8139D98(void) } } -bool32 warp0_in_pokecenter(void) +bool8 warp0_in_pokecenter(void) { static const u16 gUnknown_085B2C2A[] = { 0x0202, 0x0301, 0x0405, 0x0504, 0x0604, 0x0700, 0x0804, 0x090b, 0x0a05, 0x0b05, 0x0c02, 0x0d06, 0x0e03, 0x0f02, 0x100c, 0x100a, 0x1a35, 0x193c, 0xFFFF }; diff --git a/src/new_game.c b/src/new_game.c index 158120245..f68ed3d4f 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -8,6 +8,7 @@ #include "lottery_corner.h" #include "play_time.h" #include "mauville_old_man.h" +#include "match_call.h" #include "lilycove_lady.h" #include "load_save.h" #include "pokeblock.h" @@ -47,7 +48,6 @@ extern void NewGameInitPCItems(void); extern void ClearDecorationInventories(void); extern void ResetFanClub(void); extern void copy_strings_to_sav1(void); -extern void InitMatchCallCounters(void); extern void sub_801AFD8(void); extern void sub_800E5AC(void); extern void ResetContestLinkResults(void); diff --git a/src/overworld.c b/src/overworld.c index 2bc4f96d5..43610fe09 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -19,6 +19,7 @@ #include "field_tasks.h" #include "field_weather.h" #include "fieldmap.h" +#include "fldeff.h" #include "gpu_regs.h" #include "heal_location.h" #include "link.h" @@ -28,6 +29,7 @@ #include "alloc.h" #include "m4a.h" #include "map_name_popup.h" +#include "match_call.h" #include "menu.h" #include "metatile_behavior.h" #include "mirage_tower.h" @@ -42,14 +44,15 @@ #include "save.h" #include "save_location.h" #include "script.h" -// #include "script_pokemon_80C4.h" +#include "script_pokemon_util_80F87D8.h" #include "secret_base.h" #include "sound.h" #include "start_menu.h" #include "task.h" -// #include "tileset_anim.h" +#include "tileset_anims.h" #include "time_events.h" #include "trainer_hill.h" +#include "trainer_pokemon_sprites.h" #include "tv.h" #include "scanline_effect.h" #include "wild_encounter.h" @@ -85,71 +88,11 @@ extern const u8 gUnknown_082773F5[]; extern const u8 gUnknown_082774EF[]; extern const u8 gUnknown_08277509[]; -// vars extern const struct MapLayout *const gMapLayouts[]; extern const struct MapHeader *const *const gMapGroups[]; -extern const s32 gMaxFlashLevel; +extern const int gMaxFlashLevel; extern const u16 gUnknown_82EC7C4[]; -// functions -extern void HealPlayerParty(void); -extern void move_tilemap_camera_to_upper_left_corner(void); -extern void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); -extern void DrawWholeMapView(void); -extern void copy_map_tileset1_tileset2_to_vram(const struct MapLayout *); -extern void apply_map_tileset1_tileset2_palette(const struct MapLayout *); -extern void ResetCyclingRoadChallengeData(void); -extern void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey); -extern void mapheader_run_script_with_tag_x5(void); -extern void ResetFieldTasksArgs(void); -extern void sub_80A0A2C(void); -extern void apply_map_tileset2_palette(const struct MapLayout *); -extern void copy_map_tileset2_to_vram_2(const struct MapLayout *); -extern void RestartWildEncounterImmunitySteps(void); -extern void ShowMapNamePopup(void); -extern bool32 sub_808651C(void); -extern bool8 sub_80AF6A4(void); -extern bool8 sub_80E909C(void); -extern void c2_change_map(void); -extern void sub_81D5DF8(void); -extern void sub_80EB218(void); -extern void sub_80AF3C8(void); -extern void sub_808B578(void); -extern void sub_80AF314(void); -extern void sub_80AF214(void); -extern void sub_80AF188(void); -extern void RotatingGate_InitPuzzleAndGraphics(void); -extern void sub_80AF168(void); -extern void sub_80AF3C8(void); -extern void ExecuteTruckSequence(void); -extern void sub_80A0A38(void); -extern void WriteFlashScanlineEffectBuffer(u8); -extern void InitMatchCallCounters(void); -extern void sub_80EDB44(void); -extern void InitFieldMessageBox(void); -extern void copy_map_tileset1_to_vram(const struct MapLayout *); -extern void copy_map_tileset2_to_vram(const struct MapLayout *); -extern void FieldUpdateBgTilemapScroll(void); -extern void TransferTilesetAnimsBuffer(void); -extern bool8 warp0_in_pokecenter(void); -extern void ResetAllPicSprites(void); -extern void FieldEffectActiveListClear(void); -extern void SetUpFieldTasks(void); -extern void ShowStartMenu(void); -extern void sub_80AEE84(void); -extern void mapldr_default(void); -extern bool32 sub_800F0B8(void); -extern bool32 sub_8009F3C(void); -extern void sub_8010198(void); -extern u32 sub_800B4DC(void); -extern bool32 sub_80B39D4(u8); -extern const u8* GetInteractedLinkPlayerScript(struct MapPosition *a1, u8, u8); -extern u8 *GetCoordEventScriptAtMapPosition(void*); -extern u8 GetFRLGAvatarGraphicsIdByGender(u8); -extern u8 GetRSAvatarGraphicsIdByGender(u8); -extern void UpdateEventObjectSpriteVisibility(struct Sprite*, u8); - -// this file's functions static void Overworld_ResetStateAfterWhiteOut(void); static void c2_80567AC(void); static void CB2_LoadMap2(void); From 40dc6833c579f13a0ad939e3ac9ebd83d7dd752e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 8 Feb 2019 15:07:42 -0600 Subject: [PATCH 6/7] Fully document tileset animations --- data/tilesets/headers.inc | 50 +- .../building/anim/{ => tv_turned_on}/0.png | Bin .../building/anim/{ => tv_turned_on}/1.png | Bin .../primary/general/anim/{0 => flower}/0.png | Bin .../primary/general/anim/{0 => flower}/1.png | Bin .../primary/general/anim/{0 => flower}/2.png | Bin .../general/anim/{4 => land_water_edge}/0.png | Bin .../general/anim/{4 => land_water_edge}/1.png | Bin .../general/anim/{4 => land_water_edge}/2.png | Bin .../general/anim/{4 => land_water_edge}/3.png | Bin .../general/anim/{2 => sand_water_edge}/0.png | Bin .../general/anim/{2 => sand_water_edge}/1.png | Bin .../general/anim/{2 => sand_water_edge}/2.png | Bin .../general/anim/{2 => sand_water_edge}/3.png | Bin .../general/anim/{2 => sand_water_edge}/4.png | Bin .../general/anim/{2 => sand_water_edge}/5.png | Bin .../general/anim/{2 => sand_water_edge}/6.png | Bin .../primary/general/anim/{1 => water}/0.png | Bin .../primary/general/anim/{1 => water}/1.png | Bin .../primary/general/anim/{1 => water}/2.png | Bin .../primary/general/anim/{1 => water}/3.png | Bin .../primary/general/anim/{1 => water}/4.png | Bin .../primary/general/anim/{1 => water}/5.png | Bin .../primary/general/anim/{1 => water}/6.png | Bin .../primary/general/anim/{1 => water}/7.png | Bin .../general/anim/{3 => waterfall}/0.png | Bin .../general/anim/{3 => waterfall}/1.png | Bin .../general/anim/{3 => waterfall}/2.png | Bin .../general/anim/{3 => waterfall}/3.png | Bin .../anim/{ => flag}/0.png | Bin .../anim/{ => flag}/1.png | Bin .../anim/{ => flag}/2.png | Bin .../anim/{ => flag}/3.png | Bin .../anim/{ => flag}/0.png | Bin .../anim/{ => flag}/1.png | Bin .../anim/{ => flag}/2.png | Bin .../anim/{ => flag}/3.png | Bin .../anim/{1 => statue_shadow}/0.png | Bin .../anim/{1 => statue_shadow}/1.png | Bin .../anim/{1 => statue_shadow}/2.png | Bin .../battle_pyramid/anim/{0 => torch}/0.png | Bin .../battle_pyramid/anim/{0 => torch}/1.png | Bin .../battle_pyramid/anim/{0 => torch}/2.png | Bin .../anim/{ => blinking_lights}/0.png | Bin .../anim/{ => blinking_lights}/1.png | Bin .../secondary/cave/anim/{ => lava}/0.png | Bin .../secondary/cave/anim/{ => lava}/1.png | Bin .../secondary/cave/anim/{ => lava}/2.png | Bin .../secondary/cave/anim/{ => lava}/3.png | Bin .../cave/anim/{unused/0.png => lava/4.png} | Bin .../cave/anim/{unused/1.png => lava/5.png} | Bin .../cave/anim/{unused/2.png => lava/6.png} | Bin .../cave/anim/{unused/3.png => lava/7.png} | Bin .../secondary/dewford/anim/{ => flag}/0.png | Bin .../secondary/dewford/anim/{ => flag}/1.png | Bin .../secondary/dewford/anim/{ => flag}/2.png | Bin .../secondary/dewford/anim/{ => flag}/3.png | Bin .../elite_four/anim/{1 => floor_light}/0.png | Bin .../elite_four/anim/{1 => floor_light}/1.png | Bin .../elite_four/anim/{0 => wall_lights}/0.png | Bin .../elite_four/anim/{0 => wall_lights}/1.png | Bin .../elite_four/anim/{0 => wall_lights}/2.png | Bin .../elite_four/anim/{0 => wall_lights}/3.png | Bin .../ever_grande/anim/{ => flowers}/0.png | Bin .../ever_grande/anim/{ => flowers}/1.png | Bin .../ever_grande/anim/{ => flowers}/2.png | Bin .../ever_grande/anim/{ => flowers}/3.png | Bin .../ever_grande/anim/{ => flowers}/4.png | Bin .../ever_grande/anim/{ => flowers}/5.png | Bin .../ever_grande/anim/{ => flowers}/6.png | Bin .../ever_grande/anim/{ => flowers}/7.png | Bin .../lavaridge/anim/{ => steam}/0.png | Bin .../lavaridge/anim/{ => steam}/1.png | Bin .../lavaridge/anim/{ => steam}/2.png | Bin .../lavaridge/anim/{ => steam}/3.png | Bin .../mauville/anim/{0/a => flower_1}/0.png | Bin .../mauville/anim/{0/a => flower_1}/1.png | Bin .../mauville/anim/{0/a => flower_1}/2.png | Bin .../mauville/anim/{0/a => flower_1}/3.png | Bin .../anim/{1/a/1.png => flower_1/4.png} | Bin .../mauville/anim/{0/b => flower_2}/0.png | Bin .../mauville/anim/{0/b => flower_2}/1.png | Bin .../mauville/anim/{0/b => flower_2}/2.png | Bin .../mauville/anim/{0/b => flower_2}/3.png | Bin .../anim/{1/b/1.png => flower_2/4.png} | Bin .../anim/{ => electric_gates}/0.png | Bin .../anim/{ => electric_gates}/1.png | Bin .../pacifidlog/anim/{0 => log_bridges}/0.png | Bin .../pacifidlog/anim/{0 => log_bridges}/1.png | Bin .../pacifidlog/anim/{0 => log_bridges}/2.png | Bin .../anim/{1 => water_currents}/0.png | Bin .../anim/{1 => water_currents}/1.png | Bin .../anim/{1 => water_currents}/2.png | Bin .../anim/{1 => water_currents}/3.png | Bin .../anim/{1 => water_currents}/4.png | Bin .../anim/{1 => water_currents}/5.png | Bin .../anim/{1 => water_currents}/6.png | Bin .../anim/{1 => water_currents}/7.png | Bin .../rustboro/anim/{1 => fountain}/0.png | Bin .../rustboro/anim/{1 => fountain}/1.png | Bin .../rustboro/anim/{0 => windy_water}/0.png | Bin .../rustboro/anim/{0 => windy_water}/1.png | Bin .../rustboro/anim/{0 => windy_water}/2.png | Bin .../rustboro/anim/{0 => windy_water}/3.png | Bin .../rustboro/anim/{0 => windy_water}/4.png | Bin .../rustboro/anim/{0 => windy_water}/5.png | Bin .../rustboro/anim/{0 => windy_water}/6.png | Bin .../rustboro/anim/{0 => windy_water}/7.png | Bin .../slateport/anim/{ => balloons}/0.png | Bin .../slateport/anim/{ => balloons}/1.png | Bin .../slateport/anim/{ => balloons}/2.png | Bin .../slateport/anim/{ => balloons}/3.png | Bin .../sootopolis/anim/{ => stormy_water}/0.png | Bin .../sootopolis/anim/{ => stormy_water}/1.png | Bin .../sootopolis/anim/{ => stormy_water}/2.png | Bin .../sootopolis/anim/{ => stormy_water}/3.png | Bin .../sootopolis/anim/{ => stormy_water}/4.png | Bin .../sootopolis/anim/{ => stormy_water}/5.png | Bin .../sootopolis/anim/{ => stormy_water}/6.png | Bin .../sootopolis/anim/{ => stormy_water}/7.png | Bin .../anim/{1 => front_waterfall}/0.png | Bin .../anim/{1 => front_waterfall}/1.png | Bin .../anim/{1 => front_waterfall}/2.png | Bin .../anim/{0 => side_waterfall}/0.png | Bin .../anim/{0 => side_waterfall}/1.png | Bin .../anim/{0 => side_waterfall}/2.png | Bin .../underwater/anim/{ => seaweed}/0.png | Bin .../underwater/anim/{ => seaweed}/1.png | Bin .../underwater/anim/{ => seaweed}/2.png | Bin .../underwater/anim/{ => seaweed}/3.png | Bin include/graphics.h | 4 + include/tileset_anims.h | 6 +- src/battle_dome.c | 2 +- src/overworld.c | 12 +- src/tileset_anims.c | 1662 +++++++---------- 135 files changed, 758 insertions(+), 978 deletions(-) rename data/tilesets/primary/building/anim/{ => tv_turned_on}/0.png (100%) rename data/tilesets/primary/building/anim/{ => tv_turned_on}/1.png (100%) rename data/tilesets/primary/general/anim/{0 => flower}/0.png (100%) rename data/tilesets/primary/general/anim/{0 => flower}/1.png (100%) rename data/tilesets/primary/general/anim/{0 => flower}/2.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/0.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/1.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/2.png (100%) rename data/tilesets/primary/general/anim/{4 => land_water_edge}/3.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/0.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/1.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/2.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/3.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/4.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/5.png (100%) rename data/tilesets/primary/general/anim/{2 => sand_water_edge}/6.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/0.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/1.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/2.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/3.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/4.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/5.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/6.png (100%) rename data/tilesets/primary/general/anim/{1 => water}/7.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/0.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/1.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/2.png (100%) rename data/tilesets/primary/general/anim/{3 => waterfall}/3.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/0.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/1.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/2.png (100%) rename data/tilesets/secondary/battle_frontier_outside_east/anim/{ => flag}/3.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/0.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/1.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/2.png (100%) rename data/tilesets/secondary/battle_frontier_outside_west/anim/{ => flag}/3.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{1 => statue_shadow}/0.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{1 => statue_shadow}/1.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{1 => statue_shadow}/2.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{0 => torch}/0.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{0 => torch}/1.png (100%) rename data/tilesets/secondary/battle_pyramid/anim/{0 => torch}/2.png (100%) rename data/tilesets/secondary/bike_shop/anim/{ => blinking_lights}/0.png (100%) rename data/tilesets/secondary/bike_shop/anim/{ => blinking_lights}/1.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/0.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/1.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/2.png (100%) rename data/tilesets/secondary/cave/anim/{ => lava}/3.png (100%) rename data/tilesets/secondary/cave/anim/{unused/0.png => lava/4.png} (100%) rename data/tilesets/secondary/cave/anim/{unused/1.png => lava/5.png} (100%) rename data/tilesets/secondary/cave/anim/{unused/2.png => lava/6.png} (100%) rename data/tilesets/secondary/cave/anim/{unused/3.png => lava/7.png} (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/0.png (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/1.png (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/2.png (100%) rename data/tilesets/secondary/dewford/anim/{ => flag}/3.png (100%) rename data/tilesets/secondary/elite_four/anim/{1 => floor_light}/0.png (100%) rename data/tilesets/secondary/elite_four/anim/{1 => floor_light}/1.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/0.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/1.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/2.png (100%) rename data/tilesets/secondary/elite_four/anim/{0 => wall_lights}/3.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/0.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/1.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/2.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/3.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/4.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/5.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/6.png (100%) rename data/tilesets/secondary/ever_grande/anim/{ => flowers}/7.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/0.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/1.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/2.png (100%) rename data/tilesets/secondary/lavaridge/anim/{ => steam}/3.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/0.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/1.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/2.png (100%) rename data/tilesets/secondary/mauville/anim/{0/a => flower_1}/3.png (100%) rename data/tilesets/secondary/mauville/anim/{1/a/1.png => flower_1/4.png} (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/0.png (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/1.png (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/2.png (100%) rename data/tilesets/secondary/mauville/anim/{0/b => flower_2}/3.png (100%) rename data/tilesets/secondary/mauville/anim/{1/b/1.png => flower_2/4.png} (100%) rename data/tilesets/secondary/mauville_gym/anim/{ => electric_gates}/0.png (100%) rename data/tilesets/secondary/mauville_gym/anim/{ => electric_gates}/1.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{0 => log_bridges}/0.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{0 => log_bridges}/1.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{0 => log_bridges}/2.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/0.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/1.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/2.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/3.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/4.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/5.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/6.png (100%) rename data/tilesets/secondary/pacifidlog/anim/{1 => water_currents}/7.png (100%) rename data/tilesets/secondary/rustboro/anim/{1 => fountain}/0.png (100%) rename data/tilesets/secondary/rustboro/anim/{1 => fountain}/1.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/0.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/1.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/2.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/3.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/4.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/5.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/6.png (100%) rename data/tilesets/secondary/rustboro/anim/{0 => windy_water}/7.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/0.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/1.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/2.png (100%) rename data/tilesets/secondary/slateport/anim/{ => balloons}/3.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/0.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/1.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/2.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/3.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/4.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/5.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/6.png (100%) rename data/tilesets/secondary/sootopolis/anim/{ => stormy_water}/7.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{1 => front_waterfall}/0.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{1 => front_waterfall}/1.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{1 => front_waterfall}/2.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{0 => side_waterfall}/0.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{0 => side_waterfall}/1.png (100%) rename data/tilesets/secondary/sootopolis_gym/anim/{0 => side_waterfall}/2.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/0.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/1.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/2.png (100%) rename data/tilesets/secondary/underwater/anim/{ => seaweed}/3.png (100%) diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc index 2083e17df..c56234b13 100644 --- a/data/tilesets/headers.inc +++ b/data/tilesets/headers.inc @@ -7,7 +7,7 @@ gTileset_General:: @ 83DF704 .4byte gTilesetPalettes_General .4byte gMetatiles_General .4byte gMetatileAttributes_General - .4byte TilesetCb_General + .4byte InitTilesetAnim_General .align 2 gTileset_Petalburg:: @ 83DF71C @@ -18,7 +18,7 @@ gTileset_Petalburg:: @ 83DF71C .4byte gTilesetPalettes_Petalburg .4byte gMetatiles_Petalburg .4byte gMetatileAttributes_Petalburg - .4byte TilesetCb_Petalburg + .4byte InitTilesetAnim_Petalburg .align 2 gTileset_Rustboro:: @ 83DF734 @@ -29,7 +29,7 @@ gTileset_Rustboro:: @ 83DF734 .4byte gTilesetPalettes_Rustboro .4byte gMetatiles_Rustboro .4byte gMetatileAttributes_Rustboro - .4byte TilesetCb_Rustboro + .4byte InitTilesetAnim_Rustboro .align 2 gTileset_Dewford:: @ 83DF74C @@ -40,7 +40,7 @@ gTileset_Dewford:: @ 83DF74C .4byte gTilesetPalettes_Dewford .4byte gMetatiles_Dewford .4byte gMetatileAttributes_Dewford - .4byte TilesetCb_Dewford + .4byte InitTilesetAnim_Dewford .align 2 gTileset_Slateport:: @ 83DF764 @@ -51,7 +51,7 @@ gTileset_Slateport:: @ 83DF764 .4byte gTilesetPalettes_Slateport .4byte gMetatiles_Slateport .4byte gMetatileAttributes_Slateport - .4byte TilesetCb_Slateport + .4byte InitTilesetAnim_Slateport .align 2 gTileset_Mauville:: @ 83DF77C @@ -62,7 +62,7 @@ gTileset_Mauville:: @ 83DF77C .4byte gTilesetPalettes_Mauville .4byte gMetatiles_Mauville .4byte gMetatileAttributes_Mauville - .4byte TilesetCb_Mauville + .4byte InitTilesetAnim_Mauville .align 2 gTileset_Lavaridge:: @ 83DF794 @@ -73,7 +73,7 @@ gTileset_Lavaridge:: @ 83DF794 .4byte gTilesetPalettes_Lavaridge .4byte gMetatiles_Lavaridge .4byte gMetatileAttributes_Lavaridge - .4byte TilesetCb_Lavaridge + .4byte InitTilesetAnim_Lavaridge .align 2 gTileset_Fallarbor:: @ 83DF7AC @@ -84,7 +84,7 @@ gTileset_Fallarbor:: @ 83DF7AC .4byte gTilesetPalettes_Fallarbor .4byte gMetatiles_Fallarbor .4byte gMetatileAttributes_Fallarbor - .4byte TilesetCb_Fallarbor + .4byte InitTilesetAnim_Fallarbor .align 2 gTileset_Fortree:: @ 83DF7C4 @@ -95,7 +95,7 @@ gTileset_Fortree:: @ 83DF7C4 .4byte gTilesetPalettes_Fortree .4byte gMetatiles_Fortree .4byte gMetatileAttributes_Fortree - .4byte TilesetCb_Fortree + .4byte InitTilesetAnim_Fortree .align 2 gTileset_Lilycove:: @ 83DF7DC @@ -106,7 +106,7 @@ gTileset_Lilycove:: @ 83DF7DC .4byte gTilesetPalettes_Lilycove .4byte gMetatiles_Lilycove .4byte gMetatileAttributes_Lilycove - .4byte TilesetCb_Lilycove + .4byte InitTilesetAnim_Lilycove .align 2 gTileset_Mossdeep:: @ 83DF7F4 @@ -117,7 +117,7 @@ gTileset_Mossdeep:: @ 83DF7F4 .4byte gTilesetPalettes_Mossdeep .4byte gMetatiles_Mossdeep .4byte gMetatileAttributes_Mossdeep - .4byte TilesetCb_Mossdeep + .4byte InitTilesetAnim_Mossdeep .align 2 gTileset_EverGrande:: @ 83DF80C @@ -128,7 +128,7 @@ gTileset_EverGrande:: @ 83DF80C .4byte gTilesetPalettes_EverGrande .4byte gMetatiles_EverGrande .4byte gMetatileAttributes_EverGrande - .4byte TilesetCb_EverGrande + .4byte InitTilesetAnim_EverGrande .align 2 gTileset_Pacifidlog:: @ 83DF824 @@ -139,7 +139,7 @@ gTileset_Pacifidlog:: @ 83DF824 .4byte gTilesetPalettes_Pacifidlog .4byte gMetatiles_Pacifidlog .4byte gMetatileAttributes_Pacifidlog - .4byte TilesetCb_Pacifidlog + .4byte InitTilesetAnim_Pacifidlog .align 2 gTileset_Sootopolis:: @ 83DF83C @@ -150,7 +150,7 @@ gTileset_Sootopolis:: @ 83DF83C .4byte gTilesetPalettes_Sootopolis .4byte gMetatiles_Sootopolis .4byte gMetatileAttributes_Sootopolis - .4byte TilesetCb_Sootopolis + .4byte InitTilesetAnim_Sootopolis .align 2 gTileset_BattleFrontierOutsideWest:: @ 83DF854 @@ -161,7 +161,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854 .4byte gTilesetPalettes_BattleFrontierOutsideWest .4byte gMetatiles_BattleFrontierOutsideWest .4byte gMetatileAttributes_BattleFrontierOutsideWest - .4byte TilesetCb_BattleFrontierOutsideWest + .4byte InitTilesetAnim_BattleFrontierOutsideWest .align 2 gTileset_BattleFrontierOutsideEast:: @ 83DF86C @@ -172,7 +172,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C .4byte gTilesetPalettes_BattleFrontierOutsideEast .4byte gMetatiles_BattleFrontierOutsideEast .4byte gMetatileAttributes_BattleFrontierOutsideEast - .4byte TilesetCb_BattleFrontierOutsideEast + .4byte InitTilesetAnim_BattleFrontierOutsideEast .align 2 gTileset_Building:: @ 83DF884 @@ -183,7 +183,7 @@ gTileset_Building:: @ 83DF884 .4byte gTilesetPalettes_InsideBuilding .4byte gMetatiles_InsideBuilding .4byte gMetatileAttributes_InsideBuilding - .4byte TilesetCb_InsideBuilding + .4byte InitTilesetAnim_Building .align 2 gTileset_Shop:: @ 83DF89C @@ -216,7 +216,7 @@ gTileset_Cave:: @ 83DF8CC .4byte gTilesetPalettes_Cave .4byte gMetatiles_Cave .4byte gMetatileAttributes_Cave - .4byte TilesetCb_Cave + .4byte InitTilesetAnim_Cave .align 2 gTileset_PokemonSchool:: @ 83DF8E4 @@ -337,7 +337,7 @@ gTileset_BikeShop:: @ 83DF9D4 .4byte gTilesetPalettes_BikeShop .4byte gMetatiles_BikeShop .4byte gMetatileAttributes_BikeShop - .4byte TilesetCb_BikeShop + .4byte InitTilesetAnim_BikeShop .align 2 gTileset_RusturfTunnel:: @ 83DF9EC @@ -491,7 +491,7 @@ gTileset_Underwater:: @ 83DFB24 .4byte gTilesetPalettes_Underwater .4byte gMetatiles_Underwater .4byte gMetatileAttributes_Underwater - .4byte TilesetCb_Underwater + .4byte InitTilesetAnim_Underwater .align 2 gTileset_PetalburgGym:: @ 83DFB3C @@ -513,7 +513,7 @@ gTileset_SootopolisGym:: @ 83DFB54 .4byte gTilesetPalettes_SootopolisGym .4byte gMetatiles_SootopolisGym .4byte gMetatileAttributes_SootopolisGym - .4byte TilesetCb_SootopolisGym + .4byte InitTilesetAnim_SootopolisGym .align 2 gTileset_GenericBuilding:: @ 83DFB6C @@ -568,7 +568,7 @@ gTileset_MauvilleGym:: @ 83DFBCC .4byte gTilesetPalettes_MauvilleGym .4byte gMetatiles_MauvilleGym .4byte gMetatileAttributes_MauvilleGym - .4byte TilesetCb_MauvilleGym + .4byte InitTilesetAnim_MauvilleGym .align 2 gTileset_LavaridgeGym:: @ 83DFBE4 @@ -653,7 +653,7 @@ gTileset_EliteFour:: @ 83DFC7C .4byte gTilesetPalettes_EliteFour .4byte gMetatiles_EliteFour .4byte gMetatileAttributes_EliteFour - .4byte TilesetCb_EliteFour + .4byte InitTilesetAnim_EliteFour .align 2 gTileset_BattleFrontier:: @ 83DFC94 @@ -686,7 +686,7 @@ gTileset_BattleDome:: @ 83DFCC4 .4byte gTilesetPalettes_BattleDome .4byte gMetatiles_BattleDome .4byte gMetatileAttributes_BattleDome - .4byte TilesetCb_BattleDome + .4byte InitTilesetAnim_BattleDome .align 2 gTileset_BattleFactory:: @ 83DFCDC @@ -730,7 +730,7 @@ gTileset_BattlePyramid:: @ 83DFD24 .4byte gTilesetPalettes_BattlePyramid .4byte gMetatiles_BattlePyramid .4byte gMetatileAttributes_BattlePyramid - .4byte TilesetCb_BattlePyramid + .4byte InitTilesetAnim_BattlePyramid .align 2 gTileset_MirageTower:: @ 83DFD3C diff --git a/data/tilesets/primary/building/anim/0.png b/data/tilesets/primary/building/anim/tv_turned_on/0.png similarity index 100% rename from data/tilesets/primary/building/anim/0.png rename to data/tilesets/primary/building/anim/tv_turned_on/0.png diff --git a/data/tilesets/primary/building/anim/1.png b/data/tilesets/primary/building/anim/tv_turned_on/1.png similarity index 100% rename from data/tilesets/primary/building/anim/1.png rename to data/tilesets/primary/building/anim/tv_turned_on/1.png diff --git a/data/tilesets/primary/general/anim/0/0.png b/data/tilesets/primary/general/anim/flower/0.png similarity index 100% rename from data/tilesets/primary/general/anim/0/0.png rename to data/tilesets/primary/general/anim/flower/0.png diff --git a/data/tilesets/primary/general/anim/0/1.png b/data/tilesets/primary/general/anim/flower/1.png similarity index 100% rename from data/tilesets/primary/general/anim/0/1.png rename to data/tilesets/primary/general/anim/flower/1.png diff --git a/data/tilesets/primary/general/anim/0/2.png b/data/tilesets/primary/general/anim/flower/2.png similarity index 100% rename from data/tilesets/primary/general/anim/0/2.png rename to data/tilesets/primary/general/anim/flower/2.png diff --git a/data/tilesets/primary/general/anim/4/0.png b/data/tilesets/primary/general/anim/land_water_edge/0.png similarity index 100% rename from data/tilesets/primary/general/anim/4/0.png rename to data/tilesets/primary/general/anim/land_water_edge/0.png diff --git a/data/tilesets/primary/general/anim/4/1.png b/data/tilesets/primary/general/anim/land_water_edge/1.png similarity index 100% rename from data/tilesets/primary/general/anim/4/1.png rename to data/tilesets/primary/general/anim/land_water_edge/1.png diff --git a/data/tilesets/primary/general/anim/4/2.png b/data/tilesets/primary/general/anim/land_water_edge/2.png similarity index 100% rename from data/tilesets/primary/general/anim/4/2.png rename to data/tilesets/primary/general/anim/land_water_edge/2.png diff --git a/data/tilesets/primary/general/anim/4/3.png b/data/tilesets/primary/general/anim/land_water_edge/3.png similarity index 100% rename from data/tilesets/primary/general/anim/4/3.png rename to data/tilesets/primary/general/anim/land_water_edge/3.png diff --git a/data/tilesets/primary/general/anim/2/0.png b/data/tilesets/primary/general/anim/sand_water_edge/0.png similarity index 100% rename from data/tilesets/primary/general/anim/2/0.png rename to data/tilesets/primary/general/anim/sand_water_edge/0.png diff --git a/data/tilesets/primary/general/anim/2/1.png b/data/tilesets/primary/general/anim/sand_water_edge/1.png similarity index 100% rename from data/tilesets/primary/general/anim/2/1.png rename to data/tilesets/primary/general/anim/sand_water_edge/1.png diff --git a/data/tilesets/primary/general/anim/2/2.png b/data/tilesets/primary/general/anim/sand_water_edge/2.png similarity index 100% rename from data/tilesets/primary/general/anim/2/2.png rename to data/tilesets/primary/general/anim/sand_water_edge/2.png diff --git a/data/tilesets/primary/general/anim/2/3.png b/data/tilesets/primary/general/anim/sand_water_edge/3.png similarity index 100% rename from data/tilesets/primary/general/anim/2/3.png rename to data/tilesets/primary/general/anim/sand_water_edge/3.png diff --git a/data/tilesets/primary/general/anim/2/4.png b/data/tilesets/primary/general/anim/sand_water_edge/4.png similarity index 100% rename from data/tilesets/primary/general/anim/2/4.png rename to data/tilesets/primary/general/anim/sand_water_edge/4.png diff --git a/data/tilesets/primary/general/anim/2/5.png b/data/tilesets/primary/general/anim/sand_water_edge/5.png similarity index 100% rename from data/tilesets/primary/general/anim/2/5.png rename to data/tilesets/primary/general/anim/sand_water_edge/5.png diff --git a/data/tilesets/primary/general/anim/2/6.png b/data/tilesets/primary/general/anim/sand_water_edge/6.png similarity index 100% rename from data/tilesets/primary/general/anim/2/6.png rename to data/tilesets/primary/general/anim/sand_water_edge/6.png diff --git a/data/tilesets/primary/general/anim/1/0.png b/data/tilesets/primary/general/anim/water/0.png similarity index 100% rename from data/tilesets/primary/general/anim/1/0.png rename to data/tilesets/primary/general/anim/water/0.png diff --git a/data/tilesets/primary/general/anim/1/1.png b/data/tilesets/primary/general/anim/water/1.png similarity index 100% rename from data/tilesets/primary/general/anim/1/1.png rename to data/tilesets/primary/general/anim/water/1.png diff --git a/data/tilesets/primary/general/anim/1/2.png b/data/tilesets/primary/general/anim/water/2.png similarity index 100% rename from data/tilesets/primary/general/anim/1/2.png rename to data/tilesets/primary/general/anim/water/2.png diff --git a/data/tilesets/primary/general/anim/1/3.png b/data/tilesets/primary/general/anim/water/3.png similarity index 100% rename from data/tilesets/primary/general/anim/1/3.png rename to data/tilesets/primary/general/anim/water/3.png diff --git a/data/tilesets/primary/general/anim/1/4.png b/data/tilesets/primary/general/anim/water/4.png similarity index 100% rename from data/tilesets/primary/general/anim/1/4.png rename to data/tilesets/primary/general/anim/water/4.png diff --git a/data/tilesets/primary/general/anim/1/5.png b/data/tilesets/primary/general/anim/water/5.png similarity index 100% rename from data/tilesets/primary/general/anim/1/5.png rename to data/tilesets/primary/general/anim/water/5.png diff --git a/data/tilesets/primary/general/anim/1/6.png b/data/tilesets/primary/general/anim/water/6.png similarity index 100% rename from data/tilesets/primary/general/anim/1/6.png rename to data/tilesets/primary/general/anim/water/6.png diff --git a/data/tilesets/primary/general/anim/1/7.png b/data/tilesets/primary/general/anim/water/7.png similarity index 100% rename from data/tilesets/primary/general/anim/1/7.png rename to data/tilesets/primary/general/anim/water/7.png diff --git a/data/tilesets/primary/general/anim/3/0.png b/data/tilesets/primary/general/anim/waterfall/0.png similarity index 100% rename from data/tilesets/primary/general/anim/3/0.png rename to data/tilesets/primary/general/anim/waterfall/0.png diff --git a/data/tilesets/primary/general/anim/3/1.png b/data/tilesets/primary/general/anim/waterfall/1.png similarity index 100% rename from data/tilesets/primary/general/anim/3/1.png rename to data/tilesets/primary/general/anim/waterfall/1.png diff --git a/data/tilesets/primary/general/anim/3/2.png b/data/tilesets/primary/general/anim/waterfall/2.png similarity index 100% rename from data/tilesets/primary/general/anim/3/2.png rename to data/tilesets/primary/general/anim/waterfall/2.png diff --git a/data/tilesets/primary/general/anim/3/3.png b/data/tilesets/primary/general/anim/waterfall/3.png similarity index 100% rename from data/tilesets/primary/general/anim/3/3.png rename to data/tilesets/primary/general/anim/waterfall/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/0.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/1.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/2.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_east/anim/3.png rename to data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/0.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/1.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/2.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.png diff --git a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png b/data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png similarity index 100% rename from data/tilesets/secondary/battle_frontier_outside_west/anim/3.png rename to data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/0.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/1/0.png rename to data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/1.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/1/1.png rename to data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/1/2.png b/data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/1/2.png rename to data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/0.png b/data/tilesets/secondary/battle_pyramid/anim/torch/0.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/0/0.png rename to data/tilesets/secondary/battle_pyramid/anim/torch/0.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/1.png b/data/tilesets/secondary/battle_pyramid/anim/torch/1.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/0/1.png rename to data/tilesets/secondary/battle_pyramid/anim/torch/1.png diff --git a/data/tilesets/secondary/battle_pyramid/anim/0/2.png b/data/tilesets/secondary/battle_pyramid/anim/torch/2.png similarity index 100% rename from data/tilesets/secondary/battle_pyramid/anim/0/2.png rename to data/tilesets/secondary/battle_pyramid/anim/torch/2.png diff --git a/data/tilesets/secondary/bike_shop/anim/0.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png similarity index 100% rename from data/tilesets/secondary/bike_shop/anim/0.png rename to data/tilesets/secondary/bike_shop/anim/blinking_lights/0.png diff --git a/data/tilesets/secondary/bike_shop/anim/1.png b/data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png similarity index 100% rename from data/tilesets/secondary/bike_shop/anim/1.png rename to data/tilesets/secondary/bike_shop/anim/blinking_lights/1.png diff --git a/data/tilesets/secondary/cave/anim/0.png b/data/tilesets/secondary/cave/anim/lava/0.png similarity index 100% rename from data/tilesets/secondary/cave/anim/0.png rename to data/tilesets/secondary/cave/anim/lava/0.png diff --git a/data/tilesets/secondary/cave/anim/1.png b/data/tilesets/secondary/cave/anim/lava/1.png similarity index 100% rename from data/tilesets/secondary/cave/anim/1.png rename to data/tilesets/secondary/cave/anim/lava/1.png diff --git a/data/tilesets/secondary/cave/anim/2.png b/data/tilesets/secondary/cave/anim/lava/2.png similarity index 100% rename from data/tilesets/secondary/cave/anim/2.png rename to data/tilesets/secondary/cave/anim/lava/2.png diff --git a/data/tilesets/secondary/cave/anim/3.png b/data/tilesets/secondary/cave/anim/lava/3.png similarity index 100% rename from data/tilesets/secondary/cave/anim/3.png rename to data/tilesets/secondary/cave/anim/lava/3.png diff --git a/data/tilesets/secondary/cave/anim/unused/0.png b/data/tilesets/secondary/cave/anim/lava/4.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/0.png rename to data/tilesets/secondary/cave/anim/lava/4.png diff --git a/data/tilesets/secondary/cave/anim/unused/1.png b/data/tilesets/secondary/cave/anim/lava/5.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/1.png rename to data/tilesets/secondary/cave/anim/lava/5.png diff --git a/data/tilesets/secondary/cave/anim/unused/2.png b/data/tilesets/secondary/cave/anim/lava/6.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/2.png rename to data/tilesets/secondary/cave/anim/lava/6.png diff --git a/data/tilesets/secondary/cave/anim/unused/3.png b/data/tilesets/secondary/cave/anim/lava/7.png similarity index 100% rename from data/tilesets/secondary/cave/anim/unused/3.png rename to data/tilesets/secondary/cave/anim/lava/7.png diff --git a/data/tilesets/secondary/dewford/anim/0.png b/data/tilesets/secondary/dewford/anim/flag/0.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/0.png rename to data/tilesets/secondary/dewford/anim/flag/0.png diff --git a/data/tilesets/secondary/dewford/anim/1.png b/data/tilesets/secondary/dewford/anim/flag/1.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/1.png rename to data/tilesets/secondary/dewford/anim/flag/1.png diff --git a/data/tilesets/secondary/dewford/anim/2.png b/data/tilesets/secondary/dewford/anim/flag/2.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/2.png rename to data/tilesets/secondary/dewford/anim/flag/2.png diff --git a/data/tilesets/secondary/dewford/anim/3.png b/data/tilesets/secondary/dewford/anim/flag/3.png similarity index 100% rename from data/tilesets/secondary/dewford/anim/3.png rename to data/tilesets/secondary/dewford/anim/flag/3.png diff --git a/data/tilesets/secondary/elite_four/anim/1/0.png b/data/tilesets/secondary/elite_four/anim/floor_light/0.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/1/0.png rename to data/tilesets/secondary/elite_four/anim/floor_light/0.png diff --git a/data/tilesets/secondary/elite_four/anim/1/1.png b/data/tilesets/secondary/elite_four/anim/floor_light/1.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/1/1.png rename to data/tilesets/secondary/elite_four/anim/floor_light/1.png diff --git a/data/tilesets/secondary/elite_four/anim/0/0.png b/data/tilesets/secondary/elite_four/anim/wall_lights/0.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/0.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/0.png diff --git a/data/tilesets/secondary/elite_four/anim/0/1.png b/data/tilesets/secondary/elite_four/anim/wall_lights/1.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/1.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/1.png diff --git a/data/tilesets/secondary/elite_four/anim/0/2.png b/data/tilesets/secondary/elite_four/anim/wall_lights/2.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/2.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/2.png diff --git a/data/tilesets/secondary/elite_four/anim/0/3.png b/data/tilesets/secondary/elite_four/anim/wall_lights/3.png similarity index 100% rename from data/tilesets/secondary/elite_four/anim/0/3.png rename to data/tilesets/secondary/elite_four/anim/wall_lights/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/0.png b/data/tilesets/secondary/ever_grande/anim/flowers/0.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/0.png rename to data/tilesets/secondary/ever_grande/anim/flowers/0.png diff --git a/data/tilesets/secondary/ever_grande/anim/1.png b/data/tilesets/secondary/ever_grande/anim/flowers/1.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/1.png rename to data/tilesets/secondary/ever_grande/anim/flowers/1.png diff --git a/data/tilesets/secondary/ever_grande/anim/2.png b/data/tilesets/secondary/ever_grande/anim/flowers/2.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/2.png rename to data/tilesets/secondary/ever_grande/anim/flowers/2.png diff --git a/data/tilesets/secondary/ever_grande/anim/3.png b/data/tilesets/secondary/ever_grande/anim/flowers/3.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/3.png rename to data/tilesets/secondary/ever_grande/anim/flowers/3.png diff --git a/data/tilesets/secondary/ever_grande/anim/4.png b/data/tilesets/secondary/ever_grande/anim/flowers/4.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/4.png rename to data/tilesets/secondary/ever_grande/anim/flowers/4.png diff --git a/data/tilesets/secondary/ever_grande/anim/5.png b/data/tilesets/secondary/ever_grande/anim/flowers/5.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/5.png rename to data/tilesets/secondary/ever_grande/anim/flowers/5.png diff --git a/data/tilesets/secondary/ever_grande/anim/6.png b/data/tilesets/secondary/ever_grande/anim/flowers/6.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/6.png rename to data/tilesets/secondary/ever_grande/anim/flowers/6.png diff --git a/data/tilesets/secondary/ever_grande/anim/7.png b/data/tilesets/secondary/ever_grande/anim/flowers/7.png similarity index 100% rename from data/tilesets/secondary/ever_grande/anim/7.png rename to data/tilesets/secondary/ever_grande/anim/flowers/7.png diff --git a/data/tilesets/secondary/lavaridge/anim/0.png b/data/tilesets/secondary/lavaridge/anim/steam/0.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/0.png rename to data/tilesets/secondary/lavaridge/anim/steam/0.png diff --git a/data/tilesets/secondary/lavaridge/anim/1.png b/data/tilesets/secondary/lavaridge/anim/steam/1.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/1.png rename to data/tilesets/secondary/lavaridge/anim/steam/1.png diff --git a/data/tilesets/secondary/lavaridge/anim/2.png b/data/tilesets/secondary/lavaridge/anim/steam/2.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/2.png rename to data/tilesets/secondary/lavaridge/anim/steam/2.png diff --git a/data/tilesets/secondary/lavaridge/anim/3.png b/data/tilesets/secondary/lavaridge/anim/steam/3.png similarity index 100% rename from data/tilesets/secondary/lavaridge/anim/3.png rename to data/tilesets/secondary/lavaridge/anim/steam/3.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/0.png b/data/tilesets/secondary/mauville/anim/flower_1/0.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/0.png rename to data/tilesets/secondary/mauville/anim/flower_1/0.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/1.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/1.png rename to data/tilesets/secondary/mauville/anim/flower_1/1.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/2.png b/data/tilesets/secondary/mauville/anim/flower_1/2.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/2.png rename to data/tilesets/secondary/mauville/anim/flower_1/2.png diff --git a/data/tilesets/secondary/mauville/anim/0/a/3.png b/data/tilesets/secondary/mauville/anim/flower_1/3.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/a/3.png rename to data/tilesets/secondary/mauville/anim/flower_1/3.png diff --git a/data/tilesets/secondary/mauville/anim/1/a/1.png b/data/tilesets/secondary/mauville/anim/flower_1/4.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/1/a/1.png rename to data/tilesets/secondary/mauville/anim/flower_1/4.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/0.png b/data/tilesets/secondary/mauville/anim/flower_2/0.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/0.png rename to data/tilesets/secondary/mauville/anim/flower_2/0.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/1.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/1.png rename to data/tilesets/secondary/mauville/anim/flower_2/1.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/2.png b/data/tilesets/secondary/mauville/anim/flower_2/2.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/2.png rename to data/tilesets/secondary/mauville/anim/flower_2/2.png diff --git a/data/tilesets/secondary/mauville/anim/0/b/3.png b/data/tilesets/secondary/mauville/anim/flower_2/3.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/0/b/3.png rename to data/tilesets/secondary/mauville/anim/flower_2/3.png diff --git a/data/tilesets/secondary/mauville/anim/1/b/1.png b/data/tilesets/secondary/mauville/anim/flower_2/4.png similarity index 100% rename from data/tilesets/secondary/mauville/anim/1/b/1.png rename to data/tilesets/secondary/mauville/anim/flower_2/4.png diff --git a/data/tilesets/secondary/mauville_gym/anim/0.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png similarity index 100% rename from data/tilesets/secondary/mauville_gym/anim/0.png rename to data/tilesets/secondary/mauville_gym/anim/electric_gates/0.png diff --git a/data/tilesets/secondary/mauville_gym/anim/1.png b/data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png similarity index 100% rename from data/tilesets/secondary/mauville_gym/anim/1.png rename to data/tilesets/secondary/mauville_gym/anim/electric_gates/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/0.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/0/0.png rename to data/tilesets/secondary/pacifidlog/anim/log_bridges/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/1.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/0/1.png rename to data/tilesets/secondary/pacifidlog/anim/log_bridges/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/0/2.png b/data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/0/2.png rename to data/tilesets/secondary/pacifidlog/anim/log_bridges/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/0.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/0.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/0.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/0.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/1.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/1.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/1.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/1.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/2.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/2.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/2.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/2.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/3.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/3.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/3.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/3.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/4.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/4.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/4.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/4.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/5.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/5.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/5.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/5.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/6.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/6.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/6.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/6.png diff --git a/data/tilesets/secondary/pacifidlog/anim/1/7.png b/data/tilesets/secondary/pacifidlog/anim/water_currents/7.png similarity index 100% rename from data/tilesets/secondary/pacifidlog/anim/1/7.png rename to data/tilesets/secondary/pacifidlog/anim/water_currents/7.png diff --git a/data/tilesets/secondary/rustboro/anim/1/0.png b/data/tilesets/secondary/rustboro/anim/fountain/0.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/1/0.png rename to data/tilesets/secondary/rustboro/anim/fountain/0.png diff --git a/data/tilesets/secondary/rustboro/anim/1/1.png b/data/tilesets/secondary/rustboro/anim/fountain/1.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/1/1.png rename to data/tilesets/secondary/rustboro/anim/fountain/1.png diff --git a/data/tilesets/secondary/rustboro/anim/0/0.png b/data/tilesets/secondary/rustboro/anim/windy_water/0.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/0.png rename to data/tilesets/secondary/rustboro/anim/windy_water/0.png diff --git a/data/tilesets/secondary/rustboro/anim/0/1.png b/data/tilesets/secondary/rustboro/anim/windy_water/1.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/1.png rename to data/tilesets/secondary/rustboro/anim/windy_water/1.png diff --git a/data/tilesets/secondary/rustboro/anim/0/2.png b/data/tilesets/secondary/rustboro/anim/windy_water/2.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/2.png rename to data/tilesets/secondary/rustboro/anim/windy_water/2.png diff --git a/data/tilesets/secondary/rustboro/anim/0/3.png b/data/tilesets/secondary/rustboro/anim/windy_water/3.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/3.png rename to data/tilesets/secondary/rustboro/anim/windy_water/3.png diff --git a/data/tilesets/secondary/rustboro/anim/0/4.png b/data/tilesets/secondary/rustboro/anim/windy_water/4.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/4.png rename to data/tilesets/secondary/rustboro/anim/windy_water/4.png diff --git a/data/tilesets/secondary/rustboro/anim/0/5.png b/data/tilesets/secondary/rustboro/anim/windy_water/5.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/5.png rename to data/tilesets/secondary/rustboro/anim/windy_water/5.png diff --git a/data/tilesets/secondary/rustboro/anim/0/6.png b/data/tilesets/secondary/rustboro/anim/windy_water/6.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/6.png rename to data/tilesets/secondary/rustboro/anim/windy_water/6.png diff --git a/data/tilesets/secondary/rustboro/anim/0/7.png b/data/tilesets/secondary/rustboro/anim/windy_water/7.png similarity index 100% rename from data/tilesets/secondary/rustboro/anim/0/7.png rename to data/tilesets/secondary/rustboro/anim/windy_water/7.png diff --git a/data/tilesets/secondary/slateport/anim/0.png b/data/tilesets/secondary/slateport/anim/balloons/0.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/0.png rename to data/tilesets/secondary/slateport/anim/balloons/0.png diff --git a/data/tilesets/secondary/slateport/anim/1.png b/data/tilesets/secondary/slateport/anim/balloons/1.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/1.png rename to data/tilesets/secondary/slateport/anim/balloons/1.png diff --git a/data/tilesets/secondary/slateport/anim/2.png b/data/tilesets/secondary/slateport/anim/balloons/2.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/2.png rename to data/tilesets/secondary/slateport/anim/balloons/2.png diff --git a/data/tilesets/secondary/slateport/anim/3.png b/data/tilesets/secondary/slateport/anim/balloons/3.png similarity index 100% rename from data/tilesets/secondary/slateport/anim/3.png rename to data/tilesets/secondary/slateport/anim/balloons/3.png diff --git a/data/tilesets/secondary/sootopolis/anim/0.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/0.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/0.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/0.png diff --git a/data/tilesets/secondary/sootopolis/anim/1.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/1.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/1.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/1.png diff --git a/data/tilesets/secondary/sootopolis/anim/2.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/2.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/2.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/2.png diff --git a/data/tilesets/secondary/sootopolis/anim/3.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/3.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/3.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/3.png diff --git a/data/tilesets/secondary/sootopolis/anim/4.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/4.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/4.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/4.png diff --git a/data/tilesets/secondary/sootopolis/anim/5.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/5.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/5.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/5.png diff --git a/data/tilesets/secondary/sootopolis/anim/6.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/6.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/6.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/6.png diff --git a/data/tilesets/secondary/sootopolis/anim/7.png b/data/tilesets/secondary/sootopolis/anim/stormy_water/7.png similarity index 100% rename from data/tilesets/secondary/sootopolis/anim/7.png rename to data/tilesets/secondary/sootopolis/anim/stormy_water/7.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/0.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/1/0.png rename to data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/1.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/1/1.png rename to data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/1/2.png b/data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/1/2.png rename to data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/0.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/0/0.png rename to data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/1.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/0/1.png rename to data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.png diff --git a/data/tilesets/secondary/sootopolis_gym/anim/0/2.png b/data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png similarity index 100% rename from data/tilesets/secondary/sootopolis_gym/anim/0/2.png rename to data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.png diff --git a/data/tilesets/secondary/underwater/anim/0.png b/data/tilesets/secondary/underwater/anim/seaweed/0.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/0.png rename to data/tilesets/secondary/underwater/anim/seaweed/0.png diff --git a/data/tilesets/secondary/underwater/anim/1.png b/data/tilesets/secondary/underwater/anim/seaweed/1.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/1.png rename to data/tilesets/secondary/underwater/anim/seaweed/1.png diff --git a/data/tilesets/secondary/underwater/anim/2.png b/data/tilesets/secondary/underwater/anim/seaweed/2.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/2.png rename to data/tilesets/secondary/underwater/anim/seaweed/2.png diff --git a/data/tilesets/secondary/underwater/anim/3.png b/data/tilesets/secondary/underwater/anim/seaweed/3.png similarity index 100% rename from data/tilesets/secondary/underwater/anim/3.png rename to data/tilesets/secondary/underwater/anim/seaweed/3.png diff --git a/include/graphics.h b/include/graphics.h index f86a04085..58a9666a6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4104,6 +4104,10 @@ extern const u32 gUnknown_08D83B2C[]; extern const u32 gUnknown_08D83C3C[]; extern const u32 gUnknown_08D83900[]; extern const u32 gBattleFrontierGfx_DomeOptions[]; +extern const u16 gTilesetAnims_BattleDomePals0_0[]; +extern const u16 gTilesetAnims_BattleDomePals0_1[]; +extern const u16 gTilesetAnims_BattleDomePals0_2[]; +extern const u16 gTilesetAnims_BattleDomePals0_3[]; extern const u32 gBattleArenaJudgementSymbolsGfx[]; extern const u32 gBattleArenaJudgementSymbolsPalette[]; diff --git a/include/tileset_anims.h b/include/tileset_anims.h index 17d883cd2..0e515f044 100755 --- a/include/tileset_anims.h +++ b/include/tileset_anims.h @@ -1,9 +1,9 @@ #ifndef GUARD_TILESET_ANIMS_H #define GUARD_TILESET_ANIMS_H -void cur_mapheader_run_tileset_funcs_after_some_cpuset(void); -void sub_80A0A2C(void); -void sub_80A0A38(void); +void InitTilesetAnimations(void); +void InitSecondaryTilesetAnimation(void); +void UpdateTilesetAnimations(void); void TransferTilesetAnimsBuffer(void); #endif // GUARD_TILESET_ANIMS_H diff --git a/src/battle_dome.c b/src/battle_dome.c index f6327f31f..bfede1b28 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -126,7 +126,7 @@ static EWRAM_DATA struct BattleDomeStruct *sBattleDomeStruct = {0}; static EWRAM_DATA u8 *sTilemapBuffer = NULL; // Const rom data. -static const u8 sMovePointsForDomeTrainers[][DOME_TOURNAMENT_TRAINERS_COUNT] = +static const u8 sMovePointsForDomeTrainers[MOVES_COUNT][DOME_TOURNAMENT_TRAINERS_COUNT] = { [MOVE_NONE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, [MOVE_POUND] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0}, diff --git a/src/overworld.c b/src/overworld.c index 43610fe09..08fd94c1b 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -528,7 +528,7 @@ static void mapdata_load_assets_to_gpu_and_full_redraw(void) copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout); apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); DrawWholeMapView(); - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); } const struct MapLayout *GetMapLayout(void) @@ -808,7 +808,7 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) for (paletteIndex = 6; paletteIndex < 13; paletteIndex++) ApplyWeatherGammaShiftToPal(paletteIndex); - sub_80A0A2C(); + InitSecondaryTilesetAnimation(); UpdateLocationHistoryForRoamer(); RoamerMove(); DoCurrentWeather(); @@ -1451,7 +1451,7 @@ static void OverworldBasic(void) UpdateCameraPanning(); BuildOamBuffer(); UpdatePaletteFade(); - sub_80A0A38(); + UpdateTilesetAnimations(); do_scheduled_bg_tilemap_copies_to_vram(); } @@ -1843,7 +1843,7 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 10: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: @@ -1918,7 +1918,7 @@ static bool32 load_map_stuff(u8 *state, u32 a2) (*state)++; break; case 10: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: @@ -2015,7 +2015,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 9: - cur_mapheader_run_tileset_funcs_after_some_cpuset(); + InitTilesetAnimations(); (*state)++; break; case 11: diff --git a/src/tileset_anims.c b/src/tileset_anims.c index f7c3cd482..087b75b7c 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1,5 +1,5 @@ -// Includes #include "global.h" +#include "graphics.h" #include "palette.h" #include "util.h" #include "battle_transition.h" @@ -7,10 +7,6 @@ #include "battle_transition.h" #include "fieldmap.h" -// Static type declarations - -// Static RAM declarations - static EWRAM_DATA struct { const u16 *src; u16 *dest; @@ -18,211 +14,209 @@ static EWRAM_DATA struct { } sTilesetDMA3TransferBuffer[20] = {0}; static u8 sTilesetDMA3TransferBufferSize; -static u16 sPrimaryTilesetCBCounter; -static u16 sPrimaryTilesetCBBufferSize; -static u16 sSecondaryTilesetCBCounter; -static u16 sSecondaryTilesetCBBufferSize; -static void (*sPrimaryTilesetCB)(u16); -static void (*sSecondaryTilesetCB)(u16); +static u16 sPrimaryTilesetAnimCounter; +static u16 sPrimaryTilesetAnimCounterMax; +static u16 sSecondaryTilesetAnimCounter; +static u16 sSecondaryTilesetAnimCounterMax; +static void (*sPrimaryTilesetAnimCallback)(u16); +static void (*sSecondaryTilesetAnimCallback)(u16); -// Static ROM declarations - -static void cur_mapheader_run_tileset1_func(void); -static void cur_mapheader_run_tileset2_func(void); - -// .rodata - - -const u16 gTilesetAnims_General0_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/0/1.4bpp"); - -const u16 gTilesetAnims_General0_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/0/0.4bpp"); - -const u16 gTilesetAnims_General0_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/0/2.4bpp"); +static void _InitPrimaryTilesetAnimation(void); +static void _InitSecondaryTilesetAnimation(void); +static void TilesetAnim_General(u16); +static void TilesetAnim_Building(u16); +static void TilesetAnim_Rustboro(u16); +static void TilesetAnim_Dewford(u16); +static void TilesetAnim_Slateport(u16); +static void TilesetAnim_Mauville(u16); +static void TilesetAnim_Lavaridge(u16); +static void TilesetAnim_EverGrande(u16); +static void TilesetAnim_Pacifidlog(u16); +static void TilesetAnim_Sootopolis(u16); +static void TilesetAnim_BattleFrontierOutsideWest(u16); +static void TilesetAnim_BattleFrontierOutsideEast(u16); +static void TilesetAnim_Underwater(u16); +static void TilesetAnim_SootopolisGym(u16); +static void TilesetAnim_Cave(u16); +static void TilesetAnim_EliteFour(u16); +static void TilesetAnim_MauvilleGym(u16); +static void TilesetAnim_BikeShop(u16); +static void TilesetAnim_BattlePyramid(u16); +static void TilesetAnim_BattleDome(u16); +static void QueueAnimTiles_General_Flower(u16); +static void QueueAnimTiles_General_Water(u16); +static void QueueAnimTiles_General_SandWaterEdge(u16); +static void QueueAnimTiles_General_Waterfall(u16); +static void QueueAnimTiles_General_LandWaterEdge(u16); +static void QueueAnimTiles_Building_TVTurnedOn(u16); +static void QueueAnimTiles_Rustboro_WindyWater(u16, u8); +static void QueueAnimTiles_Rustboro_Fountain(u16); +static void QueueAnimTiles_Dewford_Flag(u16); +static void QueueAnimTiles_Slateport_Balloons(u16); +static void QueueAnimTiles_Mauville_Flowers(u16, u8); +static void QueueAnimTiles_BikeShop_BlinkingLights(u16); +static void QueueAnimTiles_BattlePyramid_Torch(u16); +static void QueueAnimTiles_BattlePyramid_StatueShadow(u16); +static void BlendAnimPalette_BattleDome_FloorLights(u16); +static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16); +static void QueueAnimTiles_Lavaridge_Steam(u8); +static void QueueAnimTiles_Lavaridge_Lava(u16); +static void QueueAnimTiles_EverGrande_Flowers(u16, u8); +static void QueueAnimTiles_Pacifidlog_LogBridges(u8); +static void QueueAnimTiles_Pacifidlog_WaterCurrents(u8); +static void QueueAnimTiles_Sootopolis_StormyWater(u16); +static void QueueAnimTiles_Underwater_Seaweed(u8); +static void QueueAnimTiles_Cave_Lava(u16); +static void QueueAnimTiles_BattleFrontierOutsideWest_Flag(u16); +static void QueueAnimTiles_BattleFrontierOutsideEast_Flag(u16); +static void QueueAnimTiles_MauvilleGym_ElectricGates(u16); +static void QueueAnimTiles_SootopolisGym_Waterfalls(u16); +static void QueueAnimTiles_EliteFour_GroundLights(u16); +static void QueueAnimTiles_EliteFour_WallLights(u16); +const u16 gTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/1.4bpp"); +const u16 gTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/0.4bpp"); +const u16 gTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/2.4bpp"); const u16 tileset_anims_space_0[16] = {}; -const u16 *const gTilesetAnims_General0[] = { - gTilesetAnims_General0_Frame0, - gTilesetAnims_General0_Frame1, - gTilesetAnims_General0_Frame0, - gTilesetAnims_General0_Frame2 +const u16 *const gTilesetAnims_General_Flower[] = { + gTilesetAnims_General_Flower_Frame0, + gTilesetAnims_General_Flower_Frame1, + gTilesetAnims_General_Flower_Frame0, + gTilesetAnims_General_Flower_Frame2 }; -const u16 gTilesetAnims_General1_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/1/0.4bpp"); +const u16 gTilesetAnims_General_Water_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/water/0.4bpp"); +const u16 gTilesetAnims_General_Water_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/water/1.4bpp"); +const u16 gTilesetAnims_General_Water_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/water/2.4bpp"); +const u16 gTilesetAnims_General_Water_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/water/3.4bpp"); +const u16 gTilesetAnims_General_Water_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/water/4.4bpp"); +const u16 gTilesetAnims_General_Water_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/water/5.4bpp"); +const u16 gTilesetAnims_General_Water_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/water/6.4bpp"); +const u16 gTilesetAnims_General_Water_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/water/7.4bpp"); -const u16 gTilesetAnims_General1_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/1/1.4bpp"); - -const u16 gTilesetAnims_General1_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/1/2.4bpp"); - -const u16 gTilesetAnims_General1_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/1/3.4bpp"); - -const u16 gTilesetAnims_General1_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/1/4.4bpp"); - -const u16 gTilesetAnims_General1_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/1/5.4bpp"); - -const u16 gTilesetAnims_General1_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/1/6.4bpp"); - -const u16 gTilesetAnims_General1_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/1/7.4bpp"); - -const u16 *const gTilesetAnims_General1[] = { - gTilesetAnims_General1_Frame0, - gTilesetAnims_General1_Frame1, - gTilesetAnims_General1_Frame2, - gTilesetAnims_General1_Frame3, - gTilesetAnims_General1_Frame4, - gTilesetAnims_General1_Frame5, - gTilesetAnims_General1_Frame6, - gTilesetAnims_General1_Frame7 +const u16 *const gTilesetAnims_General_Water[] = { + gTilesetAnims_General_Water_Frame0, + gTilesetAnims_General_Water_Frame1, + gTilesetAnims_General_Water_Frame2, + gTilesetAnims_General_Water_Frame3, + gTilesetAnims_General_Water_Frame4, + gTilesetAnims_General_Water_Frame5, + gTilesetAnims_General_Water_Frame6, + gTilesetAnims_General_Water_Frame7 }; -const u16 gTilesetAnims_General2_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/2/0.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/0.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/1.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/2.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/3.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/4.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/5.4bpp"); +const u16 gTilesetAnims_General_SandWaterEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/sand_water_edge/6.4bpp"); -const u16 gTilesetAnims_General2_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/2/1.4bpp"); - -const u16 gTilesetAnims_General2_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/2/2.4bpp"); - -const u16 gTilesetAnims_General2_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/2/3.4bpp"); - -const u16 gTilesetAnims_General2_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/2/4.4bpp"); - -const u16 gTilesetAnims_General2_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/2/5.4bpp"); - -const u16 gTilesetAnims_General2_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/2/6.4bpp"); - -const u16 *const gTilesetAnims_General2[] = { - gTilesetAnims_General2_Frame0, - gTilesetAnims_General2_Frame1, - gTilesetAnims_General2_Frame2, - gTilesetAnims_General2_Frame3, - gTilesetAnims_General2_Frame4, - gTilesetAnims_General2_Frame5, - gTilesetAnims_General2_Frame6, - gTilesetAnims_General2_Frame0 +const u16 *const gTilesetAnims_General_SandWaterEdge[] = { + gTilesetAnims_General_SandWaterEdge_Frame0, + gTilesetAnims_General_SandWaterEdge_Frame1, + gTilesetAnims_General_SandWaterEdge_Frame2, + gTilesetAnims_General_SandWaterEdge_Frame3, + gTilesetAnims_General_SandWaterEdge_Frame4, + gTilesetAnims_General_SandWaterEdge_Frame5, + gTilesetAnims_General_SandWaterEdge_Frame6, + gTilesetAnims_General_SandWaterEdge_Frame0 }; -const u16 gTilesetAnims_General3_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/3/0.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/0.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/1.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/2.4bpp"); +const u16 gTilesetAnims_General_Waterfall_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/waterfall/3.4bpp"); -const u16 gTilesetAnims_General3_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/3/1.4bpp"); - -const u16 gTilesetAnims_General3_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/3/2.4bpp"); - -const u16 gTilesetAnims_General3_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/3/3.4bpp"); - -const u16 *const gTilesetAnims_General3[] = { - gTilesetAnims_General3_Frame0, - gTilesetAnims_General3_Frame1, - gTilesetAnims_General3_Frame2, - gTilesetAnims_General3_Frame3 +const u16 *const gTilesetAnims_General_Waterfall[] = { + gTilesetAnims_General_Waterfall_Frame0, + gTilesetAnims_General_Waterfall_Frame1, + gTilesetAnims_General_Waterfall_Frame2, + gTilesetAnims_General_Waterfall_Frame3 }; -const u16 gTilesetAnims_General4_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/4/0.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/0.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/1.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/2.4bpp"); +const u16 gTilesetAnims_General_LandWaterEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/land_water_edge/3.4bpp"); -const u16 gTilesetAnims_General4_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/4/1.4bpp"); - -const u16 gTilesetAnims_General4_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/4/2.4bpp"); - -const u16 gTilesetAnims_General4_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/4/3.4bpp"); - -const u16 *const gTilesetAnims_General4[] = { - gTilesetAnims_General4_Frame0, - gTilesetAnims_General4_Frame1, - gTilesetAnims_General4_Frame2, - gTilesetAnims_General4_Frame3 +const u16 *const gTilesetAnims_General_LandWaterEdge[] = { + gTilesetAnims_General_LandWaterEdge_Frame0, + gTilesetAnims_General_LandWaterEdge_Frame1, + gTilesetAnims_General_LandWaterEdge_Frame2, + gTilesetAnims_General_LandWaterEdge_Frame3 }; -const u16 gTilesetAnims_Lavaridge0_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame0[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame1[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/1.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame2[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/2.4bpp"); +const u16 gTilesetAnims_Lavaridge_Steam_Frame3[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/steam/3.4bpp"); -const u16 gTilesetAnims_Lavaridge0_Frame1[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge0_Frame2[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge0_Frame3[] = INCBIN_U16("data/tilesets/secondary/lavaridge/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Lavaridge0[] = { - gTilesetAnims_Lavaridge0_Frame0, - gTilesetAnims_Lavaridge0_Frame1, - gTilesetAnims_Lavaridge0_Frame2, - gTilesetAnims_Lavaridge0_Frame3 +const u16 *const gTilesetAnims_Lavaridge_Steam[] = { + gTilesetAnims_Lavaridge_Steam_Frame0, + gTilesetAnims_Lavaridge_Steam_Frame1, + gTilesetAnims_Lavaridge_Steam_Frame2, + gTilesetAnims_Lavaridge_Steam_Frame3 }; -const u16 gTilesetAnims_Pacifidlog0_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog_LogBridges_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/log_bridges/2.4bpp"); -const u16 gTilesetAnims_Pacifidlog0_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/1.4bpp"); - -const u16 gTilesetAnims_Pacifidlog0_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/0/2.4bpp"); - -const u16 *const gTilesetAnims_Pacifidlog0[] = { - gTilesetAnims_Pacifidlog0_Frame0, - gTilesetAnims_Pacifidlog0_Frame1, - gTilesetAnims_Pacifidlog0_Frame2, - gTilesetAnims_Pacifidlog0_Frame1 +const u16 *const gTilesetAnims_Pacifidlog_LogBridges[] = { + gTilesetAnims_Pacifidlog_LogBridges_Frame0, + gTilesetAnims_Pacifidlog_LogBridges_Frame1, + gTilesetAnims_Pacifidlog_LogBridges_Frame2, + gTilesetAnims_Pacifidlog_LogBridges_Frame1 }; -const u16 gTilesetAnims_Underwater0_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/0.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame0[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/0.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame1[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/1.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame2[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/2.4bpp"); +const u16 gTilesetAnims_Underwater_Seaweed_Frame3[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/seaweed/3.4bpp"); -const u16 gTilesetAnims_Underwater0_Frame1[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/1.4bpp"); - -const u16 gTilesetAnims_Underwater0_Frame2[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/2.4bpp"); - -const u16 gTilesetAnims_Underwater0_Frame3[] = INCBIN_U16("data/tilesets/secondary/underwater/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Underwater0[] = { - gTilesetAnims_Underwater0_Frame0, - gTilesetAnims_Underwater0_Frame1, - gTilesetAnims_Underwater0_Frame2, - gTilesetAnims_Underwater0_Frame3 +const u16 *const gTilesetAnims_Underwater_Seaweed[] = { + gTilesetAnims_Underwater_Seaweed_Frame0, + gTilesetAnims_Underwater_Seaweed_Frame1, + gTilesetAnims_Underwater_Seaweed_Frame2, + gTilesetAnims_Underwater_Seaweed_Frame3 }; -const u16 gTilesetAnims_Pacifidlog1_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame0[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/0.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/1.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/2.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame3[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/3.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/4.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame5[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/5.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame6[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/6.4bpp"); +const u16 gTilesetAnims_Pacifidlog_WaterCurrents_Frame7[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/water_currents/7.4bpp"); -const u16 gTilesetAnims_Pacifidlog1_Frame1[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/1.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame2[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/2.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame3[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/3.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame4[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/4.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame5[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/5.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame6[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/6.4bpp"); - -const u16 gTilesetAnims_Pacifidlog1_Frame7[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/anim/1/7.4bpp"); - -const u16 *const gTilesetAnims_Pacifidlog1[] = { - gTilesetAnims_Pacifidlog1_Frame0, - gTilesetAnims_Pacifidlog1_Frame1, - gTilesetAnims_Pacifidlog1_Frame2, - gTilesetAnims_Pacifidlog1_Frame3, - gTilesetAnims_Pacifidlog1_Frame4, - gTilesetAnims_Pacifidlog1_Frame5, - gTilesetAnims_Pacifidlog1_Frame6, - gTilesetAnims_Pacifidlog1_Frame7 +const u16 *const gTilesetAnims_Pacifidlog_WaterCurrents[] = { + gTilesetAnims_Pacifidlog_WaterCurrents_Frame0, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame1, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame2, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame3, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame4, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame5, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame6, + gTilesetAnims_Pacifidlog_WaterCurrents_Frame7 }; -const u16 gTilesetAnims_Mauville0a_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/0.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/1.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/2.4bpp"); - -const u16 gTilesetAnims_Mauville0a_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/a/3.4bpp"); - -const u16 gTilesetAnims_Mauville1a_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/a/1.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/0.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/1.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/2.4bpp"); - -const u16 gTilesetAnims_Mauville0b_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/0/b/3.4bpp"); - -const u16 gTilesetAnims_Mauville1b_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/1/b/1.4bpp"); - +const u16 gTilesetAnims_Mauville_Flower1_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/0.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/1.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/2.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/3.4bpp"); +const u16 gTilesetAnims_Mauville_Flower1_Frame4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_1/4.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/0.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/1.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame2[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/2.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame3[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/3.4bpp"); +const u16 gTilesetAnims_Mauville_Flower2_Frame4[] = INCBIN_U16("data/tilesets/secondary/mauville/anim/flower_2/4.4bpp"); const u16 tileset_anims_space_1[16] = {}; -u16 *const gTilesetAnims_MauvilleVDests0[] = { +u16 *const gTilesetAnims_Mauville_Flower1_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 96)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 100)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 104)), @@ -233,7 +227,7 @@ u16 *const gTilesetAnims_MauvilleVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 124)) }; -u16 *const gTilesetAnims_MauvilleVDests1[] = { +u16 *const gTilesetAnims_Mauville_Flower2_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 128)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 132)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 136)), @@ -244,67 +238,60 @@ u16 *const gTilesetAnims_MauvilleVDests1[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 156)) }; -const u16 *const gTilesetAnims_Mauville0a[] = { - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame1, - gTilesetAnims_Mauville0a_Frame2, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame3, - gTilesetAnims_Mauville0a_Frame2, - gTilesetAnims_Mauville0a_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower1[] = { + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame1, + gTilesetAnims_Mauville_Flower1_Frame2, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame3, + gTilesetAnims_Mauville_Flower1_Frame2, + gTilesetAnims_Mauville_Flower1_Frame1 }; -const u16 *const gTilesetAnims_Mauville0b[] = { - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame1, - gTilesetAnims_Mauville0b_Frame2, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame3, - gTilesetAnims_Mauville0b_Frame2, - gTilesetAnims_Mauville0b_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower2[] = { + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame1, + gTilesetAnims_Mauville_Flower2_Frame2, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame3, + gTilesetAnims_Mauville_Flower2_Frame2, + gTilesetAnims_Mauville_Flower2_Frame1 }; -const u16 *const gTilesetAnims_Mauville1a[] = { - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville0a_Frame0, - gTilesetAnims_Mauville1a_Frame1, - gTilesetAnims_Mauville1a_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower1_B[] = { + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame0, + gTilesetAnims_Mauville_Flower1_Frame4, + gTilesetAnims_Mauville_Flower1_Frame4 }; -const u16 *const gTilesetAnims_Mauville1b[] = { - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville0b_Frame0, - gTilesetAnims_Mauville1b_Frame1, - gTilesetAnims_Mauville1b_Frame1 +const u16 *const gTilesetAnims_Mauville_Flower2_B[] = { + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame0, + gTilesetAnims_Mauville_Flower2_Frame4, + gTilesetAnims_Mauville_Flower2_Frame4 }; -const u16 gTilesetAnims_Rustboro0_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/0.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/0.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/1.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/2.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/3.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/4.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/5.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/6.4bpp"); +const u16 gTilesetAnims_Rustboro_WindyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/windy_water/7.4bpp"); -const u16 gTilesetAnims_Rustboro0_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/1.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame2[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/2.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame3[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/3.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame4[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/4.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame5[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/5.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame6[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/6.4bpp"); - -const u16 gTilesetAnims_Rustboro0_Frame7[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/0/7.4bpp"); - -u16 *const gTilesetAnims_RustboroVDests0[] = { +u16 *const gTilesetAnims_Rustboro_WindyWater_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 128)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 132)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 136)), @@ -315,72 +302,54 @@ u16 *const gTilesetAnims_RustboroVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 156)) }; -const u16 *const gTilesetAnims_Rustboro0[] = { - gTilesetAnims_Rustboro0_Frame0, - gTilesetAnims_Rustboro0_Frame1, - gTilesetAnims_Rustboro0_Frame2, - gTilesetAnims_Rustboro0_Frame3, - gTilesetAnims_Rustboro0_Frame4, - gTilesetAnims_Rustboro0_Frame5, - gTilesetAnims_Rustboro0_Frame6, - gTilesetAnims_Rustboro0_Frame7 +const u16 *const gTilesetAnims_Rustboro_WindyWater[] = { + gTilesetAnims_Rustboro_WindyWater_Frame0, + gTilesetAnims_Rustboro_WindyWater_Frame1, + gTilesetAnims_Rustboro_WindyWater_Frame2, + gTilesetAnims_Rustboro_WindyWater_Frame3, + gTilesetAnims_Rustboro_WindyWater_Frame4, + gTilesetAnims_Rustboro_WindyWater_Frame5, + gTilesetAnims_Rustboro_WindyWater_Frame6, + gTilesetAnims_Rustboro_WindyWater_Frame7 }; -const u16 gTilesetAnims_Rustboro1_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/0.4bpp"); - -const u16 gTilesetAnims_Rustboro1_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/1/1.4bpp"); - +const u16 gTilesetAnims_Rustboro_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/fountain/0.4bpp"); +const u16 gTilesetAnims_Rustboro_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/rustboro/anim/fountain/1.4bpp"); const u16 tileset_anims_space_2[16] = {}; -const u16 *const gTilesetAnims_Rustboro1[] = { - gTilesetAnims_Rustboro1_Frame0, - gTilesetAnims_Rustboro1_Frame1 +const u16 *const gTilesetAnims_Rustboro_Fountain[] = { + gTilesetAnims_Rustboro_Fountain_Frame0, + gTilesetAnims_Rustboro_Fountain_Frame1 }; -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/0.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_Cave0_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/3.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/0.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/1.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/2.4bpp"); - -const u16 gTilesetAnims_Lavaridge1_CaveUnused_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/unused/3.4bpp"); - +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame0[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/0.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame1[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/1.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame2[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/2.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame3[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/3.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame4[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/4.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame5[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/5.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame6[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/6.4bpp"); +const u16 gTilesetAnims_Lavaridge_Cave_Lava_Frame7[] = INCBIN_U16("data/tilesets/secondary/cave/anim/lava/7.4bpp"); const u16 tileset_anims_space_3[16] = {}; -const u16 *const gTilesetAnims_Lavaridge1_Cave0[] = { - gTilesetAnims_Lavaridge1_Cave0_Frame0, - gTilesetAnims_Lavaridge1_Cave0_Frame1, - gTilesetAnims_Lavaridge1_Cave0_Frame2, - gTilesetAnims_Lavaridge1_Cave0_Frame3 +const u16 *const gTilesetAnims_Lavaridge_Cave_Lava[] = { + gTilesetAnims_Lavaridge_Cave_Lava_Frame0, + gTilesetAnims_Lavaridge_Cave_Lava_Frame1, + gTilesetAnims_Lavaridge_Cave_Lava_Frame2, + gTilesetAnims_Lavaridge_Cave_Lava_Frame3 }; -const u16 gTilesetAnims_EverGrande0_Frame0[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/0.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame1[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/1.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame2[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/2.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame3[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/3.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame4[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/4.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame5[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/5.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame6[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/6.4bpp"); - -const u16 gTilesetAnims_EverGrande0_Frame7[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/7.4bpp"); - +const u16 gTilesetAnims_EverGrande_Flowers_Frame0[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/0.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame1[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/1.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame2[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/2.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame3[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/3.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame4[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/4.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame5[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/5.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame6[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/6.4bpp"); +const u16 gTilesetAnims_EverGrande_Flowers_Frame7[] = INCBIN_U16("data/tilesets/secondary/ever_grande/anim/flowers/7.4bpp"); const u16 tileset_anims_space_4[16] = {}; -u16 *const gTilesetAnims_EverGrandeVDests0[] = { +u16 *const gTilesetAnims_EverGrande_VDests[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 228)), (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 232)), @@ -391,243 +360,190 @@ u16 *const gTilesetAnims_EverGrandeVDests0[] = { (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 252)) }; -const u16 *const gTilesetAnims_EverGrande0[] = { - gTilesetAnims_EverGrande0_Frame0, - gTilesetAnims_EverGrande0_Frame1, - gTilesetAnims_EverGrande0_Frame2, - gTilesetAnims_EverGrande0_Frame3, - gTilesetAnims_EverGrande0_Frame4, - gTilesetAnims_EverGrande0_Frame5, - gTilesetAnims_EverGrande0_Frame6, - gTilesetAnims_EverGrande0_Frame7 +const u16 *const gTilesetAnims_EverGrande_Flowers[] = { + gTilesetAnims_EverGrande_Flowers_Frame0, + gTilesetAnims_EverGrande_Flowers_Frame1, + gTilesetAnims_EverGrande_Flowers_Frame2, + gTilesetAnims_EverGrande_Flowers_Frame3, + gTilesetAnims_EverGrande_Flowers_Frame4, + gTilesetAnims_EverGrande_Flowers_Frame5, + gTilesetAnims_EverGrande_Flowers_Frame6, + gTilesetAnims_EverGrande_Flowers_Frame7 }; -const u16 gTilesetAnims_Dewford0_Frame0[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/0.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/0.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/1.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/2.4bpp"); +const u16 gTilesetAnims_Dewford_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/flag/3.4bpp"); -const u16 gTilesetAnims_Dewford0_Frame1[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/1.4bpp"); - -const u16 gTilesetAnims_Dewford0_Frame2[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/2.4bpp"); - -const u16 gTilesetAnims_Dewford0_Frame3[] = INCBIN_U16("data/tilesets/secondary/dewford/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Dewford0[] = { - gTilesetAnims_Dewford0_Frame0, - gTilesetAnims_Dewford0_Frame1, - gTilesetAnims_Dewford0_Frame2, - gTilesetAnims_Dewford0_Frame3 +const u16 *const gTilesetAnims_Dewford_Flag[] = { + gTilesetAnims_Dewford_Flag_Frame0, + gTilesetAnims_Dewford_Flag_Frame1, + gTilesetAnims_Dewford_Flag_Frame2, + gTilesetAnims_Dewford_Flag_Frame3 }; -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/flag/3.4bpp"); -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/1.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/2.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideWest0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/anim/3.4bpp"); - -const u16 *const gTilesetAnims_BattleFrontierOutsideWest0[] = { - gTilesetAnims_BattleFrontierOutsideWest0_Frame0, - gTilesetAnims_BattleFrontierOutsideWest0_Frame1, - gTilesetAnims_BattleFrontierOutsideWest0_Frame2, - gTilesetAnims_BattleFrontierOutsideWest0_Frame3 +const u16 *const gTilesetAnims_BattleFrontierOutsideWest_Flag[] = { + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame0, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame1, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame2, + gTilesetAnims_BattleFrontierOutsideWest_Flag_Frame3 }; -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/0.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/1.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/2.4bpp"); +const u16 gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/flag/3.4bpp"); -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/1.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/2.4bpp"); - -const u16 gTilesetAnims_BattleFrontierOutsideEast0_Frame3[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/anim/3.4bpp"); - -const u16 *const gTilesetAnims_BattleFrontierOutsideEast0[] = { - gTilesetAnims_BattleFrontierOutsideEast0_Frame0, - gTilesetAnims_BattleFrontierOutsideEast0_Frame1, - gTilesetAnims_BattleFrontierOutsideEast0_Frame2, - gTilesetAnims_BattleFrontierOutsideEast0_Frame3 +const u16 *const gTilesetAnims_BattleFrontierOutsideEast_Flag[] = { + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame0, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame1, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame2, + gTilesetAnims_BattleFrontierOutsideEast_Flag_Frame3 }; -const u16 gTilesetAnims_Slateport0_Frame0[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/0.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame0[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/0.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame1[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/1.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame2[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/2.4bpp"); +const u16 gTilesetAnims_Slateport_Balloons_Frame3[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/balloons/3.4bpp"); -const u16 gTilesetAnims_Slateport0_Frame1[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/1.4bpp"); - -const u16 gTilesetAnims_Slateport0_Frame2[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/2.4bpp"); - -const u16 gTilesetAnims_Slateport0_Frame3[] = INCBIN_U16("data/tilesets/secondary/slateport/anim/3.4bpp"); - -const u16 *const gTilesetAnims_Slateport0[] = { - gTilesetAnims_Slateport0_Frame0, - gTilesetAnims_Slateport0_Frame1, - gTilesetAnims_Slateport0_Frame2, - gTilesetAnims_Slateport0_Frame3 +const u16 *const gTilesetAnims_Slateport_Balloons[] = { + gTilesetAnims_Slateport_Balloons_Frame0, + gTilesetAnims_Slateport_Balloons_Frame1, + gTilesetAnims_Slateport_Balloons_Frame2, + gTilesetAnims_Slateport_Balloons_Frame3 }; -const u16 gTilesetAnims_InsideBuilding0_Frame0[] = INCBIN_U16("data/tilesets/primary/building/anim/0.4bpp"); +const u16 gTilesetAnims_Building_TvTurnedOn_Frame0[] = INCBIN_U16("data/tilesets/primary/building/anim/tv_turned_on/0.4bpp"); +const u16 gTilesetAnims_Building_TvTurnedOn_Frame1[] = INCBIN_U16("data/tilesets/primary/building/anim/tv_turned_on/1.4bpp"); -const u16 gTilesetAnims_InsideBuilding0_Frame1[] = INCBIN_U16("data/tilesets/primary/building/anim/1.4bpp"); - -const u16 *const gTilesetAnims_InsideBuilding0[] = { - gTilesetAnims_InsideBuilding0_Frame0, - gTilesetAnims_InsideBuilding0_Frame1 +const u16 *const gTilesetAnims_Building_TvTurnedOn[] = { + gTilesetAnims_Building_TvTurnedOn_Frame0, + gTilesetAnims_Building_TvTurnedOn_Frame1 }; -const u16 gTilesetAnims_SootopolisGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym_SideWaterfall_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/side_waterfall/2.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/0.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/1.4bpp"); +const u16 gTilesetAnims_SootopolisGym_FrontWaterfall_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/front_waterfall/2.4bpp"); -const u16 gTilesetAnims_SootopolisGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/1.4bpp"); - -const u16 gTilesetAnims_SootopolisGym0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/0/2.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/0.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/1.4bpp"); - -const u16 gTilesetAnims_SootopolisGym1_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/anim/1/2.4bpp"); - -const u16 *const gTilesetAnims_SootopolisGym0[] = { - gTilesetAnims_SootopolisGym0_Frame0, - gTilesetAnims_SootopolisGym0_Frame1, - gTilesetAnims_SootopolisGym0_Frame2 +const u16 *const gTilesetAnims_SootopolisGym_SideWaterfall[] = { + gTilesetAnims_SootopolisGym_SideWaterfall_Frame0, + gTilesetAnims_SootopolisGym_SideWaterfall_Frame1, + gTilesetAnims_SootopolisGym_SideWaterfall_Frame2 }; -const u16 *const gTilesetAnims_SootopolisGym1[] = { - gTilesetAnims_SootopolisGym1_Frame0, - gTilesetAnims_SootopolisGym1_Frame1, - gTilesetAnims_SootopolisGym1_Frame2 +const u16 *const gTilesetAnims_SootopolisGym_FrontWaterfall[] = { + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame0, + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame1, + gTilesetAnims_SootopolisGym_FrontWaterfall_Frame2 }; -const u16 gTilesetAnims_EliteFour0_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/0.4bpp"); - -const u16 gTilesetAnims_EliteFour0_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/1/1.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/0.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/1.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame2[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/2.4bpp"); - -const u16 gTilesetAnims_EliteFour1_Frame3[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/0/3.4bpp"); - +const u16 gTilesetAnims_EliteFour_FloorLight_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/floor_light/0.4bpp"); +const u16 gTilesetAnims_EliteFour_FloorLight_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/floor_light/1.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame0[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/0.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame1[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/1.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame2[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/2.4bpp"); +const u16 gTilesetAnims_EliteFour_WallLights_Frame3[] = INCBIN_U16("data/tilesets/secondary/elite_four/anim/wall_lights/3.4bpp"); const u16 tileset_anims_space_5[16] = {}; -const u16 *const gTilesetAnims_EliteFour1[] = { - gTilesetAnims_EliteFour1_Frame0, - gTilesetAnims_EliteFour1_Frame1, - gTilesetAnims_EliteFour1_Frame2, - gTilesetAnims_EliteFour1_Frame3 +const u16 *const gTilesetAnims_EliteFour_WallLights[] = { + gTilesetAnims_EliteFour_WallLights_Frame0, + gTilesetAnims_EliteFour_WallLights_Frame1, + gTilesetAnims_EliteFour_WallLights_Frame2, + gTilesetAnims_EliteFour_WallLights_Frame3 }; -const u16 *const gTilesetAnims_EliteFour0[] = { - gTilesetAnims_EliteFour0_Frame0, - gTilesetAnims_EliteFour0_Frame1 +const u16 *const gTilesetAnims_EliteFour_FloorLight[] = { + gTilesetAnims_EliteFour_FloorLight_Frame0, + gTilesetAnims_EliteFour_FloorLight_Frame1 }; -const u16 gTilesetAnims_MauvilleGym0_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/0.4bpp"); - -const u16 gTilesetAnims_MauvilleGym0_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/1.4bpp"); - +const u16 gTilesetAnims_MauvilleGym_ElectricGates_Frame0[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/electric_gates/0.4bpp"); +const u16 gTilesetAnims_MauvilleGym_ElectricGates_Frame1[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/anim/electric_gates/1.4bpp"); const u16 tileset_anims_space_6[16] = {}; -const u16 *const gTilesetAnims_MauvilleGym0[] = { - gTilesetAnims_MauvilleGym0_Frame0, - gTilesetAnims_MauvilleGym0_Frame1 +const u16 *const gTilesetAnims_MauvilleGym_ElectricGates[] = { + gTilesetAnims_MauvilleGym_ElectricGates_Frame0, + gTilesetAnims_MauvilleGym_ElectricGates_Frame1 }; -const u16 gTilesetAnims_BikeShop0_Frame0[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/0.4bpp"); - -const u16 gTilesetAnims_BikeShop0_Frame1[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/1.4bpp"); - +const u16 gTilesetAnims_BikeShop_BlinkingLights_Frame0[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/blinking_lights/0.4bpp"); +const u16 gTilesetAnims_BikeShop_BlinkingLights_Frame1[] = INCBIN_U16("data/tilesets/secondary/bike_shop/anim/blinking_lights/1.4bpp"); const u16 tileset_anims_space_7[16] = {}; -const u16 *const gTilesetAnims_BikeShop0[] = { - gTilesetAnims_BikeShop0_Frame0, - gTilesetAnims_BikeShop0_Frame1 +const u16 *const gTilesetAnims_BikeShop_BlinkingLights[] = { + gTilesetAnims_BikeShop_BlinkingLights_Frame0, + gTilesetAnims_BikeShop_BlinkingLights_Frame1 }; -const u16 gTilesetAnims_Sootopolis0_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/0.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/1.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/2.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/3.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/4.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/5.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/6.4bpp"); - -const u16 gTilesetAnims_Sootopolis0_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/7.4bpp"); - +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame0[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/0.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame1[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/1.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame2[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/2.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame3[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/3.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame4[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/4.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame5[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/5.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame6[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/6.4bpp"); +const u16 gTilesetAnims_Sootopolis_StormyWater_Frame7[] = INCBIN_U16("data/tilesets/secondary/sootopolis/anim/stormy_water/7.4bpp"); const u16 tileset_anims_space_8[16] = {}; const u16 gTilesetAnims_Unused1_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_1/0.4bpp"); - const u16 gTilesetAnims_Unused1_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_1/1.4bpp"); - const u16 gTilesetAnims_Unused1_Frame2[] = INCBIN_U16("data/tilesets/secondary/unused_1/2.4bpp"); - const u16 gTilesetAnims_Unused1_Frame3[] = INCBIN_U16("data/tilesets/secondary/unused_1/3.4bpp"); -const u16 *const gTilesetAnims_Sootopolis0[] = { - gTilesetAnims_Sootopolis0_Frame0, - gTilesetAnims_Sootopolis0_Frame1, - gTilesetAnims_Sootopolis0_Frame2, - gTilesetAnims_Sootopolis0_Frame3, - gTilesetAnims_Sootopolis0_Frame4, - gTilesetAnims_Sootopolis0_Frame5, - gTilesetAnims_Sootopolis0_Frame6, - gTilesetAnims_Sootopolis0_Frame7 +const u16 *const gTilesetAnims_Sootopolis_StormyWater[] = { + gTilesetAnims_Sootopolis_StormyWater_Frame0, + gTilesetAnims_Sootopolis_StormyWater_Frame1, + gTilesetAnims_Sootopolis_StormyWater_Frame2, + gTilesetAnims_Sootopolis_StormyWater_Frame3, + gTilesetAnims_Sootopolis_StormyWater_Frame4, + gTilesetAnims_Sootopolis_StormyWater_Frame5, + gTilesetAnims_Sootopolis_StormyWater_Frame6, + gTilesetAnims_Sootopolis_StormyWater_Frame7 }; -const u16 gTilesetAnims_BattlePyramid0_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/0.4bpp"); - -const u16 gTilesetAnims_BattlePyramid0_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/1.4bpp"); - -const u16 gTilesetAnims_BattlePyramid0_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/0/2.4bpp"); - +const u16 gTilesetAnims_BattlePyramid_Torch_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid_Torch_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid_Torch_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/torch/2.4bpp"); const u16 tileset_anims_space_9[16] = {}; -const u16 gTilesetAnims_BattlePyramid1_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/0.4bpp"); - -const u16 gTilesetAnims_BattlePyramid1_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/1.4bpp"); - -const u16 gTilesetAnims_BattlePyramid1_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/1/2.4bpp"); - +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame0[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/0.4bpp"); +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame1[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/1.4bpp"); +const u16 gTilesetAnims_BattlePyramid_StatueShadow_Frame2[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/anim/statue_shadow/2.4bpp"); const u16 tileset_anims_space_10[7808] = {}; const u16 gTilesetAnims_Unused2_Frame0[] = INCBIN_U16("data/tilesets/secondary/unused_2/0.4bpp"); - const u16 tileset_anims_space_11[224] = {}; const u16 gTilesetAnims_Unused2_Frame1[] = INCBIN_U16("data/tilesets/secondary/unused_2/1.4bpp"); -const u16 *const gTilesetAnims_BattlePyramid0[] = { - gTilesetAnims_BattlePyramid0_Frame0, - gTilesetAnims_BattlePyramid0_Frame1, - gTilesetAnims_BattlePyramid0_Frame2 +const u16 *const gTilesetAnims_BattlePyramid_Torch[] = { + gTilesetAnims_BattlePyramid_Torch_Frame0, + gTilesetAnims_BattlePyramid_Torch_Frame1, + gTilesetAnims_BattlePyramid_Torch_Frame2 }; -const u16 *const gTilesetAnims_BattlePyramid1[] = { - gTilesetAnims_BattlePyramid1_Frame0, - gTilesetAnims_BattlePyramid1_Frame1, - gTilesetAnims_BattlePyramid1_Frame2 +const u16 *const gTilesetAnims_BattlePyramid_StatueShadow[] = { + gTilesetAnims_BattlePyramid_StatueShadow_Frame0, + gTilesetAnims_BattlePyramid_StatueShadow_Frame1, + gTilesetAnims_BattlePyramid_StatueShadow_Frame2 }; -extern const u16 gTilesetAnims_BattleDomePals0_0[]; -extern const u16 gTilesetAnims_BattleDomePals0_1[]; -extern const u16 gTilesetAnims_BattleDomePals0_2[]; -extern const u16 gTilesetAnims_BattleDomePals0_3[]; - -static const u16 *const gTilesetAnims_BattleDomePals0[] = { +static const u16 *const gTilesetAnims_BattleDomeFloorLightPals[] = { gTilesetAnims_BattleDomePals0_0, gTilesetAnims_BattleDomePals0_1, gTilesetAnims_BattleDomePals0_2, gTilesetAnims_BattleDomePals0_3, }; -// .text - static void ResetTilesetAnimBuffer(void) { sTilesetDMA3TransferBufferSize = 0; @@ -650,763 +566,623 @@ void TransferTilesetAnimsBuffer(void) int i; for (i = 0; i < sTilesetDMA3TransferBufferSize; i ++) - { DmaCopy16(3, sTilesetDMA3TransferBuffer[i].src, sTilesetDMA3TransferBuffer[i].dest, sTilesetDMA3TransferBuffer[i].size); - } + sTilesetDMA3TransferBufferSize = 0; } -void cur_mapheader_run_tileset_funcs_after_some_cpuset(void) +void InitTilesetAnimations(void) { ResetTilesetAnimBuffer(); - cur_mapheader_run_tileset1_func(); - cur_mapheader_run_tileset2_func(); + _InitPrimaryTilesetAnimation(); + _InitSecondaryTilesetAnimation(); } -void sub_80A0A2C(void) +void InitSecondaryTilesetAnimation(void) { - cur_mapheader_run_tileset2_func(); + _InitSecondaryTilesetAnimation(); } -void sub_80A0A38(void) +void UpdateTilesetAnimations(void) { ResetTilesetAnimBuffer(); - if (++sPrimaryTilesetCBCounter >= sPrimaryTilesetCBBufferSize) - sPrimaryTilesetCBCounter = 0; - if (++sSecondaryTilesetCBCounter >= sSecondaryTilesetCBBufferSize) - sSecondaryTilesetCBCounter = 0; - if (sPrimaryTilesetCB) - sPrimaryTilesetCB(sPrimaryTilesetCBCounter); - if (sSecondaryTilesetCB) - sSecondaryTilesetCB(sSecondaryTilesetCBCounter); + if (++sPrimaryTilesetAnimCounter >= sPrimaryTilesetAnimCounterMax) + sPrimaryTilesetAnimCounter = 0; + if (++sSecondaryTilesetAnimCounter >= sSecondaryTilesetAnimCounterMax) + sSecondaryTilesetAnimCounter = 0; + + if (sPrimaryTilesetAnimCallback) + sPrimaryTilesetAnimCallback(sPrimaryTilesetAnimCounter); + if (sSecondaryTilesetAnimCallback) + sSecondaryTilesetAnimCallback(sSecondaryTilesetAnimCounter); } -static void cur_mapheader_run_tileset1_func(void) +static void _InitPrimaryTilesetAnimation(void) { - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0; - sPrimaryTilesetCB = NULL; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 0; + sPrimaryTilesetAnimCallback = NULL; if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback) gMapHeader.mapLayout->primaryTileset->callback(); } -static void cur_mapheader_run_tileset2_func(void) +static void _InitSecondaryTilesetAnimation(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 0; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 0; + sSecondaryTilesetAnimCallback = NULL; if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback) gMapHeader.mapLayout->secondaryTileset->callback(); } -void TilesetCb_General(void) +void InitTilesetAnim_General(void) { - static void sub_80A0B70(u16); - - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0x100; - sPrimaryTilesetCB = sub_80A0B70; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 256; + sPrimaryTilesetAnimCallback = TilesetAnim_General; } -void TilesetCb_InsideBuilding(void) +void InitTilesetAnim_Building(void) { - static void sub_80A0BB4(u16); - - sPrimaryTilesetCBCounter = 0; - sPrimaryTilesetCBBufferSize = 0x100; - sPrimaryTilesetCB = sub_80A0BB4; + sPrimaryTilesetAnimCounter = 0; + sPrimaryTilesetAnimCounterMax = 256; + sPrimaryTilesetAnimCallback = TilesetAnim_Building; } -static void sub_80A0B70(u16 timer) +static void TilesetAnim_General(u16 timer) { - static void gTilesetAnims_Flower(u16); - static void gTilesetAnims_Water(u16); - static void gTilesetAnims_SandWaterEdge(u16); - static void gTilesetAnims_Waterfall(u16); - static void gTilesetAnims_LandWaterEdge (u16); - - if ((timer & 0x0F) == 0) - gTilesetAnims_Flower(timer >> 4); - if ((timer & 0x0F) == 1) - gTilesetAnims_Water(timer >> 4); - if ((timer & 0x0F) == 2) - gTilesetAnims_SandWaterEdge(timer >> 4); - if ((timer & 0x0F) == 3) - gTilesetAnims_Waterfall(timer >> 4); - if ((timer & 0x0F) == 4) - gTilesetAnims_LandWaterEdge (timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_General_Flower(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_General_Water(timer >> 4); + if (timer % 16 == 2) + QueueAnimTiles_General_SandWaterEdge(timer >> 4); + if (timer % 16 == 3) + QueueAnimTiles_General_Waterfall(timer >> 4); + if (timer % 16 == 4) + QueueAnimTiles_General_LandWaterEdge(timer >> 4); } -static void sub_80A0BB4(u16 timer) +static void TilesetAnim_Building(u16 timer) { - static void sub_80A1688(u16); - - if ((timer & 0x7) == 0) - sub_80A1688(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_Building_TVTurnedOn(timer >> 3); } -static void gTilesetAnims_Flower(u16 timer) +static void QueueAnimTiles_General_Flower(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Flower[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); } -static void gTilesetAnims_Water(u16 timer) +static void QueueAnimTiles_General_Water(u16 timer) { - u8 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_General1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0); + u8 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Water[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(432)), 0x3C0); } -static void gTilesetAnims_SandWaterEdge(u16 timer) +static void QueueAnimTiles_General_SandWaterEdge(u16 timer) { - u16 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_General2[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140); + u16 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_General_SandWaterEdge[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x140); } -static void gTilesetAnims_Waterfall(u16 timer) +static void QueueAnimTiles_General_Waterfall(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General3[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_Waterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0xc0); } -void TilesetCb_Petalburg(void) +void InitTilesetAnim_Petalburg(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Rustboro(void) +void InitTilesetAnim_Rustboro(void) { - static void sub_80A103C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A103C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Rustboro; } -void TilesetCb_Dewford(void) +void InitTilesetAnim_Dewford(void) { - static void sub_80A10B8(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10B8; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Dewford; } -void TilesetCb_Slateport(void) +void InitTilesetAnim_Slateport(void) { - static void sub_80A10D0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10D0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Slateport; } -void TilesetCb_Mauville(void) +void InitTilesetAnim_Mauville(void) { - static void sub_80A10E8(u16); - - sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A10E8; + sSecondaryTilesetAnimCounter = sPrimaryTilesetAnimCounter; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Mauville; } -void TilesetCb_Lavaridge(void) +void InitTilesetAnim_Lavaridge(void) { - static void sub_80A115C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A115C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Lavaridge; } -void TilesetCb_Fallarbor(void) +void InitTilesetAnim_Fallarbor(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Fortree(void) +void InitTilesetAnim_Fortree(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Lilycove(void) +void InitTilesetAnim_Lilycove(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_Mossdeep(void) +void InitTilesetAnim_Mossdeep(void) { - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = NULL; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = NULL; } -void TilesetCb_EverGrande(void) +void InitTilesetAnim_EverGrande(void) { - static void sub_80A1188(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1188; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_EverGrande; } -void TilesetCb_Pacifidlog(void) +void InitTilesetAnim_Pacifidlog(void) { - static void sub_80A11FC(u16); - - sSecondaryTilesetCBCounter = sPrimaryTilesetCBCounter; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A11FC; + sSecondaryTilesetAnimCounter = sPrimaryTilesetAnimCounter; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Pacifidlog; } -void TilesetCb_Sootopolis(void) +void InitTilesetAnim_Sootopolis(void) { - static void sub_80A122C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A122C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Sootopolis; } -void TilesetCb_BattleFrontierOutsideWest(void) +void InitTilesetAnim_BattleFrontierOutsideWest(void) { - static void sub_80A127C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A127C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleFrontierOutsideWest; } -void TilesetCb_BattleFrontierOutsideEast(void) +void InitTilesetAnim_BattleFrontierOutsideEast(void) { - static void sub_80A1294(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1294; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleFrontierOutsideEast; } -void TilesetCb_Underwater(void) +void InitTilesetAnim_Underwater(void) { - static void sub_80A1244(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 128; - sSecondaryTilesetCB = sub_80A1244; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 128; + sSecondaryTilesetAnimCallback = TilesetAnim_Underwater; } -void TilesetCb_SootopolisGym(void) +void InitTilesetAnim_SootopolisGym(void) { - static void sub_80A15D8(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 240; - sSecondaryTilesetCB = sub_80A15D8; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 240; + sSecondaryTilesetAnimCallback = TilesetAnim_SootopolisGym; } -void TilesetCb_Cave(void) +void InitTilesetAnim_Cave(void) { - static void sub_80A1260(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1260; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_Cave; } -void TilesetCb_EliteFour(void) +void InitTilesetAnim_EliteFour(void) { - static void sub_80A15F0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = 128; - sSecondaryTilesetCB = sub_80A15F0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = 128; + sSecondaryTilesetAnimCallback = TilesetAnim_EliteFour; } -void TilesetCb_MauvilleGym(void) +void InitTilesetAnim_MauvilleGym(void) { - static void sub_80A15C0(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A15C0; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_MauvilleGym; } -void TilesetCb_BikeShop(void) +void InitTilesetAnim_BikeShop(void) { - static void sub_80A161C(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A161C; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BikeShop; } -void TilesetCb_BattlePyramid(void) +void InitTilesetAnim_BattlePyramid(void) { - static void sub_80A1634(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1634; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattlePyramid; } -void TilesetCb_BattleDome(void) +void InitTilesetAnim_BattleDome(void) { - static void sub_80A1658(u16); - - sSecondaryTilesetCBCounter = 0; - sSecondaryTilesetCBBufferSize = sPrimaryTilesetCBBufferSize; - sSecondaryTilesetCB = sub_80A1658; + sSecondaryTilesetAnimCounter = 0; + sSecondaryTilesetAnimCounterMax = sPrimaryTilesetAnimCounterMax; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome; } -static void sub_80A103C(u16 timer) +static void TilesetAnim_Rustboro(u16 timer) { - static void sub_80A1434(u16, u8); - static void sub_80A1470(u16); - - if ((timer & 0x07) == 0) + if (timer % 8 == 0) { - sub_80A1434(timer >> 3, 0); - sub_80A1470(timer >> 3); + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 0); + QueueAnimTiles_Rustboro_Fountain(timer >> 3); } - if ((timer & 0x07) == 1) - sub_80A1434(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A1434(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A1434(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A1434(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A1434(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A1434(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A1434(timer >> 3, 7); + if (timer % 8 == 1) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_Rustboro_WindyWater(timer >> 3, 7); } -static void sub_80A10B8(u16 timer) +static void TilesetAnim_Dewford(u16 timer) { - static void sub_80A1520(u16); - - if ((timer & 7) == 0) - sub_80A1520(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_Dewford_Flag(timer >> 3); } -static void sub_80A10D0(u16 timer) +static void TilesetAnim_Slateport(u16 timer) { - static void sub_80A1598(u16); - - if ((timer & 15) == 0) - sub_80A1598(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Slateport_Balloons(timer >> 4); } -static void sub_80A10E8(u16 timer) +static void TilesetAnim_Mauville(u16 timer) { - static void sub_80A1394(u16, u8); - - if ((timer & 0x07) == 0) - sub_80A1394(timer >> 3, 0); - if ((timer & 0x07) == 1) - sub_80A1394(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A1394(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A1394(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A1394(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A1394(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A1394(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A1394(timer >> 3, 7); + if (timer % 8 == 0) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 0); + if (timer % 8 == 1) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_Mauville_Flowers(timer >> 3, 7); } -static void sub_80A115C(u16 timer) +static void TilesetAnim_Lavaridge(u16 timer) { - static void sub_80A12D4(u8); - static void sub_80A1498(u16); - - if ((timer & 0x0F) == 0) - sub_80A12D4(timer >> 4); - if ((timer & 0x0F) == 1) - sub_80A1498(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Lavaridge_Steam(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Lavaridge_Lava(timer >> 4); } -static void sub_80A1188(u16 timer) +static void TilesetAnim_EverGrande(u16 timer) { - static void sub_80A14C0(u16, u8); - - if ((timer & 0x07) == 0) - sub_80A14C0(timer >> 3, 0); - if ((timer & 0x07) == 1) - sub_80A14C0(timer >> 3, 1); - if ((timer & 0x07) == 2) - sub_80A14C0(timer >> 3, 2); - if ((timer & 0x07) == 3) - sub_80A14C0(timer >> 3, 3); - if ((timer & 0x07) == 4) - sub_80A14C0(timer >> 3, 4); - if ((timer & 0x07) == 5) - sub_80A14C0(timer >> 3, 5); - if ((timer & 0x07) == 6) - sub_80A14C0(timer >> 3, 6); - if ((timer & 0x07) == 7) - sub_80A14C0(timer >> 3, 7); + if (timer % 8 == 0) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 0); + if (timer % 8 == 1) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 1); + if (timer % 8 == 2) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 2); + if (timer % 8 == 3) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 3); + if (timer % 8 == 4) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 4); + if (timer % 8 == 5) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 5); + if (timer % 8 == 6) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 6); + if (timer % 8 == 7) + QueueAnimTiles_EverGrande_Flowers(timer >> 3, 7); } -static void sub_80A11FC(u16 timer) +static void TilesetAnim_Pacifidlog(u16 timer) { - static void sub_80A131C(u8); - static void sub_80A136C(u8); - - if ((timer & 0x0F) == 0) - sub_80A131C(timer >> 4); - if ((timer & 0x0F) == 1) - sub_80A136C(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Pacifidlog_LogBridges(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Pacifidlog_WaterCurrents(timer >> 4); } -static void sub_80A122C(u16 timer) +static void TilesetAnim_Sootopolis(u16 timer) { - static void sub_80A1798(u16); - - if ((timer & 0x0F) == 0) - sub_80A1798(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Sootopolis_StormyWater(timer >> 4); } -static void sub_80A1244(u16 timer) +static void TilesetAnim_Underwater(u16 timer) { - static void sub_80A1344(u8); - - if ((timer & 0x0F) == 0) - sub_80A1344(timer >> 4); + if (timer % 16 == 0) + QueueAnimTiles_Underwater_Seaweed(timer >> 4); } -static void sub_80A1260(u16 timer) +static void TilesetAnim_Cave(u16 timer) { - static void sub_80A14F8(u16); - - if ((timer & 0x0F) == 1) - sub_80A14F8(timer >> 4); + if (timer % 16 == 1) + QueueAnimTiles_Cave_Lava(timer >> 4); } -static void sub_80A127C(u16 timer) +static void TilesetAnim_BattleFrontierOutsideWest(u16 timer) { - static void sub_80A1548(u16); - - if ((timer & 0x07) == 0) - sub_80A1548(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_BattleFrontierOutsideWest_Flag(timer >> 3); } -static void sub_80A1294(u16 timer) +static void TilesetAnim_BattleFrontierOutsideEast(u16 timer) { - static void sub_80A1570(u16); - - if ((timer & 0x07) == 0) - sub_80A1570(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_BattleFrontierOutsideEast_Flag(timer >> 3); } -static void gTilesetAnims_LandWaterEdge (u16 timer) +static void QueueAnimTiles_General_LandWaterEdge(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_General4[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_General_LandWaterEdge[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(480)), 0x140); } -static void sub_80A12D4(u8 timer) +static void QueueAnimTiles_Lavaridge_Steam(u8 timer) { - u8 idx; + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Steam[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80); - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 288)), 0x80); - - idx = (timer + 2) % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80); + i = (timer + 2) % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Steam[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 292)), 0x80); } -static void sub_80A131C(u8 timer) +static void QueueAnimTiles_Pacifidlog_LogBridges(u8 timer) { - u8 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0); + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog_LogBridges[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x3C0); } -static void sub_80A1344(u8 timer) +static void QueueAnimTiles_Underwater_Seaweed(u8 timer) { - u8 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Underwater0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80); + u8 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Underwater_Seaweed[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x80); } -static void sub_80A136C(u8 timer) +static void QueueAnimTiles_Pacifidlog_WaterCurrents(u8 timer) { - u8 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x100); + u8 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_Pacifidlog_WaterCurrents[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x100); } -static void sub_80A1394(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_Mauville_Flowers(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; if (timer_div < 12) // almost certainly a typo { timer_div %= 12; - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80); - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville0b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower1[timer_div], gTilesetAnims_Mauville_Flower1_VDests[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower2[timer_div], gTilesetAnims_Mauville_Flower2_VDests[timer_mod], 0x80); } else { timer_div %= 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1a[timer_div], gTilesetAnims_MauvilleVDests0[timer_mod], 0x80); - AppendTilesetAnimToBuffer(gTilesetAnims_Mauville1b[timer_div], gTilesetAnims_MauvilleVDests1[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower1_B[timer_div], gTilesetAnims_Mauville_Flower1_VDests[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_Mauville_Flower2_B[timer_div], gTilesetAnims_Mauville_Flower2_VDests[timer_mod], 0x80); } } -static void sub_80A1434(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_Rustboro_WindyWater(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; timer_div %= 8; - if (gTilesetAnims_Rustboro0[timer_div]) - AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro0[timer_div], gTilesetAnims_RustboroVDests0[timer_mod], 0x80); + if (gTilesetAnims_Rustboro_WindyWater[timer_div]) + AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro_WindyWater[timer_div], gTilesetAnims_Rustboro_WindyWater_VDests[timer_mod], 0x80); } -static void sub_80A1470(u16 timer) +static void QueueAnimTiles_Rustboro_Fountain(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_Rustboro_Fountain[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 448)), 0x80); } -static void sub_80A1498(u16 timer) +static void QueueAnimTiles_Lavaridge_Lava(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 160)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Cave_Lava[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 160)), 0x80); } -static void sub_80A14C0(u16 timer_div, u8 timer_mod) +static void QueueAnimTiles_EverGrande_Flowers(u16 timer_div, u8 timer_mod) { timer_div -= timer_mod; timer_div %= 8; - AppendTilesetAnimToBuffer(gTilesetAnims_EverGrande0[timer_div], gTilesetAnims_EverGrandeVDests0[timer_mod], 0x80); + AppendTilesetAnimToBuffer(gTilesetAnims_EverGrande_Flowers[timer_div], gTilesetAnims_EverGrande_VDests[timer_mod], 0x80); } -static void sub_80A14F8(u16 timer) +static void QueueAnimTiles_Cave_Lava(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge1_Cave0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Lavaridge_Cave_Lava[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 416)), 0x80); } -static void sub_80A1520(u16 timer) +static void QueueAnimTiles_Dewford_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Dewford0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0); + u16 id = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Dewford_Flag[id], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 170)), 0xC0); } -static void sub_80A1548(u16 timer) +static void QueueAnimTiles_BattleFrontierOutsideWest_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideWest_Flag[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); } -static void sub_80A1570(u16 timer) +static void QueueAnimTiles_BattleFrontierOutsideEast_Flag(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_BattleFrontierOutsideEast_Flag[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 218)), 0xC0); } -static void sub_80A1598(u16 timer) +static void QueueAnimTiles_Slateport_Balloons(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_Slateport0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_Slateport_Balloons[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 224)), 0x80); } -static void sub_80A15C0(u16 timer) +static void TilesetAnim_MauvilleGym(u16 timer) { - static void sub_80A1748(u16); - - if ((timer & 1) == 0) - sub_80A1748(timer >> 1); + if (timer % 2 == 0) + QueueAnimTiles_MauvilleGym_ElectricGates(timer >> 1); } -static void sub_80A15D8(u16 timer) +static void TilesetAnim_SootopolisGym(u16 timer) { - static void sub_80A16B0(u16); - - if ((timer & 7) == 0) - sub_80A16B0(timer >> 3); + if (timer % 8 == 0) + QueueAnimTiles_SootopolisGym_Waterfalls(timer >> 3); } -static void sub_80A15F0(u16 timer) +static void TilesetAnim_EliteFour(u16 timer) { - static void sub_80A1720(u16); - static void sub_80A16F8(u16); - - if ((timer & 0x3f) == 1) - sub_80A1720(timer >> 6); - if ((timer & 0x07) == 1) - sub_80A16F8(timer >> 3); -} -static void sub_80A161C(u16 timer) -{ - static void sub_80A1770(u16); - - if ((timer & 3) == 0) - sub_80A1770(timer >> 2); + if (timer % 64 == 1) + QueueAnimTiles_EliteFour_GroundLights(timer >> 6); + if (timer % 8 == 1) + QueueAnimTiles_EliteFour_WallLights(timer >> 3); } -static void sub_80A1634(u16 timer) +static void TilesetAnim_BikeShop(u16 timer) { - static void sub_80A17C0(u16); - static void sub_80A17EC(u16); + if (timer % 4 == 0) + QueueAnimTiles_BikeShop_BlinkingLights(timer >> 2); +} - if ((timer & 7) == 0) +static void TilesetAnim_BattlePyramid(u16 timer) +{ + if (timer % 8 == 0) { - sub_80A17C0(timer >> 3); - sub_80A17EC(timer >> 3); + QueueAnimTiles_BattlePyramid_Torch(timer >> 3); + QueueAnimTiles_BattlePyramid_StatueShadow(timer >> 3); } } -static void sub_80A1658(u16 timer) +static void TilesetAnim_BattleDome(u16 timer) { - static void sub_80A1818(u16); - - if ((timer & 3) == 0) - sub_80A1818(timer >> 2); + if (timer % 4 == 0) + BlendAnimPalette_BattleDome_FloorLights(timer >> 2); } -static void sub_80A1670(u16 timer) +static void TilesetAnim_BattleDome2(u16 timer) { - static void sub_80A1884(u16); - - if ((timer & 3) == 0) - sub_80A1884(timer >> 2); + if (timer % 4 == 0) + BlendAnimPalette_BattleDome_FloorLightsNoBlend(timer >> 2); } -static void sub_80A1688(u16 timer) +static void QueueAnimTiles_Building_TVTurnedOn(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_InsideBuilding0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_Building_TvTurnedOn[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(496)), 0x80); } -static void sub_80A16B0(u16 timer) +static void QueueAnimTiles_SootopolisGym_Waterfalls(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180); - AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym_SideWaterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x180); + AppendTilesetAnimToBuffer(gTilesetAnims_SootopolisGym_FrontWaterfall[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 464)), 0x280); } -static void sub_80A16F8(u16 timer) +static void QueueAnimTiles_EliteFour_WallLights(u16 timer) { - u16 idx; - - idx = timer % 4; - AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20); + u16 i = timer % 4; + AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour_WallLights[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 504)), 0x20); } -static void sub_80A1720(u16 timer) +static void QueueAnimTiles_EliteFour_GroundLights(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_EliteFour_FloorLight[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 480)), 0x80); } -static void sub_80A1748(u16 timer) +static void QueueAnimTiles_MauvilleGym_ElectricGates(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_MauvilleGym_ElectricGates[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 144)), 0x200); } -static void sub_80A1770(u16 timer) +static void QueueAnimTiles_BikeShop_BlinkingLights(u16 timer) { - u16 idx; - - idx = timer % 2; - AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120); + u16 i = timer % 2; + AppendTilesetAnimToBuffer(gTilesetAnims_BikeShop_BlinkingLights[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 496)), 0x120); } -static void sub_80A1798(u16 timer) +static void QueueAnimTiles_Sootopolis_StormyWater(u16 timer) { - u16 idx; - - idx = timer % 8; - AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00); + u16 i = timer % 8; + AppendTilesetAnimToBuffer(gTilesetAnims_Sootopolis_StormyWater[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 240)), 0xc00); } -static void sub_80A17C0(u16 timer) +static void QueueAnimTiles_BattlePyramid_Torch(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid0[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid_Torch[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 151)), 0x100); } -static void sub_80A17EC(u16 timer) +static void QueueAnimTiles_BattlePyramid_StatueShadow(u16 timer) { - u16 idx; - - idx = timer % 3; - AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid1[idx], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100); + u16 i = timer % 3; + AppendTilesetAnimToBuffer(gTilesetAnims_BattlePyramid_StatueShadow[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(NUM_TILES_IN_PRIMARY + 135)), 0x100); } -static void sub_80A1818(u16 a1) +static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) { - CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); - BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); + BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != 0xFF ) { - sSecondaryTilesetCB = sub_80A1670; - sSecondaryTilesetCBBufferSize = 0x20; + sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2; + sSecondaryTilesetAnimCounterMax = 32; } } -static void sub_80A1884(u16 a1) +static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) { - CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); + CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF ) { - BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); - if (!--sSecondaryTilesetCBBufferSize) - sSecondaryTilesetCB = NULL; + BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); + if (!--sSecondaryTilesetAnimCounterMax) + sSecondaryTilesetAnimCallback = NULL; } } From 6f1d2b870c1426e7f405f3b3bc4ff2b9edb380e1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 9 Feb 2019 09:57:30 -0600 Subject: [PATCH 7/7] Give proper names to dynamic map layouts --- data/event_scripts.s | 12 +- .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | Bin .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | 0 .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | Bin .../border.bin | 0 .../map.bin | 0 .../border.bin | Bin .../map.bin | Bin data/layouts/layouts.json | 304 +++++++++--------- .../scripts.inc | 4 +- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/scripts.inc | 2 +- data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/scripts.inc | 2 +- data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 2 +- .../scripts.inc | 2 +- .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 .../map.json | 4 +- .../scripts.inc | 0 data/maps/map_groups.json | 12 +- include/constants/layouts.h | 76 ++--- src/battle_pike.c | 2 +- 104 files changed, 227 insertions(+), 227 deletions(-) rename data/layouts/{UnknownMap_0845A394 => CaveOfOrigin_Unused_B4F_Lava}/border.bin (100%) rename data/layouts/{UnknownMap_0845A394 => CaveOfOrigin_Unused_B4F_Lava}/map.bin (100%) rename data/layouts/{UnknownMap_08428450 => LittlerootTown_ProfessorBirchsLabWithTable}/border.bin (100%) rename data/layouts/{UnknownMap_08480DAC => LittlerootTown_ProfessorBirchsLabWithTable}/map.bin (100%) rename data/layouts/{UnknownMap_08417FC4 => Route130_MirageIsland}/border.bin (100%) rename data/layouts/{UnknownMap_08417FC4 => Route130_MirageIsland}/map.bin (100%) rename data/layouts/{UnknownMap_0845D470 => Route131_SkyPillar}/border.bin (100%) rename data/layouts/{UnknownMap_0845D470 => Route131_SkyPillar}/map.bin (100%) rename data/layouts/{UnknownMap_0845ECB4 => SeafloorCavern_Room9_Lava}/border.bin (100%) rename data/layouts/{UnknownMap_0845ECB4 => SeafloorCavern_Room9_Lava}/map.bin (100%) rename data/layouts/{UnknownMap_084294C4 => SkyPillar_1F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_08480F54 => SkyPillar_1F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_084294E8 => SkyPillar_2F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_084810FC => SkyPillar_2F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08480DAC => SkyPillar_3F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_084812A4 => SkyPillar_3F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08480F54 => SkyPillar_4F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_0848144C => SkyPillar_4F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_084810FC => SkyPillar_5F_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_084815F4 => SkyPillar_5F_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08481B24 => SkyPillar_Top_Clean}/border.bin (100%) rename data/layouts/{UnknownMap_08481B24 => SkyPillar_Top_Clean}/map.bin (100%) rename data/layouts/{UnknownMap_08469200 => SootopolisCity_LegendsBattle}/border.bin (100%) rename data/layouts/{UnknownMap_08469200 => SootopolisCity_LegendsBattle}/map.bin (100%) rename data/layouts/{UnknownMap_084693AC => SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked}/border.bin (100%) rename data/layouts/{UnknownMap_08481DBC => SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked}/map.bin (100%) rename data/layouts/{UnknownMap_084812A4 => UnknownLinkContestRoom_25_29}/border.bin (100%) rename data/layouts/{UnknownMap_25_29 => UnknownLinkContestRoom_25_29}/map.bin (100%) rename data/layouts/{UnknownMap_0848144C => UnknownLinkContestRoom_25_30}/border.bin (100%) rename data/layouts/{UnknownMap_25_30 => UnknownLinkContestRoom_25_30}/map.bin (100%) rename data/layouts/{UnknownMap_084815F4 => UnknownLinkContestRoom_25_31}/border.bin (100%) rename data/layouts/{UnknownMap_25_31 => UnknownLinkContestRoom_25_31}/map.bin (100%) rename data/layouts/{UnknownMap_25_29 => UnknownLinkContestRoom_25_32}/border.bin (100%) rename data/layouts/{UnknownMap_25_32 => UnknownLinkContestRoom_25_32}/map.bin (100%) rename data/layouts/{UnknownMap_25_30 => UnknownLinkContestRoom_25_33}/border.bin (100%) rename data/layouts/{UnknownMap_25_33 => UnknownLinkContestRoom_25_33}/map.bin (100%) rename data/layouts/{UnknownMap_25_31 => UnknownLinkContestRoom_25_34}/border.bin (100%) rename data/layouts/{UnknownMap_25_34 => UnknownLinkContestRoom_25_34}/map.bin (100%) rename data/layouts/{UnknownMap_25_32 => Unknown_08428450}/border.bin (100%) rename data/layouts/{UnknownMap_08428450 => Unknown_08428450}/map.bin (100%) rename data/layouts/{UnknownMap_25_33 => Unknown_084294C4}/border.bin (100%) rename data/layouts/{UnknownMap_084294C4 => Unknown_084294C4}/map.bin (100%) rename data/layouts/{UnknownMap_25_34 => Unknown_084294E8}/border.bin (100%) rename data/layouts/{UnknownMap_084294E8 => Unknown_084294E8}/map.bin (100%) rename data/layouts/{UnknownMap_0843E6C0 => Unknown_0843E6C0}/border.bin (100%) rename data/layouts/{UnknownMap_0843E6C0 => Unknown_0843E6C0}/map.bin (100%) rename data/layouts/{UnknownMap_0843E6E4 => Unknown_0843E6E4}/border.bin (100%) rename data/layouts/{UnknownMap_0843E6E4 => Unknown_0843E6E4}/map.bin (100%) rename data/layouts/{UnknownMap_0843E708 => Unknown_0843E708}/border.bin (100%) rename data/layouts/{UnknownMap_0843E708 => Unknown_0843E708}/map.bin (100%) rename data/layouts/{UnknownMap_0843E72C => Unknown_0843E72C}/border.bin (100%) rename data/layouts/{UnknownMap_0843E72C => Unknown_0843E72C}/map.bin (100%) rename data/layouts/{UnknownMap_0843E750 => Unknown_0843E750}/border.bin (100%) rename data/layouts/{UnknownMap_0843E750 => Unknown_0843E750}/map.bin (100%) rename data/layouts/{UnknownMap_0843E774 => Unknown_0843E774}/border.bin (100%) rename data/layouts/{UnknownMap_0843E774 => Unknown_0843E774}/map.bin (100%) rename data/layouts/{UnknownMap_0843E798 => Unknown_0843E798}/border.bin (100%) rename data/layouts/{UnknownMap_0843E798 => Unknown_0843E798}/map.bin (100%) rename data/layouts/{UnknownMap_0843E7BC => Unknown_0843E7BC}/border.bin (100%) rename data/layouts/{UnknownMap_0843E7BC => Unknown_0843E7BC}/map.bin (100%) rename data/layouts/{UnknownMap_0843E7E0 => Unknown_0843E7E0}/border.bin (100%) rename data/layouts/{UnknownMap_0843E7E0 => Unknown_0843E7E0}/map.bin (100%) rename data/layouts/{UnknownMap_0843E804 => Unknown_0843E804}/border.bin (100%) rename data/layouts/{UnknownMap_0843E804 => Unknown_0843E804}/map.bin (100%) rename data/layouts/{UnknownMap_0843E828 => Unknown_0843E828}/border.bin (100%) rename data/layouts/{UnknownMap_0843E828 => Unknown_0843E828}/map.bin (100%) rename data/layouts/{UnknownMap_0843E84C => Unknown_0843E84C}/border.bin (100%) rename data/layouts/{UnknownMap_0843E84C => Unknown_0843E84C}/map.bin (100%) rename data/layouts/{UnknownMap_0843E870 => Unknown_0843E870}/border.bin (100%) rename data/layouts/{UnknownMap_0843E870 => Unknown_0843E870}/map.bin (100%) rename data/layouts/{UnknownMap_0843E894 => Unknown_0843E894}/border.bin (100%) rename data/layouts/{UnknownMap_0843E894 => Unknown_0843E894}/map.bin (100%) rename data/layouts/{UnknownMap_08447028 => Unknown_08447028}/border.bin (100%) rename data/layouts/{UnknownMap_08447028 => Unknown_08447028}/map.bin (100%) rename data/layouts/{UnknownMap_08481DBC => Unknown_084693AC}/border.bin (100%) rename data/layouts/{UnknownMap_084693AC => Unknown_084693AC}/map.bin (100%) rename data/maps/{UnknownMap_25_29 => UnknownLinkContestRoom_25_29}/map.json (82%) rename data/maps/{UnknownMap_25_29 => UnknownLinkContestRoom_25_29}/scripts.inc (100%) rename data/maps/{UnknownMap_25_30 => UnknownLinkContestRoom_25_30}/map.json (82%) rename data/maps/{UnknownMap_25_30 => UnknownLinkContestRoom_25_30}/scripts.inc (100%) rename data/maps/{UnknownMap_25_31 => UnknownLinkContestRoom_25_31}/map.json (82%) rename data/maps/{UnknownMap_25_31 => UnknownLinkContestRoom_25_31}/scripts.inc (100%) rename data/maps/{UnknownMap_25_32 => UnknownLinkContestRoom_25_32}/map.json (82%) rename data/maps/{UnknownMap_25_32 => UnknownLinkContestRoom_25_32}/scripts.inc (100%) rename data/maps/{UnknownMap_25_33 => UnknownLinkContestRoom_25_33}/map.json (82%) rename data/maps/{UnknownMap_25_33 => UnknownLinkContestRoom_25_33}/scripts.inc (100%) rename data/maps/{UnknownMap_25_34 => UnknownLinkContestRoom_25_34}/map.json (82%) rename data/maps/{UnknownMap_25_34 => UnknownLinkContestRoom_25_34}/scripts.inc (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index cf9590ce5..8d8b0cd68 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -636,12 +636,12 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/RecordCorner/scripts.inc" .include "data/maps/DoubleBattleColosseum/scripts.inc" .include "data/maps/LinkContestRoom1/scripts.inc" - .include "data/maps/UnknownMap_25_29/scripts.inc" - .include "data/maps/UnknownMap_25_30/scripts.inc" - .include "data/maps/UnknownMap_25_31/scripts.inc" - .include "data/maps/UnknownMap_25_32/scripts.inc" - .include "data/maps/UnknownMap_25_33/scripts.inc" - .include "data/maps/UnknownMap_25_34/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_29/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_30/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_31/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_32/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_33/scripts.inc" + .include "data/maps/UnknownLinkContestRoom_25_34/scripts.inc" .include "data/maps/LinkContestRoom2/scripts.inc" .include "data/maps/LinkContestRoom3/scripts.inc" .include "data/maps/LinkContestRoom4/scripts.inc" diff --git a/data/layouts/UnknownMap_0845A394/border.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin similarity index 100% rename from data/layouts/UnknownMap_0845A394/border.bin rename to data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin diff --git a/data/layouts/UnknownMap_0845A394/map.bin b/data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin similarity index 100% rename from data/layouts/UnknownMap_0845A394/map.bin rename to data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin diff --git a/data/layouts/UnknownMap_08428450/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin similarity index 100% rename from data/layouts/UnknownMap_08428450/border.bin rename to data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin diff --git a/data/layouts/UnknownMap_08480DAC/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin similarity index 100% rename from data/layouts/UnknownMap_08480DAC/map.bin rename to data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin diff --git a/data/layouts/UnknownMap_08417FC4/border.bin b/data/layouts/Route130_MirageIsland/border.bin similarity index 100% rename from data/layouts/UnknownMap_08417FC4/border.bin rename to data/layouts/Route130_MirageIsland/border.bin diff --git a/data/layouts/UnknownMap_08417FC4/map.bin b/data/layouts/Route130_MirageIsland/map.bin similarity index 100% rename from data/layouts/UnknownMap_08417FC4/map.bin rename to data/layouts/Route130_MirageIsland/map.bin diff --git a/data/layouts/UnknownMap_0845D470/border.bin b/data/layouts/Route131_SkyPillar/border.bin similarity index 100% rename from data/layouts/UnknownMap_0845D470/border.bin rename to data/layouts/Route131_SkyPillar/border.bin diff --git a/data/layouts/UnknownMap_0845D470/map.bin b/data/layouts/Route131_SkyPillar/map.bin similarity index 100% rename from data/layouts/UnknownMap_0845D470/map.bin rename to data/layouts/Route131_SkyPillar/map.bin diff --git a/data/layouts/UnknownMap_0845ECB4/border.bin b/data/layouts/SeafloorCavern_Room9_Lava/border.bin similarity index 100% rename from data/layouts/UnknownMap_0845ECB4/border.bin rename to data/layouts/SeafloorCavern_Room9_Lava/border.bin diff --git a/data/layouts/UnknownMap_0845ECB4/map.bin b/data/layouts/SeafloorCavern_Room9_Lava/map.bin similarity index 100% rename from data/layouts/UnknownMap_0845ECB4/map.bin rename to data/layouts/SeafloorCavern_Room9_Lava/map.bin diff --git a/data/layouts/UnknownMap_084294C4/border.bin b/data/layouts/SkyPillar_1F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_084294C4/border.bin rename to data/layouts/SkyPillar_1F_Clean/border.bin diff --git a/data/layouts/UnknownMap_08480F54/map.bin b/data/layouts/SkyPillar_1F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_08480F54/map.bin rename to data/layouts/SkyPillar_1F_Clean/map.bin diff --git a/data/layouts/UnknownMap_084294E8/border.bin b/data/layouts/SkyPillar_2F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_084294E8/border.bin rename to data/layouts/SkyPillar_2F_Clean/border.bin diff --git a/data/layouts/UnknownMap_084810FC/map.bin b/data/layouts/SkyPillar_2F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_084810FC/map.bin rename to data/layouts/SkyPillar_2F_Clean/map.bin diff --git a/data/layouts/UnknownMap_08480DAC/border.bin b/data/layouts/SkyPillar_3F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_08480DAC/border.bin rename to data/layouts/SkyPillar_3F_Clean/border.bin diff --git a/data/layouts/UnknownMap_084812A4/map.bin b/data/layouts/SkyPillar_3F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_084812A4/map.bin rename to data/layouts/SkyPillar_3F_Clean/map.bin diff --git a/data/layouts/UnknownMap_08480F54/border.bin b/data/layouts/SkyPillar_4F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_08480F54/border.bin rename to data/layouts/SkyPillar_4F_Clean/border.bin diff --git a/data/layouts/UnknownMap_0848144C/map.bin b/data/layouts/SkyPillar_4F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_0848144C/map.bin rename to data/layouts/SkyPillar_4F_Clean/map.bin diff --git a/data/layouts/UnknownMap_084810FC/border.bin b/data/layouts/SkyPillar_5F_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_084810FC/border.bin rename to data/layouts/SkyPillar_5F_Clean/border.bin diff --git a/data/layouts/UnknownMap_084815F4/map.bin b/data/layouts/SkyPillar_5F_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_084815F4/map.bin rename to data/layouts/SkyPillar_5F_Clean/map.bin diff --git a/data/layouts/UnknownMap_08481B24/border.bin b/data/layouts/SkyPillar_Top_Clean/border.bin similarity index 100% rename from data/layouts/UnknownMap_08481B24/border.bin rename to data/layouts/SkyPillar_Top_Clean/border.bin diff --git a/data/layouts/UnknownMap_08481B24/map.bin b/data/layouts/SkyPillar_Top_Clean/map.bin similarity index 100% rename from data/layouts/UnknownMap_08481B24/map.bin rename to data/layouts/SkyPillar_Top_Clean/map.bin diff --git a/data/layouts/UnknownMap_08469200/border.bin b/data/layouts/SootopolisCity_LegendsBattle/border.bin similarity index 100% rename from data/layouts/UnknownMap_08469200/border.bin rename to data/layouts/SootopolisCity_LegendsBattle/border.bin diff --git a/data/layouts/UnknownMap_08469200/map.bin b/data/layouts/SootopolisCity_LegendsBattle/map.bin similarity index 100% rename from data/layouts/UnknownMap_08469200/map.bin rename to data/layouts/SootopolisCity_LegendsBattle/map.bin diff --git a/data/layouts/UnknownMap_084693AC/border.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin similarity index 100% rename from data/layouts/UnknownMap_084693AC/border.bin rename to data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin diff --git a/data/layouts/UnknownMap_08481DBC/map.bin b/data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin similarity index 100% rename from data/layouts/UnknownMap_08481DBC/map.bin rename to data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin diff --git a/data/layouts/UnknownMap_084812A4/border.bin b/data/layouts/UnknownLinkContestRoom_25_29/border.bin similarity index 100% rename from data/layouts/UnknownMap_084812A4/border.bin rename to data/layouts/UnknownLinkContestRoom_25_29/border.bin diff --git a/data/layouts/UnknownMap_25_29/map.bin b/data/layouts/UnknownLinkContestRoom_25_29/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_29/map.bin rename to data/layouts/UnknownLinkContestRoom_25_29/map.bin diff --git a/data/layouts/UnknownMap_0848144C/border.bin b/data/layouts/UnknownLinkContestRoom_25_30/border.bin similarity index 100% rename from data/layouts/UnknownMap_0848144C/border.bin rename to data/layouts/UnknownLinkContestRoom_25_30/border.bin diff --git a/data/layouts/UnknownMap_25_30/map.bin b/data/layouts/UnknownLinkContestRoom_25_30/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_30/map.bin rename to data/layouts/UnknownLinkContestRoom_25_30/map.bin diff --git a/data/layouts/UnknownMap_084815F4/border.bin b/data/layouts/UnknownLinkContestRoom_25_31/border.bin similarity index 100% rename from data/layouts/UnknownMap_084815F4/border.bin rename to data/layouts/UnknownLinkContestRoom_25_31/border.bin diff --git a/data/layouts/UnknownMap_25_31/map.bin b/data/layouts/UnknownLinkContestRoom_25_31/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_31/map.bin rename to data/layouts/UnknownLinkContestRoom_25_31/map.bin diff --git a/data/layouts/UnknownMap_25_29/border.bin b/data/layouts/UnknownLinkContestRoom_25_32/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_29/border.bin rename to data/layouts/UnknownLinkContestRoom_25_32/border.bin diff --git a/data/layouts/UnknownMap_25_32/map.bin b/data/layouts/UnknownLinkContestRoom_25_32/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_32/map.bin rename to data/layouts/UnknownLinkContestRoom_25_32/map.bin diff --git a/data/layouts/UnknownMap_25_30/border.bin b/data/layouts/UnknownLinkContestRoom_25_33/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_30/border.bin rename to data/layouts/UnknownLinkContestRoom_25_33/border.bin diff --git a/data/layouts/UnknownMap_25_33/map.bin b/data/layouts/UnknownLinkContestRoom_25_33/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_33/map.bin rename to data/layouts/UnknownLinkContestRoom_25_33/map.bin diff --git a/data/layouts/UnknownMap_25_31/border.bin b/data/layouts/UnknownLinkContestRoom_25_34/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_31/border.bin rename to data/layouts/UnknownLinkContestRoom_25_34/border.bin diff --git a/data/layouts/UnknownMap_25_34/map.bin b/data/layouts/UnknownLinkContestRoom_25_34/map.bin similarity index 100% rename from data/layouts/UnknownMap_25_34/map.bin rename to data/layouts/UnknownLinkContestRoom_25_34/map.bin diff --git a/data/layouts/UnknownMap_25_32/border.bin b/data/layouts/Unknown_08428450/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_32/border.bin rename to data/layouts/Unknown_08428450/border.bin diff --git a/data/layouts/UnknownMap_08428450/map.bin b/data/layouts/Unknown_08428450/map.bin similarity index 100% rename from data/layouts/UnknownMap_08428450/map.bin rename to data/layouts/Unknown_08428450/map.bin diff --git a/data/layouts/UnknownMap_25_33/border.bin b/data/layouts/Unknown_084294C4/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_33/border.bin rename to data/layouts/Unknown_084294C4/border.bin diff --git a/data/layouts/UnknownMap_084294C4/map.bin b/data/layouts/Unknown_084294C4/map.bin similarity index 100% rename from data/layouts/UnknownMap_084294C4/map.bin rename to data/layouts/Unknown_084294C4/map.bin diff --git a/data/layouts/UnknownMap_25_34/border.bin b/data/layouts/Unknown_084294E8/border.bin similarity index 100% rename from data/layouts/UnknownMap_25_34/border.bin rename to data/layouts/Unknown_084294E8/border.bin diff --git a/data/layouts/UnknownMap_084294E8/map.bin b/data/layouts/Unknown_084294E8/map.bin similarity index 100% rename from data/layouts/UnknownMap_084294E8/map.bin rename to data/layouts/Unknown_084294E8/map.bin diff --git a/data/layouts/UnknownMap_0843E6C0/border.bin b/data/layouts/Unknown_0843E6C0/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6C0/border.bin rename to data/layouts/Unknown_0843E6C0/border.bin diff --git a/data/layouts/UnknownMap_0843E6C0/map.bin b/data/layouts/Unknown_0843E6C0/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6C0/map.bin rename to data/layouts/Unknown_0843E6C0/map.bin diff --git a/data/layouts/UnknownMap_0843E6E4/border.bin b/data/layouts/Unknown_0843E6E4/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6E4/border.bin rename to data/layouts/Unknown_0843E6E4/border.bin diff --git a/data/layouts/UnknownMap_0843E6E4/map.bin b/data/layouts/Unknown_0843E6E4/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E6E4/map.bin rename to data/layouts/Unknown_0843E6E4/map.bin diff --git a/data/layouts/UnknownMap_0843E708/border.bin b/data/layouts/Unknown_0843E708/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E708/border.bin rename to data/layouts/Unknown_0843E708/border.bin diff --git a/data/layouts/UnknownMap_0843E708/map.bin b/data/layouts/Unknown_0843E708/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E708/map.bin rename to data/layouts/Unknown_0843E708/map.bin diff --git a/data/layouts/UnknownMap_0843E72C/border.bin b/data/layouts/Unknown_0843E72C/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E72C/border.bin rename to data/layouts/Unknown_0843E72C/border.bin diff --git a/data/layouts/UnknownMap_0843E72C/map.bin b/data/layouts/Unknown_0843E72C/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E72C/map.bin rename to data/layouts/Unknown_0843E72C/map.bin diff --git a/data/layouts/UnknownMap_0843E750/border.bin b/data/layouts/Unknown_0843E750/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E750/border.bin rename to data/layouts/Unknown_0843E750/border.bin diff --git a/data/layouts/UnknownMap_0843E750/map.bin b/data/layouts/Unknown_0843E750/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E750/map.bin rename to data/layouts/Unknown_0843E750/map.bin diff --git a/data/layouts/UnknownMap_0843E774/border.bin b/data/layouts/Unknown_0843E774/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E774/border.bin rename to data/layouts/Unknown_0843E774/border.bin diff --git a/data/layouts/UnknownMap_0843E774/map.bin b/data/layouts/Unknown_0843E774/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E774/map.bin rename to data/layouts/Unknown_0843E774/map.bin diff --git a/data/layouts/UnknownMap_0843E798/border.bin b/data/layouts/Unknown_0843E798/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E798/border.bin rename to data/layouts/Unknown_0843E798/border.bin diff --git a/data/layouts/UnknownMap_0843E798/map.bin b/data/layouts/Unknown_0843E798/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E798/map.bin rename to data/layouts/Unknown_0843E798/map.bin diff --git a/data/layouts/UnknownMap_0843E7BC/border.bin b/data/layouts/Unknown_0843E7BC/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7BC/border.bin rename to data/layouts/Unknown_0843E7BC/border.bin diff --git a/data/layouts/UnknownMap_0843E7BC/map.bin b/data/layouts/Unknown_0843E7BC/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7BC/map.bin rename to data/layouts/Unknown_0843E7BC/map.bin diff --git a/data/layouts/UnknownMap_0843E7E0/border.bin b/data/layouts/Unknown_0843E7E0/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7E0/border.bin rename to data/layouts/Unknown_0843E7E0/border.bin diff --git a/data/layouts/UnknownMap_0843E7E0/map.bin b/data/layouts/Unknown_0843E7E0/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E7E0/map.bin rename to data/layouts/Unknown_0843E7E0/map.bin diff --git a/data/layouts/UnknownMap_0843E804/border.bin b/data/layouts/Unknown_0843E804/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E804/border.bin rename to data/layouts/Unknown_0843E804/border.bin diff --git a/data/layouts/UnknownMap_0843E804/map.bin b/data/layouts/Unknown_0843E804/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E804/map.bin rename to data/layouts/Unknown_0843E804/map.bin diff --git a/data/layouts/UnknownMap_0843E828/border.bin b/data/layouts/Unknown_0843E828/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E828/border.bin rename to data/layouts/Unknown_0843E828/border.bin diff --git a/data/layouts/UnknownMap_0843E828/map.bin b/data/layouts/Unknown_0843E828/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E828/map.bin rename to data/layouts/Unknown_0843E828/map.bin diff --git a/data/layouts/UnknownMap_0843E84C/border.bin b/data/layouts/Unknown_0843E84C/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E84C/border.bin rename to data/layouts/Unknown_0843E84C/border.bin diff --git a/data/layouts/UnknownMap_0843E84C/map.bin b/data/layouts/Unknown_0843E84C/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E84C/map.bin rename to data/layouts/Unknown_0843E84C/map.bin diff --git a/data/layouts/UnknownMap_0843E870/border.bin b/data/layouts/Unknown_0843E870/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E870/border.bin rename to data/layouts/Unknown_0843E870/border.bin diff --git a/data/layouts/UnknownMap_0843E870/map.bin b/data/layouts/Unknown_0843E870/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E870/map.bin rename to data/layouts/Unknown_0843E870/map.bin diff --git a/data/layouts/UnknownMap_0843E894/border.bin b/data/layouts/Unknown_0843E894/border.bin similarity index 100% rename from data/layouts/UnknownMap_0843E894/border.bin rename to data/layouts/Unknown_0843E894/border.bin diff --git a/data/layouts/UnknownMap_0843E894/map.bin b/data/layouts/Unknown_0843E894/map.bin similarity index 100% rename from data/layouts/UnknownMap_0843E894/map.bin rename to data/layouts/Unknown_0843E894/map.bin diff --git a/data/layouts/UnknownMap_08447028/border.bin b/data/layouts/Unknown_08447028/border.bin similarity index 100% rename from data/layouts/UnknownMap_08447028/border.bin rename to data/layouts/Unknown_08447028/border.bin diff --git a/data/layouts/UnknownMap_08447028/map.bin b/data/layouts/Unknown_08447028/map.bin similarity index 100% rename from data/layouts/UnknownMap_08447028/map.bin rename to data/layouts/Unknown_08447028/map.bin diff --git a/data/layouts/UnknownMap_08481DBC/border.bin b/data/layouts/Unknown_084693AC/border.bin similarity index 100% rename from data/layouts/UnknownMap_08481DBC/border.bin rename to data/layouts/Unknown_084693AC/border.bin diff --git a/data/layouts/UnknownMap_084693AC/map.bin b/data/layouts/Unknown_084693AC/map.bin similarity index 100% rename from data/layouts/UnknownMap_084693AC/map.bin rename to data/layouts/Unknown_084693AC/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b6e31981d..353b9a284 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -452,14 +452,14 @@ "blockdata_filepath": "data/layouts/Route129/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08417FC4", - "name": "UnknownMap_08417FC4_Layout", + "id": "LAYOUT_ROUTE130_MIRAGE_ISLAND", + "name": "Route130_MirageIsland_Layout", "width": 80, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.bin" + "border_filepath": "data/layouts/Route130_MirageIsland/border.bin", + "blockdata_filepath": "data/layouts/Route130_MirageIsland/map.bin" }, { "id": "LAYOUT_ROUTE131", @@ -742,14 +742,14 @@ "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08428450", - "name": "UnknownMap_08428450_Layout", + "id": "LAYOUT_UNKNOWN_08428450", + "name": "Unknown_08428450_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_08428450/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.bin" + "border_filepath": "data/layouts/Unknown_08428450/border.bin", + "blockdata_filepath": "data/layouts/Unknown_08428450/map.bin" }, { "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", @@ -822,24 +822,24 @@ "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084294C4", - "name": "UnknownMap_084294C4_Layout", + "id": "LAYOUT_UNKNOWN_084294C4", + "name": "Unknown_084294C4_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin" + "border_filepath": "data/layouts/Unknown_084294C4/border.bin", + "blockdata_filepath": "data/layouts/Unknown_084294C4/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084294E8", - "name": "UnknownMap_084294E8_Layout", + "id": "LAYOUT_UNKNOWN_084294E8", + "name": "Unknown_084294E8_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.bin" + "border_filepath": "data/layouts/Unknown_084294E8/border.bin", + "blockdata_filepath": "data/layouts/Unknown_084294E8/map.bin" }, { "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", @@ -1692,144 +1692,144 @@ "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E6C0", - "name": "UnknownMap_0843E6C0_Layout", + "id": "LAYOUT_UNKNOWN_0843E6C0", + "name": "Unknown_0843E6C0_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin" + "border_filepath": "data/layouts/Unknown_0843E6C0/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E6C0/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E6E4", - "name": "UnknownMap_0843E6E4_Layout", + "id": "LAYOUT_UNKNOWN_0843E6E4", + "name": "Unknown_0843E6E4_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin" + "border_filepath": "data/layouts/Unknown_0843E6E4/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E6E4/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E708", - "name": "UnknownMap_0843E708_Layout", + "id": "LAYOUT_UNKNOWN_0843E708", + "name": "Unknown_0843E708_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin" + "border_filepath": "data/layouts/Unknown_0843E708/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E708/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E72C", - "name": "UnknownMap_0843E72C_Layout", + "id": "LAYOUT_UNKNOWN_0843E72C", + "name": "Unknown_0843E72C_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin" + "border_filepath": "data/layouts/Unknown_0843E72C/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E72C/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E750", - "name": "UnknownMap_0843E750_Layout", + "id": "LAYOUT_UNKNOWN_0843E750", + "name": "Unknown_0843E750_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin" + "border_filepath": "data/layouts/Unknown_0843E750/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E750/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E774", - "name": "UnknownMap_0843E774_Layout", + "id": "LAYOUT_UNKNOWN_0843E774", + "name": "Unknown_0843E774_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin" + "border_filepath": "data/layouts/Unknown_0843E774/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E774/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E798", - "name": "UnknownMap_0843E798_Layout", + "id": "LAYOUT_UNKNOWN_0843E798", + "name": "Unknown_0843E798_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin" + "border_filepath": "data/layouts/Unknown_0843E798/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E798/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E7BC", - "name": "UnknownMap_0843E7BC_Layout", + "id": "LAYOUT_UNKNOWN_0843E7BC", + "name": "Unknown_0843E7BC_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin" + "border_filepath": "data/layouts/Unknown_0843E7BC/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E7BC/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E7E0", - "name": "UnknownMap_0843E7E0_Layout", + "id": "LAYOUT_UNKNOWN_0843E7E0", + "name": "Unknown_0843E7E0_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin" + "border_filepath": "data/layouts/Unknown_0843E7E0/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E7E0/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E804", - "name": "UnknownMap_0843E804_Layout", + "id": "LAYOUT_UNKNOWN_0843E804", + "name": "Unknown_0843E804_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin" + "border_filepath": "data/layouts/Unknown_0843E804/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E804/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E828", - "name": "UnknownMap_0843E828_Layout", + "id": "LAYOUT_UNKNOWN_0843E828", + "name": "Unknown_0843E828_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin" + "border_filepath": "data/layouts/Unknown_0843E828/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E828/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E84C", - "name": "UnknownMap_0843E84C_Layout", + "id": "LAYOUT_UNKNOWN_0843E84C", + "name": "Unknown_0843E84C_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin" + "border_filepath": "data/layouts/Unknown_0843E84C/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E84C/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E870", - "name": "UnknownMap_0843E870_Layout", + "id": "LAYOUT_UNKNOWN_0843E870", + "name": "Unknown_0843E870_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin" + "border_filepath": "data/layouts/Unknown_0843E870/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E870/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0843E894", - "name": "UnknownMap_0843E894_Layout", + "id": "LAYOUT_UNKNOWN_0843E894", + "name": "Unknown_0843E894_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.bin" + "border_filepath": "data/layouts/Unknown_0843E894/border.bin", + "blockdata_filepath": "data/layouts/Unknown_0843E894/map.bin" }, { "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE", @@ -2252,64 +2252,64 @@ "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_29", - "name": "UnknownMap_25_29_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29", + "name": "UnknownLinkContestRoom_25_29_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_29/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_29/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_29/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_30", - "name": "UnknownMap_25_30_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30", + "name": "UnknownLinkContestRoom_25_30_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_30/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_30/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_30/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_31", - "name": "UnknownMap_25_31_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31", + "name": "UnknownLinkContestRoom_25_31_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_31/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_31/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_31/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_32", - "name": "UnknownMap_25_32_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32", + "name": "UnknownLinkContestRoom_25_32_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_32/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_32/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_32/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_33", - "name": "UnknownMap_25_33_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33", + "name": "UnknownLinkContestRoom_25_33_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_33/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_33/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_33/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_25_34", - "name": "UnknownMap_25_34_Layout", + "id": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34", + "name": "UnknownLinkContestRoom_25_34_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Contest", - "border_filepath": "data/layouts/UnknownMap_25_34/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.bin" + "border_filepath": "data/layouts/UnknownLinkContestRoom_25_34/border.bin", + "blockdata_filepath": "data/layouts/UnknownLinkContestRoom_25_34/map.bin" }, { "id": "LAYOUT_LINK_CONTEST_ROOM2", @@ -2412,14 +2412,14 @@ "blockdata_filepath": "data/layouts/SafariZone_South/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08447028", - "name": "UnknownMap_08447028_Layout", + "id": "LAYOUT_UNKNOWN_08447028", + "name": "Unknown_08447028_Layout", "width": 58, "height": 26, "primary_tileset": "gTileset_General", "secondary_tileset": "0", - "border_filepath": "data/layouts/UnknownMap_08447028/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.bin" + "border_filepath": "data/layouts/Unknown_08447028/border.bin", + "blockdata_filepath": "data/layouts/Unknown_08447028/map.bin" }, { "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE", @@ -3112,14 +3112,14 @@ "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0845A394", - "name": "UnknownMap_0845A394_Layout", + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA", + "name": "CaveOfOrigin_Unused_B4F_Lava_Layout", "width": 19, "height": 19, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.bin" + "border_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_Unused_B4F_Lava/map.bin" }, { "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", @@ -3182,14 +3182,14 @@ "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0845D470", - "name": "UnknownMap_0845D470_Layout", + "id": "LAYOUT_ROUTE131_SKY_PILLAR", + "name": "Route131_SkyPillar_Layout", "width": 60, "height": 40, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.bin" + "border_filepath": "data/layouts/Route131_SkyPillar/border.bin", + "blockdata_filepath": "data/layouts/Route131_SkyPillar/map.bin" }, { "id": "LAYOUT_SKY_PILLAR_ENTRANCE", @@ -3252,14 +3252,14 @@ "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0845ECB4", - "name": "UnknownMap_0845ECB4_Layout", + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA", + "name": "SeafloorCavern_Room9_Lava_Layout", "width": 27, "height": 46, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Cave", - "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.bin" + "border_filepath": "data/layouts/SeafloorCavern_Room9_Lava/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room9_Lava/map.bin" }, { "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", @@ -3562,14 +3562,14 @@ "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08469200", - "name": "UnknownMap_08469200_Layout", + "id": "LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE", + "name": "SootopolisCity_LegendsBattle_Layout", "width": 60, "height": 60, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Sootopolis", - "border_filepath": "data/layouts/UnknownMap_08469200/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.bin" + "border_filepath": "data/layouts/SootopolisCity_LegendsBattle/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_LegendsBattle/map.bin" }, { "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", @@ -3582,14 +3582,14 @@ "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084693AC", - "name": "UnknownMap_084693AC_Layout", + "id": "LAYOUT_UNKNOWN_084693AC", + "name": "Unknown_084693AC_Layout", "width": 1, "height": 1, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_BattlePike", - "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.bin" + "border_filepath": "data/layouts/Unknown_084693AC/border.bin", + "blockdata_filepath": "data/layouts/Unknown_084693AC/map.bin" }, { "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", @@ -4312,74 +4312,74 @@ "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08480DAC", - "name": "UnknownMap_08480DAC_Layout", + "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE", + "name": "LittlerootTown_ProfessorBirchsLabWithTable_Layout", "width": 13, "height": 13, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_Lab", - "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin" + "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLabWithTable/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08480F54", - "name": "UnknownMap_08480F54_Layout", + "id": "LAYOUT_SKY_PILLAR_1F_CLEAN", + "name": "SkyPillar_1F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin" + "border_filepath": "data/layouts/SkyPillar_1F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_1F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084810FC", - "name": "UnknownMap_084810FC_Layout", + "id": "LAYOUT_SKY_PILLAR_2F_CLEAN", + "name": "SkyPillar_2F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin" + "border_filepath": "data/layouts/SkyPillar_2F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_2F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084812A4", - "name": "UnknownMap_084812A4_Layout", + "id": "LAYOUT_SKY_PILLAR_3F_CLEAN", + "name": "SkyPillar_3F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin" + "border_filepath": "data/layouts/SkyPillar_3F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_3F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_0848144C", - "name": "UnknownMap_0848144C_Layout", + "id": "LAYOUT_SKY_PILLAR_4F_CLEAN", + "name": "SkyPillar_4F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin" + "border_filepath": "data/layouts/SkyPillar_4F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_4F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_084815F4", - "name": "UnknownMap_084815F4_Layout", + "id": "LAYOUT_SKY_PILLAR_5F_CLEAN", + "name": "SkyPillar_5F_Clean_Layout", "width": 14, "height": 14, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin" + "border_filepath": "data/layouts/SkyPillar_5F_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_5F_Clean/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08481B24", - "name": "UnknownMap_08481B24_Layout", + "id": "LAYOUT_SKY_PILLAR_TOP_CLEAN", + "name": "SkyPillar_Top_Clean_Layout", "width": 27, "height": 24, "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_Pacifidlog", - "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.bin" + "border_filepath": "data/layouts/SkyPillar_Top_Clean/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Top_Clean/map.bin" }, { "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", @@ -4402,14 +4402,14 @@ "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" }, { - "id": "LAYOUT_UNKNOWN_MAP_08481DBC", - "name": "UnknownMap_08481DBC_Layout", + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED", + "name": "SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked_Layout", "width": 11, "height": 8, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_MysteryEventsHouse", - "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin", - "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin" + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F_StairsUnblocked/map.bin" } ] } \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b47df74b8..5c762743c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC + setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC + setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 819d9e4f3..8ca9dcbb0 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -27,7 +27,7 @@ Route130_MapScript1_1F7365: @ 81F7365 end Route130_EventScript_1F73B1:: @ 81F73B1 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4 + setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND end Route130_EventScript_1F73B5:: @ 81F73B5 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 700ac25f6..e709a14ef 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A end Route131_EventScript_1F741B:: @ 81F741B - setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470 + setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR return Route131_EventScript_1F741F:: @ 81F741F diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 2230dad8d..a0b62df25 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B end SkyPillar_1F_EventScript_239627:: @ 8239627 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54 + setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN return diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index fa89f3893..a0a4aeaf3 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B end SkyPillar_2F_EventScript_23964C:: @ 823964C - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC + setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return SkyPillar_2F_MapScript1_239650: @ 8239650 diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 015d754eb..d78ee6266 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661 end SkyPillar_3F_EventScript_23966D:: @ 823966D - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4 + setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN return diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index ccab2453c..3904e954f 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681 end SkyPillar_4F_EventScript_239692:: @ 8239692 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C + setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return SkyPillar_4F_MapScript1_239696: @ 8239696 diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index b3e3f6605..20478e77e 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4 + setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN return diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index f764ea79c..4ca4c4681 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24 + setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 5e212ddfe..5666ce6cf 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800 return SootopolisCity_EventScript_1E5801:: @ 81E5801 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200 + setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE return SootopolisCity_EventScript_1E5805:: @ 81E5805 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 252bd1201..5db204293 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC + setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json similarity index 82% rename from data/maps/UnknownMap_25_29/map.json rename to data/maps/UnknownLinkContestRoom_25_29/map.json index 8f7ac0226..956a68158 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_29", - "name": "UnknownMap_25_29", - "layout": "LAYOUT_UNKNOWN_MAP_25_29", + "name": "UnknownLinkContestRoom_25_29", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_29/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_29/scripts.inc diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json similarity index 82% rename from data/maps/UnknownMap_25_30/map.json rename to data/maps/UnknownLinkContestRoom_25_30/map.json index 5f321e6b5..526c6de2a 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_30", - "name": "UnknownMap_25_30", - "layout": "LAYOUT_UNKNOWN_MAP_25_30", + "name": "UnknownLinkContestRoom_25_30", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_30/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_30/scripts.inc diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json similarity index 82% rename from data/maps/UnknownMap_25_31/map.json rename to data/maps/UnknownLinkContestRoom_25_31/map.json index f7b06ac42..9548c1125 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_31", - "name": "UnknownMap_25_31", - "layout": "LAYOUT_UNKNOWN_MAP_25_31", + "name": "UnknownLinkContestRoom_25_31", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_31/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_31/scripts.inc diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json similarity index 82% rename from data/maps/UnknownMap_25_32/map.json rename to data/maps/UnknownLinkContestRoom_25_32/map.json index c963d0129..27411d28e 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_32", - "name": "UnknownMap_25_32", - "layout": "LAYOUT_UNKNOWN_MAP_25_32", + "name": "UnknownLinkContestRoom_25_32", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_32/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_32/scripts.inc diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json similarity index 82% rename from data/maps/UnknownMap_25_33/map.json rename to data/maps/UnknownLinkContestRoom_25_33/map.json index 441f767b6..1a15ae6d6 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_33", - "name": "UnknownMap_25_33", - "layout": "LAYOUT_UNKNOWN_MAP_25_33", + "name": "UnknownLinkContestRoom_25_33", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_33/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_33/scripts.inc diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json similarity index 82% rename from data/maps/UnknownMap_25_34/map.json rename to data/maps/UnknownLinkContestRoom_25_34/map.json index 7bdf1d226..4c90858b9 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -1,7 +1,7 @@ { "id": "MAP_UNKNOWN_MAP_25_34", - "name": "UnknownMap_25_34", - "layout": "LAYOUT_UNKNOWN_MAP_25_34", + "name": "UnknownLinkContestRoom_25_34", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34", "music": "MUS_NIBI", "region_map_section": "MAPSEC_DYNAMIC", "requires_flash": false, diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc similarity index 100% rename from data/maps/UnknownMap_25_34/scripts.inc rename to data/maps/UnknownLinkContestRoom_25_34/scripts.inc diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e20d1adf2..4088ddbb5 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -461,12 +461,12 @@ "RecordCorner", "DoubleBattleColosseum", "LinkContestRoom1", - "UnknownMap_25_29", - "UnknownMap_25_30", - "UnknownMap_25_31", - "UnknownMap_25_32", - "UnknownMap_25_33", - "UnknownMap_25_34", + "UnknownLinkContestRoom_25_29", + "UnknownLinkContestRoom_25_30", + "UnknownLinkContestRoom_25_31", + "UnknownLinkContestRoom_25_32", + "UnknownLinkContestRoom_25_33", + "UnknownLinkContestRoom_25_34", "LinkContestRoom2", "LinkContestRoom3", "LinkContestRoom4", diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d12db9b33..d4819c46a 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -46,7 +46,7 @@ #define LAYOUT_ROUTE127 43 #define LAYOUT_ROUTE128 44 #define LAYOUT_ROUTE129 45 -#define LAYOUT_UNKNOWN_MAP_08417FC4 46 +#define LAYOUT_ROUTE130_MIRAGE_ISLAND 46 #define LAYOUT_ROUTE131 47 #define LAYOUT_ROUTE132 48 #define LAYOUT_ROUTE133 49 @@ -75,7 +75,7 @@ #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72 #define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73 #define LAYOUT_LILYCOVE_CITY_HOUSE2 74 -#define LAYOUT_UNKNOWN_MAP_08428450 75 +#define LAYOUT_UNKNOWN_08428450 75 #define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77 #define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78 @@ -83,8 +83,8 @@ #define LAYOUT_HOUSE_WITH_BED 80 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81 #define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82 -#define LAYOUT_UNKNOWN_MAP_084294C4 83 -#define LAYOUT_UNKNOWN_MAP_084294E8 84 +#define LAYOUT_UNKNOWN_084294C4 83 +#define LAYOUT_UNKNOWN_084294E8 84 #define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86 #define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87 @@ -170,20 +170,20 @@ #define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168 #define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169 -#define LAYOUT_UNKNOWN_MAP_0843E6C0 170 -#define LAYOUT_UNKNOWN_MAP_0843E6E4 171 -#define LAYOUT_UNKNOWN_MAP_0843E708 172 -#define LAYOUT_UNKNOWN_MAP_0843E72C 173 -#define LAYOUT_UNKNOWN_MAP_0843E750 174 -#define LAYOUT_UNKNOWN_MAP_0843E774 175 -#define LAYOUT_UNKNOWN_MAP_0843E798 176 -#define LAYOUT_UNKNOWN_MAP_0843E7BC 177 -#define LAYOUT_UNKNOWN_MAP_0843E7E0 178 -#define LAYOUT_UNKNOWN_MAP_0843E804 179 -#define LAYOUT_UNKNOWN_MAP_0843E828 180 -#define LAYOUT_UNKNOWN_MAP_0843E84C 181 -#define LAYOUT_UNKNOWN_MAP_0843E870 182 -#define LAYOUT_UNKNOWN_MAP_0843E894 183 +#define LAYOUT_UNKNOWN_0843E6C0 170 +#define LAYOUT_UNKNOWN_0843E6E4 171 +#define LAYOUT_UNKNOWN_0843E708 172 +#define LAYOUT_UNKNOWN_0843E72C 173 +#define LAYOUT_UNKNOWN_0843E750 174 +#define LAYOUT_UNKNOWN_0843E774 175 +#define LAYOUT_UNKNOWN_0843E798 176 +#define LAYOUT_UNKNOWN_0843E7BC 177 +#define LAYOUT_UNKNOWN_0843E7E0 178 +#define LAYOUT_UNKNOWN_0843E804 179 +#define LAYOUT_UNKNOWN_0843E828 180 +#define LAYOUT_UNKNOWN_0843E84C 181 +#define LAYOUT_UNKNOWN_0843E870 182 +#define LAYOUT_UNKNOWN_0843E894 183 #define LAYOUT_NEW_MAUVILLE_ENTRANCE 184 #define LAYOUT_NEW_MAUVILLE_INSIDE 185 #define LAYOUT_ABANDONED_SHIP_DECK 186 @@ -226,12 +226,12 @@ #define LAYOUT_RECORD_CORNER 223 #define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224 #define LAYOUT_LINK_CONTEST_ROOM1 225 -#define LAYOUT_UNKNOWN_MAP_25_29 226 -#define LAYOUT_UNKNOWN_MAP_25_30 227 -#define LAYOUT_UNKNOWN_MAP_25_31 228 -#define LAYOUT_UNKNOWN_MAP_25_32 229 -#define LAYOUT_UNKNOWN_MAP_25_33 230 -#define LAYOUT_UNKNOWN_MAP_25_34 231 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29 226 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30 227 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31 228 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32 229 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33 230 +#define LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34 231 #define LAYOUT_LINK_CONTEST_ROOM2 232 #define LAYOUT_LINK_CONTEST_ROOM3 233 #define LAYOUT_LINK_CONTEST_ROOM4 234 @@ -242,7 +242,7 @@ #define LAYOUT_SAFARI_ZONE_NORTH 239 #define LAYOUT_SAFARI_ZONE_SOUTHWEST 240 #define LAYOUT_SAFARI_ZONE_SOUTH 241 -#define LAYOUT_UNKNOWN_MAP_08447028 242 +#define LAYOUT_UNKNOWN_08447028 242 #define LAYOUT_ROUTE109_SEASHORE_HOUSE 243 #define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244 #define LAYOUT_ROUTE110_TRICK_HOUSE_END 245 @@ -312,21 +312,21 @@ #define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309 #define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310 #define LAYOUT_SCORCHED_SLAB 311 -#define LAYOUT_UNKNOWN_MAP_0845A394 312 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_B4F_LAVA 312 #define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313 #define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314 #define LAYOUT_EVER_GRANDE_CITY_HALL4 315 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317 #define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318 -#define LAYOUT_UNKNOWN_MAP_0845D470 319 +#define LAYOUT_ROUTE131_SKY_PILLAR 319 #define LAYOUT_SKY_PILLAR_ENTRANCE 320 #define LAYOUT_SKY_PILLAR_OUTSIDE 321 #define LAYOUT_SKY_PILLAR_1F 322 #define LAYOUT_SKY_PILLAR_2F 323 #define LAYOUT_SKY_PILLAR_3F 324 #define LAYOUT_SKY_PILLAR_4F 325 -#define LAYOUT_UNKNOWN_MAP_0845ECB4 326 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM9_LAVA 326 #define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327 #define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328 #define LAYOUT_SAFARI_ZONE_REST_HOUSE 329 @@ -357,9 +357,9 @@ #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355 #define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356 -#define LAYOUT_UNKNOWN_MAP_08469200 357 +#define LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE 357 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358 -#define LAYOUT_UNKNOWN_MAP_084693AC 359 +#define LAYOUT_UNKNOWN_084693AC 359 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 #define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 #define LAYOUT_BATTLE_PYRAMID_SQUARE01 362 @@ -432,15 +432,15 @@ #define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429 #define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430 #define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431 -#define LAYOUT_UNKNOWN_MAP_08480DAC 432 -#define LAYOUT_UNKNOWN_MAP_08480F54 433 -#define LAYOUT_UNKNOWN_MAP_084810FC 434 -#define LAYOUT_UNKNOWN_MAP_084812A4 435 -#define LAYOUT_UNKNOWN_MAP_0848144C 436 -#define LAYOUT_UNKNOWN_MAP_084815F4 437 -#define LAYOUT_UNKNOWN_MAP_08481B24 438 +#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE 432 +#define LAYOUT_SKY_PILLAR_1F_CLEAN 433 +#define LAYOUT_SKY_PILLAR_2F_CLEAN 434 +#define LAYOUT_SKY_PILLAR_3F_CLEAN 435 +#define LAYOUT_SKY_PILLAR_4F_CLEAN 436 +#define LAYOUT_SKY_PILLAR_5F_CLEAN 437 +#define LAYOUT_SKY_PILLAR_TOP_CLEAN 438 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 -#define LAYOUT_UNKNOWN_MAP_08481DBC 441 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441 #endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/src/battle_pike.c b/src/battle_pike.c index f2f2025d7..cc58b81bb 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -1337,7 +1337,7 @@ bool8 InBattlePike(void) return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 - || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; + || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_084693AC; } static void SetHintedRoom(void)