From 4ab87bf8f3fd527d0b5120344f84b73d309693db Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Jun 2018 18:50:31 -0500 Subject: [PATCH 1/9] Fetch calcrom webhook details from travis environment --- .travis/calcrom/webhook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/calcrom/webhook.sh b/.travis/calcrom/webhook.sh index 336a8103e9..86da74c873 100755 --- a/.travis/calcrom/webhook.sh +++ b/.travis/calcrom/webhook.sh @@ -13,4 +13,4 @@ if [ ! -f $map_file ]; then fi output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') -curl -d "{\"username\": \"OK\", \"avatar_url\": \"https://i.imgur.com/38BQHdd.png\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST https://discordapp.com/api/webhooks/340931107060973570/$DISCORD_WEBHOOK_KEY +curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST $CALCROM_DISCORD_WEBHOOK_URL From 0fe3e612ebd3e7f49f930f7ae40aa9d9267862fa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Jun 2018 12:30:09 +0200 Subject: [PATCH 2/9] battle tent start and create frontier struct in saveblock --- asm/battle_tent.s | 580 -------------------------- data/battle_tent.s | 51 --- include/battle_frontier_2.h | 3 + include/battle_tower.h | 15 + include/global.h | 112 ++--- include/new_game.h | 5 - ld_script.txt | 3 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controllers.c | 4 +- src/battle_main.c | 10 +- src/battle_setup.c | 4 +- src/battle_tent.c | 267 ++++++++++++ src/item.c | 16 +- src/map_name_popup.c | 2 +- src/new_game.c | 43 +- src/pokemon.c | 4 +- src/record_mixing.c | 28 +- src/recorded_battle.c | 8 +- src/start_menu.c | 82 ++-- src/tv.c | 22 +- src/wild_encounter.c | 4 +- 23 files changed, 464 insertions(+), 805 deletions(-) delete mode 100644 data/battle_tent.s create mode 100644 src/battle_tent.c diff --git a/asm/battle_tent.s b/asm/battle_tent.s index 8253d4f985..c967390d08 100644 --- a/asm/battle_tent.s +++ b/asm/battle_tent.s @@ -5,586 +5,6 @@ .text - thumb_func_start sub_81B99B4 -sub_81B99B4: @ 81B99B4 - push {lr} - ldr r1, =gUnknown_086160B4 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B99B4 - - thumb_func_start sub_81B99D4 -sub_81B99D4: @ 81B99D4 - push {lr} - ldr r1, =gSaveBlock2Ptr - ldr r0, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - movs r2, 0 - strb r2, [r0] - ldr r1, [r1] - ldr r3, =0x00000cb2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - movs r3, 0x1 - negs r3, r3 - movs r0, 0 - bl saved_warp2_set - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B99D4 - - thumb_func_start sub_81B9A28 -sub_81B9A28: @ 81B9A28 - ldr r1, =gSpecialVar_Result - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r2, =0x00000e6a - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81B9A28 - - thumb_func_start sub_81B9A44 -sub_81B9A44: @ 81B9A44 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =gSpecialVar_0x8006 - ldrh r1, [r1] - ldr r2, =0x00000e6a - adds r0, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81B9A44 - - thumb_func_start sub_81B9A60 -sub_81B9A60: @ 81B9A60 - push {r4,lr} - ldr r4, =gTrainerBattleOpponent_A - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xFF - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - lsls r1, r0, 2 - adds r1, r0 - lsrs r1, 6 - strh r1, [r4] - ldrh r0, [r4] - movs r1, 0 - bl sub_8162614 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9A60 - - thumb_func_start sub_81B9A90 -sub_81B9A90: @ 81B9A90 - push {lr} - ldr r3, =gTrainerBattleOpponent_A - ldrh r1, [r3] - ldr r0, =0x0000012b - cmp r1, r0 - bhi _081B9AAC - ldr r2, =gUnknown_0203BC88 - movs r0, 0x34 - muls r1, r0 - ldr r0, [r2] - adds r0, r1 - adds r0, 0xC - bl ConvertBattleFrontierTrainerSpeechToString -_081B9AAC: - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9A90 - - thumb_func_start sub_81B9ABC -sub_81B9ABC: @ 81B9ABC - push {r4,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =gSpecialVar_0x8005 - ldrh r1, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - strb r1, [r0] - movs r0, 0x80 - lsls r0, 7 - movs r1, 0 - bl VarSet - ldr r1, [r4] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - bl sub_81A4C30 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9ABC - - thumb_func_start sub_81B9B00 -sub_81B9B00: @ 81B9B00 - push {r4,r5,lr} - ldr r0, =gSaveBlock2Ptr - ldr r4, [r0] - ldr r5, =gUnknown_086160D4 - bl Random - ldrh r0, [r5] - ldr r1, =0x00000e6a - adds r4, r1 - strh r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9B00 - - thumb_func_start sub_81B9B28 -sub_81B9B28: @ 81B9B28 - push {r4,r5,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =0x00000e6a - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - bl AddBagItem - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _081B9B70 - ldr r0, [r4] - ldr r1, =0x00000e6a - adds r0, r1 - ldrh r0, [r0] - ldr r1, =gStringVar1 - bl CopyItemName - ldr r0, [r4] - ldr r1, =0x00000e6a - adds r0, r1 - movs r1, 0 - strh r1, [r0] - ldr r0, =gSpecialVar_Result - strh r5, [r0] - b _081B9B76 - .pool -_081B9B70: - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] -_081B9B76: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9B28 - - thumb_func_start sub_81B9B80 -sub_81B9B80: @ 81B9B80 - push {lr} - ldr r1, =gUnknown_086160D8 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9B80 - - thumb_func_start sub_81B9BA0 -sub_81B9BA0: @ 81B9BA0 - push {lr} - ldr r1, =gSaveBlock2Ptr - ldr r0, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - movs r2, 0 - strb r2, [r0] - ldr r1, [r1] - ldr r3, =0x00000cb2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - movs r3, 0x1 - negs r3, r3 - movs r0, 0 - bl saved_warp2_set - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9BA0 - - thumb_func_start sub_81B9BF4 -sub_81B9BF4: @ 81B9BF4 - ldr r1, =gSpecialVar_Result - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r2, =0x00000e6c - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81B9BF4 - - thumb_func_start sub_81B9C10 -sub_81B9C10: @ 81B9C10 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =gSpecialVar_0x8006 - ldrh r1, [r1] - ldr r2, =0x00000e6c - adds r0, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81B9C10 - - thumb_func_start sub_81B9C2C -sub_81B9C2C: @ 81B9C2C - push {r4,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =gSpecialVar_0x8005 - ldrh r1, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - strb r1, [r0] - movs r0, 0x80 - lsls r0, 7 - movs r1, 0 - bl VarSet - ldr r1, [r4] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - bl sub_81A4C30 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9C2C - - thumb_func_start sub_81B9C70 -sub_81B9C70: @ 81B9C70 - push {r4,r5,lr} - ldr r0, =gSaveBlock2Ptr - ldr r4, [r0] - ldr r5, =gUnknown_086160F4 - bl Random - ldrh r0, [r5] - ldr r1, =0x00000e6c - adds r4, r1 - strh r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9C70 - - thumb_func_start sub_81B9C98 -sub_81B9C98: @ 81B9C98 - push {r4,r5,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =0x00000e6c - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - bl AddBagItem - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _081B9CE0 - ldr r0, [r4] - ldr r1, =0x00000e6c - adds r0, r1 - ldrh r0, [r0] - ldr r1, =gStringVar1 - bl CopyItemName - ldr r0, [r4] - ldr r1, =0x00000e6c - adds r0, r1 - movs r1, 0 - strh r1, [r0] - ldr r0, =gSpecialVar_Result - strh r5, [r0] - b _081B9CE6 - .pool -_081B9CE0: - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] -_081B9CE6: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9C98 - - thumb_func_start sub_81B9CF0 -sub_81B9CF0: @ 81B9CF0 - push {lr} - ldr r0, =gStringVar1 - ldr r1, =gTrainerBattleOpponent_A - ldrh r1, [r1] - bl GetFrontierTrainerName - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9CF0 - - thumb_func_start sub_81B9D08 -sub_81B9D08: @ 81B9D08 - push {lr} - ldr r1, =gUnknown_086160F8 - ldr r0, =gSpecialVar_0x8004 - ldrh r0, [r0] - lsls r0, 2 - adds r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9D08 - - thumb_func_start sub_81B9D28 -sub_81B9D28: @ 81B9D28 - push {lr} - ldr r1, =gSaveBlock2Ptr - ldr r0, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - movs r2, 0 - strb r2, [r0] - ldr r1, [r1] - ldr r3, =0x00000cb2 - adds r0, r1, r3 - strh r2, [r0] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r2, [r1] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - strb r0, [r1] - ldr r0, =gSaveBlock1Ptr - ldr r0, [r0] - movs r1, 0x4 - ldrsb r1, [r0, r1] - movs r2, 0x5 - ldrsb r2, [r0, r2] - movs r3, 0x1 - negs r3, r3 - movs r0, 0 - bl saved_warp2_set - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9D28 - - thumb_func_start sub_81B9D7C -sub_81B9D7C: @ 81B9D7C - ldr r1, =gSpecialVar_Result - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r2, =0x00000e6e - adds r0, r2 - ldrh r0, [r0] - strh r0, [r1] - bx lr - .pool - thumb_func_end sub_81B9D7C - - thumb_func_start sub_81B9D98 -sub_81B9D98: @ 81B9D98 - ldr r0, =gSaveBlock2Ptr - ldr r0, [r0] - ldr r1, =gSpecialVar_0x8006 - ldrh r1, [r1] - ldr r2, =0x00000e6e - adds r0, r2 - strh r1, [r0] - bx lr - .pool - thumb_func_end sub_81B9D98 - - thumb_func_start sub_81B9DB4 -sub_81B9DB4: @ 81B9DB4 - push {r4,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =gSpecialVar_0x8005 - ldrh r1, [r1] - ldr r2, =0x00000ca8 - adds r0, r2 - strb r1, [r0] - movs r0, 0x80 - lsls r0, 7 - movs r1, 0 - bl VarSet - ldr r1, [r4] - ldr r0, =0x00000ca9 - adds r1, r0 - ldrb r0, [r1] - movs r2, 0x4 - orrs r0, r2 - strb r0, [r1] - bl sub_81A4C30 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9DB4 - - thumb_func_start sub_81B9DF8 -sub_81B9DF8: @ 81B9DF8 - push {r4,r5,lr} - ldr r0, =gSaveBlock2Ptr - ldr r4, [r0] - ldr r5, =gUnknown_08616120 - bl Random - ldrh r0, [r5] - ldr r1, =0x00000e6e - adds r4, r1 - strh r0, [r4] - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9DF8 - - thumb_func_start sub_81B9E20 -sub_81B9E20: @ 81B9E20 - push {r4,r5,lr} - ldr r4, =gSaveBlock2Ptr - ldr r0, [r4] - ldr r1, =0x00000e6e - adds r0, r1 - ldrh r0, [r0] - movs r1, 0x1 - bl AddBagItem - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0x1 - bne _081B9E68 - ldr r0, [r4] - ldr r1, =0x00000e6e - adds r0, r1 - ldrh r0, [r0] - ldr r1, =gStringVar1 - bl CopyItemName - ldr r0, [r4] - ldr r1, =0x00000e6e - adds r0, r1 - movs r1, 0 - strh r1, [r0] - ldr r0, =gSpecialVar_Result - strh r5, [r0] - b _081B9E6E - .pool -_081B9E68: - ldr r1, =gSpecialVar_Result - movs r0, 0 - strh r0, [r1] -_081B9E6E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end sub_81B9E20 - - thumb_func_start sub_81B9E78 -sub_81B9E78: @ 81B9E78 - push {lr} - bl ZeroPlayerPartyMons - bl sub_819A4F8 - pop {r0} - bx r0 - thumb_func_end sub_81B9E78 - - thumb_func_start sub_81B9E88 -sub_81B9E88: @ 81B9E88 - push {lr} - bl sub_819DC00 - pop {r0} - bx r0 - thumb_func_end sub_81B9E88 - - thumb_func_start sub_81B9E94 -sub_81B9E94: @ 81B9E94 - push {lr} - movs r2, 0 - ldr r1, =gMapHeader - ldrb r0, [r1, 0x14] - cmp r0, 0x8 - bne _081B9EB2 - ldr r3, =0xfffffe7f - adds r0, r3, 0 - ldrh r1, [r1, 0x12] - adds r0, r1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _081B9EB2 - movs r2, 0x1 -_081B9EB2: - adds r0, r2, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_81B9E94 thumb_func_start sub_81B9EC0 sub_81B9EC0: @ 81B9EC0 diff --git a/data/battle_tent.s b/data/battle_tent.s deleted file mode 100644 index 06cfac50eb..0000000000 --- a/data/battle_tent.s +++ /dev/null @@ -1,51 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gUnknown_086160B4:: @ 86160B4 - .4byte sub_81B99D4 - .4byte sub_81B9A28 - .4byte sub_81B9A44 - .4byte sub_81B9A60 - .4byte sub_81B9A90 - .4byte sub_81B9ABC - .4byte sub_81B9B00 - .4byte sub_81B9B28 - - .align 2 -gUnknown_086160D4:: @ 86160D4 - .4byte 0x00000008 - - .align 2 -gUnknown_086160D8:: @ 86160D8 - .4byte sub_81B9BA0 - .4byte sub_81B9BF4 - .4byte sub_81B9C10 - .4byte sub_81B9C2C - .4byte sub_81B9C70 - .4byte sub_81B9C98 - .4byte sub_81B9CF0 - - .align 2 -gUnknown_086160F4:: @ 86160F4 - .4byte 0x00000015 - - .align 2 -gUnknown_086160F8:: @ 86160F8 - .4byte sub_81B9D28 - .4byte sub_81B9D7C - .4byte sub_81B9D98 - .4byte sub_81B9DB4 - .4byte sub_81B9DF8 - .4byte sub_81B9E20 - .4byte sub_81B9E78 - .4byte sub_81B9E88 - .4byte sub_81BA040 - .4byte sub_81B9EC0 - - .align 2 -gUnknown_08616120:: @ 8616120 - .4byte 0x00000017 - diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h index 3f8f8049d3..d410749b9a 100644 --- a/include/battle_frontier_2.h +++ b/include/battle_frontier_2.h @@ -8,5 +8,8 @@ void sub_81A8AF8(void); bool8 InBattlePike(void); void sub_819FA50(void); void sub_81AA078(u16*, u8); +void sub_81A4C30(void); +void sub_819A4F8(void); +void sub_819DC00(void); #endif // GUARD_BATTLE_FRONTIER_2_H diff --git a/include/battle_tower.h b/include/battle_tower.h index 9d45531324..d8a3dc9a8d 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -22,10 +22,25 @@ union BattleTowerRecord struct EmeraldBattleTowerRecord emerald; }; +struct BattleFrontierTrainer +{ + u32 trainerClass; + u8 trainerName[8]; + u16 speechBefore[6]; + u16 speechWin[6]; + u16 speechLose[6]; + u16 *btMonPool; +}; + +extern struct BattleFrontierTrainer *gUnknown_0203BC88; + u16 sub_8164FCC(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void sub_81628A0(union BattleTowerRecord *); +void sub_8162614(u16 trainerId, u8); +void ConvertBattleFrontierTrainerSpeechToString(u16 *words); +void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/global.h b/include/global.h index d26184270a..b877592bdc 100644 --- a/include/global.h +++ b/include/global.h @@ -314,62 +314,30 @@ struct EmeraldBattleTowerRecord /*0xE8*/ u32 checksum; }; -struct SaveBlock2 +struct BattleFrontier { - /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH]; - /*0x08*/ u8 playerGender; // MALE, FEMALE - /*0x09*/ u8 specialSaveWarp; - /*0x0A*/ u8 playerTrainerId[4]; - /*0x0E*/ u16 playTimeHours; - /*0x10*/ u8 playTimeMinutes; - /*0x11*/ u8 playTimeSeconds; - /*0x12*/ u8 playTimeVBlanks; - /*0x13*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A] - /*0x14*/ u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST] - u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes - u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO] - u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] - u16 optionsBattleSceneOff:1; // whether battle animations are disabled - u16 regionMapZoom:1; // whether the map is zoomed in - /*0x18*/ struct Pokedex pokedex; - /*0x90*/ u8 filler_90[0x8]; - /*0x98*/ struct Time localTimeOffset; - /*0xA0*/ struct Time lastBerryTreeUpdate; - /*0xA8*/ u32 field_A8; - /*0xAC*/ u32 encryptionKey; - - // TODO: fix and verify labels - /*0xB0*/ u8 field_B0; - /*0xB1*/ u8 field_B1; - /*0xB2*/ u8 field_B2_0:3; - /*0xB2*/ u8 field_B2_1:2; - /*0xB3*/ u8 field_B3[0x29]; - /*0xDC*/ struct UnkRecordMixingStruct field_DC[4]; - /*0x1EC*/ struct BerryCrush berryCrush; - /*0x1FC*/ struct PokemonJumpResults pokeJump; - /*0x20C*/ struct BerryPickingResults berryPick; - /*0x21C*/ u8 field_21C[1032]; - /*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array - - // All below could be a one giant struct - /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; /*0x738*/ struct UnknownSaveBlock2Struct field_738[5]; // No idea here, it's probably wrong, no clue. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; - /*0xBE3*/ u8 filler_BE3[8]; + /*0xBE3*/ u8 field_BE3[8]; /*0xBEB*/ u8 field_BEB; - /*0xBE3*/ u8 filler_BEC[189]; - /*0xCA9*/ u8 frontierChosenLvl : 2; // 0x1, 0x2 -> 0x3 - /*0xCA9*/ u8 field_CA9_a : 1; // 0x4 - /*0xCA9*/ u8 field_CA9_b : 1; // 0x8 - /*0xCA9*/ u8 field_CA9_c : 1; // 0x10 - /*0xCA9*/ u8 field_CA9_d : 1; // 0x20 - /*0xCA9*/ u8 field_CA9_e : 1; // 0x40 - /*0xCA9*/ u8 field_CA9_f : 1; // 0x80 + /*0xBEC*/ u8 filler_BEC[16]; + /*0xBFC*/ u16 ecwords_BFC[6]; + /*0xC08*/ u16 ecwords_C08[6]; + /*0xC14*/ u16 ecwords_C14[6]; + /*0xC20*/ u8 filler_C20[0x88]; + /*0xCA8*/ u8 field_CA8; + /*0xCA9*/ u8 chosenLvl:2; // 0x1, 0x2 -> 0x3 + /*0xCA9*/ u8 field_CA9_a:1; // 0x4 + /*0xCA9*/ u8 field_CA9_b:1; // 0x8 + /*0xCA9*/ u8 field_CA9_c:1; // 0x10 + /*0xCA9*/ u8 field_CA9_d:1; // 0x20 + /*0xCA9*/ u8 field_CA9_e:1; // 0x40 + /*0xCA9*/ u8 field_CA9_f:1; // 0x80 /*0xCAA*/ u16 field_CAA[4]; - /*0xCB2*/ u16 battlePyramidWildHeaderId; + /*0xCB2*/ u16 field_CB2; /*0xCB4*/ u16 field_CB4[30]; /*0xCF0*/ u16 field_CF0[2]; /*0xCF4*/ u16 field_CF4[2]; @@ -416,21 +384,61 @@ struct SaveBlock2 /*0xE04*/ u16 field_E04; /*0xE06*/ u16 field_E06; /*0xE08*/ u16 field_E08[9]; - /*0xE1A*/ u16 battlePyramidFloor; // possibly? + /*0xE1A*/ u16 field_E1A; /*0xE1C*/ u16 field_E1C; /*0xE1E*/ u16 field_E1E[7]; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0x???*/ u8 field_unkown[6]; - /*0xE6E*/ u16 battleTentWinStreak; + /*0xE58*/ u16 field_E58; + /*0xE6A*/ u16 field_E6A; + /*0xE6C*/ u16 field_E6C; + /*0xE6E*/ u16 field_E6E; /*0xE70*/ u8 field_E70[72]; /*0xEB8*/ u16 frontierBattlePoints; /*0xEBA*/ u8 field_EBA[39]; /*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH]; /*0xEF1*/ u8 field_EF1[2][4]; /*0xEF9*/ u8 field_EF9[51]; - // sizeof=0xF2C }; +struct SaveBlock2 +{ + /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH]; + /*0x08*/ u8 playerGender; // MALE, FEMALE + /*0x09*/ u8 specialSaveWarp; + /*0x0A*/ u8 playerTrainerId[4]; + /*0x0E*/ u16 playTimeHours; + /*0x10*/ u8 playTimeMinutes; + /*0x11*/ u8 playTimeSeconds; + /*0x12*/ u8 playTimeVBlanks; + /*0x13*/ u8 optionsButtonMode; // OPTIONS_BUTTON_MODE_[NORMAL/LR/L_EQUALS_A] + /*0x14*/ u16 optionsTextSpeed:3; // OPTIONS_TEXT_SPEED_[SLOW/MID/FAST] + u16 optionsWindowFrameType:5; // Specifies one of the 20 decorative borders for text boxes + u16 optionsSound:1; // OPTIONS_SOUND_[MONO/STEREO] + u16 optionsBattleStyle:1; // OPTIONS_BATTLE_STYLE_[SHIFT/SET] + u16 optionsBattleSceneOff:1; // whether battle animations are disabled + u16 regionMapZoom:1; // whether the map is zoomed in + /*0x18*/ struct Pokedex pokedex; + /*0x90*/ u8 filler_90[0x8]; + /*0x98*/ struct Time localTimeOffset; + /*0xA0*/ struct Time lastBerryTreeUpdate; + /*0xA8*/ u32 field_A8; + /*0xAC*/ u32 encryptionKey; + + // TODO: fix and verify labels + /*0xB0*/ u8 field_B0; + /*0xB1*/ u8 field_B1; + /*0xB2*/ u8 field_B2_0:3; + /*0xB2*/ u8 field_B2_1:2; + /*0xB3*/ u8 field_B3[0x29]; + /*0xDC*/ struct UnkRecordMixingStruct field_DC[4]; + /*0x1EC*/ struct BerryCrush berryCrush; + /*0x1FC*/ struct PokemonJumpResults pokeJump; + /*0x20C*/ struct BerryPickingResults berryPick; + /*0x21C*/ u8 field_21C[1032]; + /*0x624*/ u16 contestLinkResults[20]; // 4 positions for 5 categories, possibly a struct or a 2d array + /*0x64C*/ struct BattleFrontier frontier; +}; // sizeof=0xF2C + extern struct SaveBlock2 *gSaveBlock2Ptr; struct SecretBaseParty diff --git a/include/new_game.h b/include/new_game.h index 2088d1826e..7e1169ec33 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -4,12 +4,7 @@ void WriteUnalignedWord(u32 var, u8 *dataPtr); u32 ReadUnalignedWord(u8* dataPtr); void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom); -void InitPlayerTrainerId(void); -void SetDefaultOptions(void); -void ClearPokedexFlags(void); -void WarpToTruck(void); void NewGameInitData(void); -void ResetMiniGamesResults(void); void sub_808447C(void); void Sav2_ClearSetDefault(void); diff --git a/ld_script.txt b/ld_script.txt index 1949d04809..566059e20e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -246,6 +246,7 @@ SECTIONS { src/save_location.o(.text); src/item_icon.o(.text); asm/party_menu.o(.text); + src/battle_tent.o(.text); asm/battle_tent.o(.text); src/unk_text_util_2.o(.text); src/multiboot.o(.text); @@ -518,7 +519,7 @@ SECTIONS { src/save_location.o(.rodata); src/item_icon.o(.rodata); data/party_menu.o(.rodata); - data/battle_tent.o(.rodata); + src/battle_tent.o(.rodata); src/unk_text_util_2.o(.rodata); src/unk_81BAD84.o(.rodata); src/battle_controller_player_partner.o(.rodata); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index a4aac55e2f..e81fcabe6d 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1854,7 +1854,7 @@ static void LinkOpponentHandleCmd55(void) else gBattleOutcome = gBattleBufferA[gActiveBattler][1] ^ B_OUTCOME_DREW; - gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); LinkOpponentBufferExecCompleted(); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index d742d5df22..aaaaebd8d9 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1684,7 +1684,7 @@ static void LinkPartnerHandleCmd55(void) { sub_81851A8(&gBattleBufferA[gActiveBattler][4]); gBattleOutcome = gBattleBufferA[gActiveBattler][1]; - gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); LinkPartnerBufferExecCompleted(); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index e0694029aa..9fc0c68eac 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -3104,7 +3104,7 @@ static void PlayerHandleCmd55(void) { sub_81851A8(&gBattleBufferA[gActiveBattler][4]); gBattleOutcome = gBattleBufferA[gActiveBattler][1]; - gSaveBlock2Ptr->field_CA9_b = gBattleBufferA[gActiveBattler][2]; + gSaveBlock2Ptr->frontier.field_CA9_b = gBattleBufferA[gActiveBattler][2]; FadeOutMapMusic(5); BeginFastPaletteFade(3); PlayerBufferExecCompleted(); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 2b918d0180..0a712c79b2 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1515,8 +1515,8 @@ void BtlController_EmitCmd55(u8 bufferId, u8 arg1) { sBattleBuffersTransferData[0] = CONTROLLER_55; sBattleBuffersTransferData[1] = arg1; - sBattleBuffersTransferData[2] = gSaveBlock2Ptr->field_CA9_b; - sBattleBuffersTransferData[3] = gSaveBlock2Ptr->field_CA9_b; + sBattleBuffersTransferData[2] = gSaveBlock2Ptr->frontier.field_CA9_b; + sBattleBuffersTransferData[3] = gSaveBlock2Ptr->frontier.field_CA9_b; sBattleBuffersTransferData[5] = sBattleBuffersTransferData[4] = sub_81850DC(&sBattleBuffersTransferData[6]); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, sBattleBuffersTransferData[4] + 6); } diff --git a/src/battle_main.c b/src/battle_main.c index 8649209c0f..ace481c26e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -676,7 +676,7 @@ static void CB2_InitBattleInternal(void) } gMain.inBattle = TRUE; - gSaveBlock2Ptr->field_CA9_b = 0; + gSaveBlock2Ptr->frontier.field_CA9_b = 0; for (i = 0; i < 6; i++) AdjustFriendship(&gPlayerParty[i], 3); @@ -2273,7 +2273,7 @@ static void sub_8038F34(void) for (i = 0; i < monsCount && (gLinkPlayers[i].version & 0xFF) == VERSION_EMERALD; i++); - if (!gSaveBlock2Ptr->field_CA9_b && i == monsCount) + if (!gSaveBlock2Ptr->frontier.field_CA9_b && i == monsCount) { if (FlagGet(FLAG_SYS_FRONTIER_PASS)) { @@ -5015,7 +5015,7 @@ static void HandleEndTurn_BattleLost(void) { gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle; gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN); - gSaveBlock2Ptr->field_CA9_b = 1; + gSaveBlock2Ptr->frontier.field_CA9_b = 1; } else { @@ -5047,7 +5047,7 @@ static void HandleEndTurn_RanFromBattle(void) { gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeited; gBattleOutcome = B_OUTCOME_FORFEITED; - gSaveBlock2Ptr->field_CA9_b = 1; + gSaveBlock2Ptr->frontier.field_CA9_b = 1; } else if (gBattleTypeFlags & BATTLE_TYPE_x4000000) { @@ -5666,7 +5666,7 @@ static void HandleAction_Run(void) } gBattleOutcome |= B_OUTCOME_LINK_BATTLE_RAN; - gSaveBlock2Ptr->field_CA9_b = 1; + gSaveBlock2Ptr->frontier.field_CA9_b = 1; } else { diff --git a/src/battle_setup.c b/src/battle_setup.c index ccc36b7c27..c8440a35fd 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -883,8 +883,8 @@ u8 sub_80B100C(s32 arg0) return sUnknown_0854FE98[Random() % ARRAY_COUNT(sUnknown_0854FE98)]; } - var = gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 0] - + gSaveBlock2Ptr->field_CB4[gSaveBlock2Ptr->battlePyramidWildHeaderId * 2 + 1]; + var = gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.field_CB2 * 2 + 0] + + gSaveBlock2Ptr->frontier.field_CB4[gSaveBlock2Ptr->frontier.field_CB2 * 2 + 1]; return sUnknown_0854FE98[var % ARRAY_COUNT(sUnknown_0854FE98)]; } diff --git a/src/battle_tent.c b/src/battle_tent.c new file mode 100644 index 0000000000..85640e8e5b --- /dev/null +++ b/src/battle_tent.c @@ -0,0 +1,267 @@ +#include "global.h" +#include "overworld.h" +#include "event_data.h" +#include "region_map.h" +#include "battle.h" +#include "battle_setup.h" +#include "battle_tower.h" +#include "battle_frontier_2.h" +#include "random.h" +#include "item.h" +#include "constants/items.h" + +// this file's functions +void sub_81B99D4(void); +void sub_81B9A28(void); +void sub_81B9A44(void); +void sub_81B9A60(void); +void sub_81B9A90(void); +void sub_81B9ABC(void); +void sub_81B9B00(void); +void sub_81B9B28(void); +void sub_81B9BA0(void); +void sub_81B9BF4(void); +void sub_81B9C10(void); +void sub_81B9C2C(void); +void sub_81B9C70(void); +void sub_81B9C98(void); +void sub_81B9CF0(void); +void sub_81B9D28(void); +void sub_81B9D7C(void); +void sub_81B9D98(void); +void sub_81B9DB4(void); +void sub_81B9DF8(void); +void sub_81B9E20(void); +void sub_81B9E78(void); +void sub_81B9E88(void); +void sub_81BA040(void); +void sub_81B9EC0(void); + +// const rom data +void (*const gUnknown_086160B4[])(void) = +{ + sub_81B99D4, + sub_81B9A28, + sub_81B9A44, + sub_81B9A60, + sub_81B9A90, + sub_81B9ABC, + sub_81B9B00, + sub_81B9B28 +}; + +const u16 gUnknown_086160D4[] = {ITEM_NEST_BALL, ITEM_NONE}; + +void (*const gUnknown_086160D8[])(void) = +{ + sub_81B9BA0, + sub_81B9BF4, + sub_81B9C10, + sub_81B9C2C, + sub_81B9C70, + sub_81B9C98, + sub_81B9CF0 +}; + +const u16 gUnknown_086160F4[] = {ITEM_HYPER_POTION, ITEM_NONE}; + +void (*const gUnknown_086160F8[])(void) = +{ + sub_81B9D28, + sub_81B9D7C, + sub_81B9D98, + sub_81B9DB4, + sub_81B9DF8, + sub_81B9E20, + sub_81B9E78, + sub_81B9E88, + sub_81BA040, + sub_81B9EC0 +}; + +const u16 gUnknown_08616120[] = {ITEM_FULL_HEAL, ITEM_NONE}; + +// code +void sub_81B99B4(void) +{ + gUnknown_086160B4[gSpecialVar_0x8004](); +} + +void sub_81B99D4(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.field_CB2 = 0; + gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; + saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); +} + +void sub_81B9A28(void) +{ + gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6A; +} + +void sub_81B9A44(void) +{ + gSaveBlock2Ptr->frontier.field_E6A = gSpecialVar_0x8006; +} + +void sub_81B9A60(void) +{ + gTrainerBattleOpponent_A = (u32)((Random() % 255) * 5) / 64; + sub_8162614(gTrainerBattleOpponent_A, 0); +} + +void sub_81B9A90(void) +{ + if (gTrainerBattleOpponent_A < 300) + ConvertBattleFrontierTrainerSpeechToString(gUnknown_0203BC88[gTrainerBattleOpponent_A].speechBefore); +} + +void sub_81B9ABC(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + VarSet(VAR_TEMP_0, 0); + gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; + sub_81A4C30(); +} + +void sub_81B9B00(void) +{ + gSaveBlock2Ptr->frontier.field_E6A = gUnknown_086160D4[Random() % 1]; +} + +void sub_81B9B28(void) +{ + if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6A, 1) == TRUE) + { + CopyItemName(gSaveBlock2Ptr->frontier.field_E6A, gStringVar1); + gSaveBlock2Ptr->frontier.field_E6A = ITEM_NONE; + gSpecialVar_Result = TRUE; + } + else + { + gSpecialVar_Result = FALSE; + } +} + +void sub_81B9B80(void) +{ + gUnknown_086160D8[gSpecialVar_0x8004](); +} + +void sub_81B9BA0(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.field_CB2 = 0; + gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; + saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); +} + +void sub_81B9BF4(void) +{ + gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6C; +} + +void sub_81B9C10(void) +{ + gSaveBlock2Ptr->frontier.field_E6C = gSpecialVar_0x8006; +} + +void sub_81B9C2C(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + VarSet(VAR_TEMP_0, 0); + gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; + sub_81A4C30(); +} + +void sub_81B9C70(void) +{ + gSaveBlock2Ptr->frontier.field_E6C = gUnknown_086160F4[Random() % 1]; +} + +void sub_81B9C98(void) +{ + if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6C, 1) == TRUE) + { + CopyItemName(gSaveBlock2Ptr->frontier.field_E6C, gStringVar1); + gSaveBlock2Ptr->frontier.field_E6C = ITEM_NONE; + gSpecialVar_Result = TRUE; + } + else + { + gSpecialVar_Result = FALSE; + } +} + +void sub_81B9CF0(void) +{ + GetFrontierTrainerName(gStringVar1, gTrainerBattleOpponent_A); +} + +void sub_81B9D08(void) +{ + gUnknown_086160F8[gSpecialVar_0x8004](); +} + +void sub_81B9D28(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = 0; + gSaveBlock2Ptr->frontier.field_CB2 = 0; + gSaveBlock2Ptr->frontier.field_CA9_a = FALSE; + saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); +} + +void sub_81B9D7C(void) +{ + gSpecialVar_Result = gSaveBlock2Ptr->frontier.field_E6E; +} + +void sub_81B9D98(void) +{ + gSaveBlock2Ptr->frontier.field_E6E = gSpecialVar_0x8006; +} + +void sub_81B9DB4(void) +{ + gSaveBlock2Ptr->frontier.field_CA8 = gSpecialVar_0x8005; + VarSet(VAR_TEMP_0, 0); + gSaveBlock2Ptr->frontier.field_CA9_a = TRUE; + sub_81A4C30(); +} + +void sub_81B9DF8(void) +{ + gSaveBlock2Ptr->frontier.field_E6E = gUnknown_08616120[Random() % 1]; +} + +void sub_81B9E20(void) +{ + if (AddBagItem(gSaveBlock2Ptr->frontier.field_E6E, 1) == TRUE) + { + CopyItemName(gSaveBlock2Ptr->frontier.field_E6E, gStringVar1); + gSaveBlock2Ptr->frontier.field_E6E = ITEM_NONE; + gSpecialVar_Result = TRUE; + } + else + { + gSpecialVar_Result = FALSE; + } +} + +void sub_81B9E78(void) +{ + ZeroPlayerPartyMons(); + sub_819A4F8(); +} + +void sub_81B9E88(void) +{ + sub_819DC00(); +} + +bool8 sub_81B9E94(void) +{ + return (gMapHeader.regionMapSectionId == 8 + && ((gMapHeader.mapDataId == 385) | (gMapHeader.mapDataId == 386))); +} diff --git a/src/item.c b/src/item.c index 319d167fc7..30710d08ac 100644 --- a/src/item.c +++ b/src/item.c @@ -845,8 +845,8 @@ u16 CountTotalItemQuantityInBag(u16 itemId) static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count) { u8 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { @@ -867,8 +867,8 @@ static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count) static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count) { u8 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { @@ -890,8 +890,8 @@ bool8 AddPyramidBagItem(u16 itemId, u16 count) { u16 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; u16 *newItems = Alloc(PYRAMID_BAG_ITEMS_COUNT * sizeof(u16)); u8 *newQuantities = Alloc(PYRAMID_BAG_ITEMS_COUNT * sizeof(u8)); @@ -963,8 +963,8 @@ bool8 RemovePyramidBagItem(u16 itemId, u16 count) { u16 i; - u16 *items = gSaveBlock2Ptr->pyramidBag.itemId[gSaveBlock2Ptr->frontierChosenLvl]; - u8 *quantities = gSaveBlock2Ptr->pyramidBag.quantity[gSaveBlock2Ptr->frontierChosenLvl]; + u16 *items = gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.chosenLvl]; + u8 *quantities = gSaveBlock2Ptr->frontier.pyramidBag.quantity[gSaveBlock2Ptr->frontier.chosenLvl]; i = gUnknown_0203CF30[3] + gUnknown_0203CF30[4]; if (items[i] == itemId && quantities[i] >= count) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 1782e9af82..34415a16ea 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -236,7 +236,7 @@ static void ShowMapNamePopUpWindow(void) else { withoutPrefixPtr = &(mapDisplayHeader[3]); - mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[gSaveBlock2Ptr->battlePyramidWildHeaderId]; + mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[gSaveBlock2Ptr->frontier.field_CB2]; } StringCopy(withoutPrefixPtr, mapDisplayHeaderSource); } diff --git a/src/new_game.c b/src/new_game.c index c387bce65e..8b8436d105 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -31,11 +31,9 @@ extern u8 gUnknown_030060B0; // TODO: replace those declarations with file headers extern u16 GetGeneratedTrainerIdLower(void); extern void ClearContestWinnerPicsInContestHall(void); -extern void warp_in(void); extern void sub_80BB358(void); extern void ResetBagScrollPositions(void); extern void ResetPokedex(void); -extern void sub_8084400(void); extern void ResetGabbyAndTy(void); extern void ResetSecretBases(void); extern void ResetLinkContestBoolean(void); @@ -58,6 +56,19 @@ extern void SetBerryPowder(u32* powder, u32 newValue); extern const u8 EventScript_2715DE[]; +// this file's functions +static void ClearFrontierRecord(void); +static void WarpToTruck(void); +static void ResetMiniGamesResults(void); + +// const rom data +static const struct ContestWinner sContestWinnerPicDummy = +{ + .monName = _(""), + .trainerName = _("") +}; + +// code void WriteUnalignedWord(u32 var, u8 *dataPtr) { dataPtr[0] = var; @@ -78,14 +89,14 @@ void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom) copyTo[i] = copyFrom[i]; } -void InitPlayerTrainerId(void) +static void InitPlayerTrainerId(void) { u32 trainerId = (Random() << 0x10) | GetGeneratedTrainerIdLower(); WriteUnalignedWord(trainerId, gSaveBlock2Ptr->playerTrainerId); } // L=A isnt set here for some reason. -void SetDefaultOptions(void) +static void SetDefaultOptions(void) { gSaveBlock2Ptr->optionsTextSpeed = OPTIONS_TEXT_SPEED_MID; gSaveBlock2Ptr->optionsWindowFrameType = 0; @@ -95,37 +106,31 @@ void SetDefaultOptions(void) gSaveBlock2Ptr->regionMapZoom = FALSE; } -void ClearPokedexFlags(void) +static void ClearPokedexFlags(void) { gUnknown_030060B0 = 0; memset(&gSaveBlock2Ptr->pokedex.owned, 0, sizeof(gSaveBlock2Ptr->pokedex.owned)); memset(&gSaveBlock2Ptr->pokedex.seen, 0, sizeof(gSaveBlock2Ptr->pokedex.seen)); } -const struct ContestWinner gContestWinnerPicDummy = { - .monName = _(""), - .trainerName = _("") -}; - void ClearAllContestWinnerPics(void) { s32 i; ClearContestWinnerPicsInContestHall(); for (i = 8; i < 13; i++) - gSaveBlock1Ptr->contestWinners[i] = gContestWinnerPicDummy; + gSaveBlock1Ptr->contestWinners[i] = sContestWinnerPicDummy; } -void sub_8084400(void) +static void ClearFrontierRecord(void) { - // probably clearing one struct for battle frontier - CpuFill32(0, &gSaveBlock2Ptr->battleTower, 2272); + CpuFill32(0, &gSaveBlock2Ptr->frontier, sizeof(gSaveBlock2Ptr->frontier)); - gSaveBlock2Ptr->field_EE1[0][0] = EOS; - gSaveBlock2Ptr->field_EE1[1][0] = EOS; + gSaveBlock2Ptr->frontier.field_EE1[0][0] = EOS; + gSaveBlock2Ptr->frontier.field_EE1[1][0] = EOS; } -void WarpToTruck(void) +static void WarpToTruck(void) { Overworld_SetWarpDestination(25, 40, -1, -1, -1); // inside of truck warp_in(); @@ -157,7 +162,7 @@ void NewGameInitData(void) ZeroPlayerPartyMons(); ZeroEnemyPartyMons(); ResetPokedex(); - sub_8084400(); + ClearFrontierRecord(); ClearSav1(); ClearMailData(); gSaveBlock2Ptr->specialSaveWarp = 0; @@ -207,7 +212,7 @@ void NewGameInitData(void) ResetContestLinkResults(); } -void ResetMiniGamesResults(void) +static void ResetMiniGamesResults(void) { CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush)); SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0); diff --git a/src/pokemon.c b/src/pokemon.c index 800b7c0cd4..dac8e01975 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1575,8 +1575,8 @@ void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lv u8 language; u8 value; - if (gSaveBlock2Ptr->frontierChosenLvl != 0) - level = BattleFrontierGetOpponentLvl(gSaveBlock2Ptr->frontierChosenLvl); + if (gSaveBlock2Ptr->frontier.chosenLvl != 0) + level = BattleFrontierGetOpponentLvl(gSaveBlock2Ptr->frontier.chosenLvl); else if (lvl50) level = 50; else diff --git a/src/record_mixing.c b/src/record_mixing.c index 35e518d8aa..8b21e214f8 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -197,10 +197,10 @@ static void SetSrcLookupPointers(void) sOldManSave = &gSaveBlock1Ptr->oldMan; sEasyChatPairsSave = gSaveBlock1Ptr->easyChatPairs; gUnknown_03001148 = &gUnknown_02039F9C; - sBattleTowerSave = &gSaveBlock2Ptr->battleTower; + sBattleTowerSave = &gSaveBlock2Ptr->frontier.battleTower; sLilycoveLadySave = &gSaveBlock1Ptr->lilycoveLady; gUnknown_03001154 = gSaveBlock2Ptr->field_DC; - sBattleTowerSave_Duplicate = &gSaveBlock2Ptr->battleTower; + sBattleTowerSave_Duplicate = &gSaveBlock2Ptr->frontier.battleTower; } static void PrepareUnknownExchangePacket(struct PlayerRecordsRS *dest) @@ -1625,24 +1625,24 @@ void sub_80E8260(struct UnkRecordMixingStruct2 *dst) { dst->field_120[j].language = GAME_LANGUAGE; CopyUnalignedWord(dst->field_120[j].playerId1, gSaveBlock2Ptr->playerTrainerId); - CopyUnalignedWord(dst->field_120[j].playerId2, gSaveBlock2Ptr->field_EF1[j]); + CopyUnalignedWord(dst->field_120[j].playerId2, gSaveBlock2Ptr->frontier.field_EF1[j]); StringCopy(dst->field_120[j].playerName1, gSaveBlock2Ptr->playerName); - StringCopy(dst->field_120[j].playerName2, gSaveBlock2Ptr->field_EE1[j]); + StringCopy(dst->field_120[j].playerName2, gSaveBlock2Ptr->frontier.field_EE1[j]); } for (i = 0; i < 2; i++) { - dst->field_0[0][i].field_4 = gSaveBlock2Ptr->field_CF0[i]; - dst->field_0[1][i].field_4 = gSaveBlock2Ptr->field_CF4[i]; - dst->field_0[2][i].field_4 = gSaveBlock2Ptr->field_CF8[i]; - dst->field_0[3][i].field_4 = gSaveBlock2Ptr->field_D14[i]; - dst->field_0[4][i].field_4 = gSaveBlock2Ptr->field_DD0[i]; - dst->field_0[5][i].field_4 = gSaveBlock2Ptr->field_DDE[i]; - dst->field_0[6][i].field_4 = gSaveBlock2Ptr->field_DEA[i]; - dst->field_0[7][i].field_4 = gSaveBlock2Ptr->field_E08[i]; - dst->field_0[8][i].field_4 = gSaveBlock2Ptr->field_E1E[i]; + dst->field_0[0][i].field_4 = gSaveBlock2Ptr->frontier.field_CF0[i]; + dst->field_0[1][i].field_4 = gSaveBlock2Ptr->frontier.field_CF4[i]; + dst->field_0[2][i].field_4 = gSaveBlock2Ptr->frontier.field_CF8[i]; + dst->field_0[3][i].field_4 = gSaveBlock2Ptr->frontier.field_D14[i]; + dst->field_0[4][i].field_4 = gSaveBlock2Ptr->frontier.field_DD0[i]; + dst->field_0[5][i].field_4 = gSaveBlock2Ptr->frontier.field_DDE[i]; + dst->field_0[6][i].field_4 = gSaveBlock2Ptr->frontier.field_DEA[i]; + dst->field_0[7][i].field_4 = gSaveBlock2Ptr->frontier.field_E08[i]; + dst->field_0[8][i].field_4 = gSaveBlock2Ptr->frontier.field_E1E[i]; - dst->field_120[i].field_8 = gSaveBlock2Ptr->field_CFC[i]; + dst->field_120[i].field_8 = gSaveBlock2Ptr->frontier.field_CFC[i]; } } diff --git a/src/recorded_battle.c b/src/recorded_battle.c index eb48ab15a3..a9360d49a1 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -390,7 +390,7 @@ u32 MoveRecordedBattleToSaveData(void) battleSave->opponentB = gTrainerBattleOpponent_B; battleSave->partnerId = gPartnerTrainerId; battleSave->field_4FA = gUnknown_0203C7B4; - battleSave->field_4FC = gSaveBlock2Ptr->field_CA9_b; + battleSave->field_4FC = gSaveBlock2Ptr->frontier.field_CA9_b; battleSave->field_4FD = sUnknown_0203C7AE; battleSave->field_4FE = sUnknown_0203C7AF; battleSave->battleStyle = gSaveBlock2Ptr->optionsBattleStyle; @@ -1293,7 +1293,7 @@ static bool32 AllocTryCopyRecordedBattleSaveData(struct RecordedBattleSave *dst) static void CB2_RecordedBattleEnd(void) { - gSaveBlock2Ptr->frontierChosenLvl = sUnknown_0203C7AD; + gSaveBlock2Ptr->frontier.chosenLvl = sUnknown_0203C7AD; gBattleOutcome = 0; gBattleTypeFlags = 0; gTrainerBattleOpponent_A = 0; @@ -1353,7 +1353,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) gTrainerBattleOpponent_B = src->opponentB; gPartnerTrainerId = src->partnerId; gUnknown_0203C7B4 = src->field_4FA; - sUnknown_0203C7AD = gSaveBlock2Ptr->frontierChosenLvl; + sUnknown_0203C7AD = gSaveBlock2Ptr->frontier.chosenLvl; sUnknown_0203C7AE = src->field_4FD; sUnknown_0203C7AF = src->field_4FE; sRecordedBattle_BattleStyle = src->battleStyle; @@ -1375,7 +1375,7 @@ static void SetRecordedBattleVarsFromSave(struct RecordedBattleSave *src) sUnknown_0203CCDC[i] = src->field_50E[i]; } - gSaveBlock2Ptr->frontierChosenLvl = src->field_4FC; + gSaveBlock2Ptr->frontier.chosenLvl = src->field_4FC; for (i = 0; i < MAX_BATTLERS_COUNT; i++) { diff --git a/src/start_menu.c b/src/start_menu.c index 7080ae6a83..dad1078872 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -288,14 +288,14 @@ static void BuildNormalStartMenu(void) { AddStartMenuAction(MENU_ACTION_POKEMON); } - + AddStartMenuAction(MENU_ACTION_BAG); if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) { AddStartMenuAction(MENU_ACTION_POKENAV); } - + AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); AddStartMenuAction(MENU_ACTION_OPTION); @@ -322,7 +322,7 @@ static void BuildLinkModeStartMenu(void) { AddStartMenuAction(MENU_ACTION_POKENAV); } - + AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); AddStartMenuAction(MENU_ACTION_EXIT); @@ -384,18 +384,14 @@ static void ShowSafariBallsWindow(void) static void ShowPyramidFloorWindow(void) { - if (gSaveBlock2Ptr->field_CAA[4] == 7) // TODO: fix location - { + if (gSaveBlock2Ptr->frontier.field_CB2 == 7) sBattlePyramidFloorWindowId = AddWindow(&sPyramidFloorWindowTemplate_1); - } else - { sBattlePyramidFloorWindowId = AddWindow(&sPyramidFloorWindowTemplate_2); - } PutWindowTilemap(sBattlePyramidFloorWindowId); NewMenuHelpers_DrawStdWindowFrame(sBattlePyramidFloorWindowId, FALSE); - StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->field_CAA[4]]); + StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->frontier.field_CB2]); StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); CopyWindowToVram(sBattlePyramidFloorWindowId, 2); @@ -419,7 +415,7 @@ static void RemoveExtraStartMenuWindows(void) static bool32 PrintStartMenuActions(s8 *pIndex, u32 count) { s8 index = *pIndex; - + do { if (sStartMenuItems[sCurrentStartMenuActions[index]].func.u8_void == StartMenuPlayerNameCallback) { @@ -444,11 +440,11 @@ static bool32 PrintStartMenuActions(s8 *pIndex, u32 count) return FALSE; } -static bool32 InitStartMenuStep(void) +static bool32 InitStartMenuStep(void) { s8 value = sUnknown_02037619[0]; - switch (value) + switch (value) { case 0: sUnknown_02037619[0]++; @@ -468,14 +464,14 @@ static bool32 InitStartMenuStep(void) { ShowSafariBallsWindow(); } - if (InBattlePyramid() != FALSE) + if (InBattlePyramid() != FALSE) { ShowPyramidFloorWindow(); } sUnknown_02037619[0]++; break; case 4: - if (PrintStartMenuActions(&sUnknown_02037619[1], 2) == FALSE) + if (PrintStartMenuActions(&sUnknown_02037619[1], 2) == FALSE) { break; } @@ -515,7 +511,7 @@ static void CreateStartMenuTask(TaskFunc followupFunc) SetTaskFuncWithFollowupFunc(taskId, StartMenuTask, followupFunc); } -static bool8 sub_809FA00(void) +static bool8 sub_809FA00(void) { if (InitStartMenuStep() == FALSE) { @@ -537,7 +533,7 @@ void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s { struct Task* task = &gTasks[taskId]; - switch(task->data[0]) + switch(task->data[0]) { case 0: if (InUnionRoom() == TRUE) @@ -576,13 +572,13 @@ static bool8 HandleStartMenuInput(void) PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(-1); } - + if (gMain.newKeys & DPAD_DOWN) { PlaySE(SE_SELECT); sStartMenuCursorPos = MoveMenuCursor(1); } - + if (gMain.newKeys & A_BUTTON) { PlaySE(SE_SELECT); @@ -592,20 +588,20 @@ static bool8 HandleStartMenuInput(void) return FALSE; } } - + gMenuCallback = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func.u8_void; - - if (gMenuCallback != StartMenuSaveCallback + + if (gMenuCallback != StartMenuSaveCallback && gMenuCallback != StartMenuExitCallback && gMenuCallback != StartMenuSafariZoneRetireCallback && gMenuCallback != StartMenuBattlePyramidRetireCallback) { FadeScreen(1, 0); } - + return FALSE; } - + if (gMain.newKeys & (START_BUTTON | B_BUTTON)) { RemoveExtraStartMenuWindows(); @@ -625,10 +621,10 @@ static bool8 StartMenuPokedexCallback(void) RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(sub_80BB534); // Display pokedex - + return TRUE; } - + return FALSE; } @@ -640,7 +636,7 @@ static bool8 StartMenuPokemonCallback(void) RemoveExtraStartMenuWindows(); overworld_free_bg_tilemaps(); SetMainCallback2(CB2_PartyMenuFromStartMenu); // Display party menu - + return TRUE; } @@ -693,7 +689,7 @@ static bool8 StartMenuPlayerNameCallback(void) { sub_80C51C4(CB2_ReturnToFieldWithOpenMenu); // Display frontier pass } - else + else { sub_80C4DDC(CB2_ReturnToFieldWithOpenMenu); // Display trainer card } @@ -736,7 +732,7 @@ static bool8 StartMenuExitCallback(void) { RemoveExtraStartMenuWindows(); HideStartMenu(); // Hide start menu - + return TRUE; } @@ -911,7 +907,7 @@ static void SaveGameTask(u8 taskId) case SAVE_IN_PROGRESS: return; } - + DestroyTask(taskId); EnableBothScriptContexts(); } @@ -972,7 +968,7 @@ static u8 SaveConfirmSaveCallback(void) { ShowSaveMessage(gText_BattlePyramidConfirmRest, SaveYesNoCallback); } - else + else { ShowSaveMessage(gText_ConfirmSave, SaveYesNoCallback); } @@ -1025,7 +1021,7 @@ static u8 SaveFileExistsCallback(void) { ShowSaveMessage(gText_DifferentSaveFile, SaveConfirmOverwriteNoCallback); } - else + else { ShowSaveMessage(gText_AlreadySavedFile, SaveConfirmOverwriteCallback); } @@ -1082,7 +1078,7 @@ static u8 SaveDoSaveCallback(void) saveStatus = TrySavingData(SAVE_OVERWRITE_DIFFERENT_FILE); gDifferentSaveFile = FALSE; } - else + else { saveStatus = TrySavingData(SAVE_NORMAL); } @@ -1118,7 +1114,7 @@ static u8 SaveReturnSuccessCallback(void) HideSaveInfoWindow(); return SAVE_SUCCESS; } - else + else { return SAVE_IN_PROGRESS; } @@ -1131,13 +1127,13 @@ static u8 SaveErrorCallback(void) PlaySE(SE_BOO); sSaveDialogCallback = SaveReturnErrorCallback; } - + return SAVE_IN_PROGRESS; } static u8 SaveReturnErrorCallback(void) { - if (!SaveErrorTimer()) + if (!SaveErrorTimer()) { return SAVE_IN_PROGRESS; } @@ -1182,7 +1178,7 @@ static u8 BattlePyramidRetireInputCallback(void) sub_80A0014(); return SAVE_SUCCESS; } - + return SAVE_IN_PROGRESS; } @@ -1254,8 +1250,8 @@ static void sub_80A0550(u8 taskId) { case 0: FillWindowPixelBuffer(0, 17); - AddTextPrinterParameterized(0, - 1, + AddTextPrinterParameterized(0, + 1, gText_SavingDontTurnOffPower, 255, NULL, @@ -1266,14 +1262,14 @@ static void sub_80A0550(u8 taskId) PutWindowTilemap(0); CopyWindowToVram(0, 3); BeginNormalPaletteFade(-1, 0, 16, 0, 0); - + if (gWirelessCommType != 0 && InUnionRoom()) { if (sub_800A07C()) { *step = 1; } - else + else { *step = 5; } @@ -1327,7 +1323,7 @@ static void ShowSaveInfoWindow(void) u8 color; u32 xOffset; u32 yOffset; - + if (!FlagGet(FLAG_SYS_POKEDEX_GET)) { saveInfoWindow.height -= 2; @@ -1340,7 +1336,7 @@ static void ShowSaveInfoWindow(void) color = TEXT_COLOR_RED; // Red when female, blue when male. if (gender == MALE) - { + { color = TEXT_COLOR_BLUE; } @@ -1423,4 +1419,4 @@ void AppendToList(u8 *list, u8 *pos, u8 newEntry) { list[*pos] = newEntry; (*pos)++; -} \ No newline at end of file +} diff --git a/src/tv.c b/src/tv.c index 2219a720b6..297754dfb4 100644 --- a/src/tv.c +++ b/src/tv.c @@ -1541,12 +1541,12 @@ static void InterviewAfter_BravoTrainerBattleTowerProfile(void) show->bravoTrainerTower.kind = TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE; show->bravoTrainerTower.active = TRUE; StringCopy(show->bravoTrainerTower.trainerName, gSaveBlock2Ptr->playerName); - StringCopy(show->bravoTrainerTower.pokemonName, gSaveBlock2Ptr->field_BD8); - show->bravoTrainerTower.species = gSaveBlock2Ptr->field_BD4; - show->bravoTrainerTower.defeatedSpecies = gSaveBlock2Ptr->field_BD6; - show->bravoTrainerTower.numFights = sub_8164FCC(gSaveBlock2Ptr->field_D07, 0); - show->bravoTrainerTower.wonTheChallenge = gSaveBlock2Ptr->field_D06; - if (gSaveBlock2Ptr->field_D07 == 0) + StringCopy(show->bravoTrainerTower.pokemonName, gSaveBlock2Ptr->frontier.field_BD8); + show->bravoTrainerTower.species = gSaveBlock2Ptr->frontier.field_BD4; + show->bravoTrainerTower.defeatedSpecies = gSaveBlock2Ptr->frontier.field_BD6; + show->bravoTrainerTower.numFights = sub_8164FCC(gSaveBlock2Ptr->frontier.field_D07, 0); + show->bravoTrainerTower.wonTheChallenge = gSaveBlock2Ptr->frontier.field_D06; + if (gSaveBlock2Ptr->frontier.field_D07 == 0) { show->bravoTrainerTower.btLevel = 50; } @@ -1557,13 +1557,13 @@ static void InterviewAfter_BravoTrainerBattleTowerProfile(void) show->bravoTrainerTower.interviewResponse = gSpecialVar_0x8004; tv_store_id_2x(show); show->bravoTrainerTower.language = gGameLanguage; - if (show->bravoTrainerTower.language == LANGUAGE_JAPANESE || gSaveBlock2Ptr->field_BEB == LANGUAGE_JAPANESE) + if (show->bravoTrainerTower.language == LANGUAGE_JAPANESE || gSaveBlock2Ptr->frontier.field_BEB == LANGUAGE_JAPANESE) { show->bravoTrainerTower.pokemonNameLanguage = LANGUAGE_JAPANESE; } else { - show->bravoTrainerTower.pokemonNameLanguage = gSaveBlock2Ptr->field_BEB; + show->bravoTrainerTower.pokemonNameLanguage = gSaveBlock2Ptr->frontier.field_BEB; } } @@ -1972,7 +1972,7 @@ void sub_80EDB44(void) show->rivalTrainer.nGoldSymbols ++; } } - show->rivalTrainer.battlePoints = gSaveBlock2Ptr->frontierBattlePoints; + show->rivalTrainer.battlePoints = gSaveBlock2Ptr->frontier.frontierBattlePoints; StringCopy(show->rivalTrainer.playerName, gSaveBlock2Ptr->playerName); tv_store_id_3x(show); show->rivalTrainer.language = gGameLanguage; @@ -2540,8 +2540,8 @@ void sub_80EE8C8(u16 winStreak, u8 facility) show->frontier.species2 = GetMonData(&gPlayerParty[1], MON_DATA_SPECIES, NULL); break; case 4: - show->frontier.species1 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->field_CAA[0] - 1], MON_DATA_SPECIES, NULL); - show->frontier.species2 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->field_CAA[1] - 1], MON_DATA_SPECIES, NULL); + show->frontier.species1 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.field_CAA[0] - 1], MON_DATA_SPECIES, NULL); + show->frontier.species2 = GetMonData(&gSaveBlock1Ptr->playerParty[gSaveBlock2Ptr->frontier.field_CAA[1] - 1], MON_DATA_SPECIES, NULL); break; } tv_store_id_3x(show); diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 862672e198..97fa186ea5 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -5102,7 +5102,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi } if (gMapHeader.mapDataId == 0x169) { - headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; + headerId = gSaveBlock2Ptr->frontier.field_CB2; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) return FALSE; else if (DoWildEncounterRateTest(gBattlePyramidWildMonHeaders[headerId].landMonsInfo->encounterRate, FALSE) != TRUE) @@ -5240,7 +5240,7 @@ bool8 SweetScentWildEncounter(void) } if (gMapHeader.mapDataId == 0x169) { - headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; + headerId = gSaveBlock2Ptr->frontier.field_CB2; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) return FALSE; From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:17 -0500 Subject: [PATCH 3/9] Move 'map attributes' into 'layouts' --- Makefile | 2 +- data/layouts.inc | 441 + .../AbandonedShip_CaptainsOffice/border.bin | 0 .../AbandonedShip_CaptainsOffice/layout.inc | 16 + .../AbandonedShip_CaptainsOffice/map.bin | Bin .../AbandonedShip_Corridors_1F/border.bin | 0 .../AbandonedShip_Corridors_1F/layout.inc | 16 + .../AbandonedShip_Corridors_1F/map.bin | 0 .../AbandonedShip_Corridors_B1F/border.bin | 0 .../AbandonedShip_Corridors_B1F/layout.inc | 16 + .../AbandonedShip_Corridors_B1F/map.bin | 0 .../AbandonedShip_Deck/border.bin | 0 data/layouts/AbandonedShip_Deck/layout.inc | 16 + .../AbandonedShip_Deck/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../AbandonedShip_HiddenFloorRooms/border.bin | 0 .../AbandonedShip_HiddenFloorRooms/layout.inc | 16 + .../AbandonedShip_HiddenFloorRooms/map.bin | 0 .../AbandonedShip_Room_B1F/border.bin | 0 .../layouts/AbandonedShip_Room_B1F/layout.inc | 16 + .../AbandonedShip_Room_B1F/map.bin | 0 .../AbandonedShip_Rooms2_1F/border.bin | 0 .../AbandonedShip_Rooms2_1F/layout.inc | 16 + .../AbandonedShip_Rooms2_1F/map.bin | 0 .../AbandonedShip_Rooms2_B1F/border.bin | 0 .../AbandonedShip_Rooms2_B1F/layout.inc | 16 + .../AbandonedShip_Rooms2_B1F/map.bin | 0 .../AbandonedShip_Rooms_1F/border.bin | 0 .../layouts/AbandonedShip_Rooms_1F/layout.inc | 16 + .../AbandonedShip_Rooms_1F/map.bin | 0 .../AbandonedShip_Rooms_B1F/border.bin | 0 .../AbandonedShip_Rooms_B1F/layout.inc | 16 + .../AbandonedShip_Rooms_B1F/map.bin | 0 .../AbandonedShip_Underwater1/border.bin | 0 .../AbandonedShip_Underwater1/layout.inc | 16 + .../AbandonedShip_Underwater1/map.bin | 0 .../AbandonedShip_Underwater2/border.bin | 0 .../AbandonedShip_Underwater2/layout.inc | 16 + .../AbandonedShip_Underwater2/map.bin | 0 .../{maps => layouts}/AlteringCave/border.bin | 0 data/layouts/AlteringCave/layout.inc | 16 + data/{maps => layouts}/AlteringCave/map.bin | 0 data/{maps => layouts}/AncientTomb/border.bin | 0 data/layouts/AncientTomb/layout.inc | 16 + data/{maps => layouts}/AncientTomb/map.bin | Bin .../AquaHideout_1F/border.bin | 0 data/layouts/AquaHideout_1F/layout.inc | 16 + data/{maps => layouts}/AquaHideout_1F/map.bin | 0 .../AquaHideout_B1F/border.bin | 0 data/layouts/AquaHideout_B1F/layout.inc | 16 + .../{maps => layouts}/AquaHideout_B1F/map.bin | 0 .../AquaHideout_B2F/border.bin | 0 data/layouts/AquaHideout_B2F/layout.inc | 16 + .../{maps => layouts}/AquaHideout_B2F/map.bin | 0 .../AquaHideout_UnusedRubyMap1/border.bin | 0 .../AquaHideout_UnusedRubyMap1/layout.inc | 16 + .../AquaHideout_UnusedRubyMap1/map.bin | Bin .../AquaHideout_UnusedRubyMap2/border.bin | 0 .../AquaHideout_UnusedRubyMap2/layout.inc | 16 + .../AquaHideout_UnusedRubyMap2/map.bin | 0 .../AquaHideout_UnusedRubyMap3/border.bin | 0 .../AquaHideout_UnusedRubyMap3/layout.inc | 16 + .../AquaHideout_UnusedRubyMap3/map.bin | 0 .../ArtisanCave_1F/border.bin | 0 data/layouts/ArtisanCave_1F/layout.inc | 16 + data/{maps => layouts}/ArtisanCave_1F/map.bin | 0 .../ArtisanCave_B1F/border.bin | 0 data/layouts/ArtisanCave_B1F/layout.inc | 16 + .../{maps => layouts}/ArtisanCave_B1F/map.bin | 0 .../BattleElevator}/border.bin | Bin data/layouts/BattleElevator/layout.inc | 16 + .../BattleElevator}/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleArenaLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleDomeCorridor/map.bin | 0 .../border.bin | Bin .../BattleFrontier_BattleDomeLobby/layout.inc | 16 + .../BattleFrontier_BattleDomeLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleFactoryLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePalaceLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePikeCorridor/map.bin | 0 .../border.bin | Bin .../BattleFrontier_BattlePikeLobby/layout.inc | 16 + .../BattleFrontier_BattlePikeLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePyramidLobby/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattlePyramidTop/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../BattleFrontier_BattleTowerLobby/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../BattleFrontier_Lounge1/border.bin | Bin .../layouts/BattleFrontier_Lounge1/layout.inc | 16 + .../BattleFrontier_Lounge1}/map.bin | 0 .../BattleFrontier_Lounge2/border.bin | Bin .../layouts/BattleFrontier_Lounge2/layout.inc | 16 + .../BattleFrontier_Lounge2}/map.bin | 0 .../BattleFrontier_OutsideEast/border.bin | 0 .../BattleFrontier_OutsideEast/layout.inc | 16 + .../BattleFrontier_OutsideEast/map.bin | Bin .../BattleFrontier_OutsideWest/border.bin | 0 .../BattleFrontier_OutsideWest/layout.inc | 16 + .../BattleFrontier_OutsideWest/map.bin | Bin .../BattleFrontier_RankingHall/border.bin | Bin .../BattleFrontier_RankingHall/layout.inc | 16 + .../BattleFrontier_RankingHall/map.bin | 0 .../BattleFrontier_ReceptionGate/border.bin | Bin .../BattleFrontier_ReceptionGate/layout.inc | 16 + .../BattleFrontier_ReceptionGate/map.bin | Bin .../BattleFrontier_ScottsHouse/border.bin | Bin .../BattleFrontier_ScottsHouse/layout.inc | 16 + .../BattleFrontier_ScottsHouse/map.bin | 0 .../BattlePyramidSquare01/border.bin | Bin data/layouts/BattlePyramidSquare01/layout.inc | 16 + .../BattlePyramidSquare01/map.bin | 0 .../BattlePyramidSquare02/border.bin | Bin data/layouts/BattlePyramidSquare02/layout.inc | 16 + .../BattlePyramidSquare02/map.bin | 0 .../BattlePyramidSquare03/border.bin | Bin data/layouts/BattlePyramidSquare03/layout.inc | 16 + .../BattlePyramidSquare03/map.bin | 0 .../BattlePyramidSquare04/border.bin | Bin data/layouts/BattlePyramidSquare04/layout.inc | 16 + .../BattlePyramidSquare04/map.bin | 0 .../BattlePyramidSquare05/border.bin | Bin data/layouts/BattlePyramidSquare05/layout.inc | 16 + .../BattlePyramidSquare05/map.bin | 0 .../BattlePyramidSquare06/border.bin | Bin data/layouts/BattlePyramidSquare06/layout.inc | 16 + .../BattlePyramidSquare06/map.bin | 0 .../BattlePyramidSquare07/border.bin | Bin data/layouts/BattlePyramidSquare07/layout.inc | 16 + .../BattlePyramidSquare07/map.bin | 0 .../BattlePyramidSquare08/border.bin | Bin data/layouts/BattlePyramidSquare08/layout.inc | 16 + .../BattlePyramidSquare08/map.bin | 0 .../BattlePyramidSquare09/border.bin | Bin data/layouts/BattlePyramidSquare09/layout.inc | 16 + .../BattlePyramidSquare09/map.bin | 0 .../BattlePyramidSquare10/border.bin | Bin data/layouts/BattlePyramidSquare10/layout.inc | 16 + .../BattlePyramidSquare10/map.bin | 0 .../BattlePyramidSquare11/border.bin | Bin data/layouts/BattlePyramidSquare11/layout.inc | 16 + .../BattlePyramidSquare11/map.bin | 0 .../BattlePyramidSquare12/border.bin | Bin data/layouts/BattlePyramidSquare12/layout.inc | 16 + .../BattlePyramidSquare12/map.bin | 0 .../BattlePyramidSquare13/border.bin | Bin data/layouts/BattlePyramidSquare13/layout.inc | 16 + .../BattlePyramidSquare13/map.bin | 0 .../BattlePyramidSquare14/border.bin | Bin data/layouts/BattlePyramidSquare14/layout.inc | 16 + .../BattlePyramidSquare14/map.bin | 0 .../BattlePyramidSquare15/border.bin | Bin data/layouts/BattlePyramidSquare15/layout.inc | 16 + .../BattlePyramidSquare15/map.bin | 0 .../BattlePyramidSquare16/border.bin | Bin data/layouts/BattlePyramidSquare16/layout.inc | 16 + .../BattlePyramidSquare16/map.bin | 0 .../BattleTentBattleRoom}/border.bin | Bin data/layouts/BattleTentBattleRoom/layout.inc | 16 + .../BattleTentBattleRoom}/map.bin | Bin .../BattleTentCorridor}/border.bin | Bin data/layouts/BattleTentCorridor/layout.inc | 16 + .../BattleTentCorridor}/map.bin | 0 .../BattleTentLobby}/border.bin | Bin data/layouts/BattleTentLobby/layout.inc | 16 + .../BattleTentLobby}/map.bin | 0 .../BirthIsland_Exterior/border.bin | 0 data/layouts/BirthIsland_Exterior/layout.inc | 16 + .../BirthIsland_Exterior/map.bin | Bin .../CableCarStation}/border.bin | 0 data/layouts/CableCarStation/layout.inc | 16 + .../CableCarStation}/map.bin | Bin .../CaveOfOrigin_1F/border.bin | 0 data/layouts/CaveOfOrigin_1F/layout.inc | 16 + .../{maps => layouts}/CaveOfOrigin_1F/map.bin | 0 .../CaveOfOrigin_B1F/border.bin | 0 data/layouts/CaveOfOrigin_B1F/layout.inc | 16 + .../CaveOfOrigin_B1F/map.bin | 0 .../CaveOfOrigin_Entrance/border.bin | 0 data/layouts/CaveOfOrigin_Entrance/layout.inc | 16 + .../CaveOfOrigin_Entrance/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 data/{maps => layouts}/DesertRuins/border.bin | 0 data/layouts/DesertRuins/layout.inc | 16 + data/{maps => layouts}/DesertRuins/map.bin | Bin .../DesertUnderpass/border.bin | 0 data/layouts/DesertUnderpass/layout.inc | 16 + .../{maps => layouts}/DesertUnderpass/map.bin | 0 data/{maps => layouts}/DewfordTown/border.bin | 0 data/layouts/DewfordTown/layout.inc | 16 + data/{maps => layouts}/DewfordTown/map.bin | 0 .../DewfordTown_Gym}/border.bin | Bin data/layouts/DewfordTown_Gym/layout.inc | 16 + .../{maps => layouts}/DewfordTown_Gym/map.bin | Bin .../DewfordTown_Hall/border.bin | 0 data/layouts/DewfordTown_Hall/layout.inc | 16 + .../DewfordTown_Hall/map.bin | Bin .../DoubleBattleColosseum}/border.bin | 0 data/layouts/DoubleBattleColosseum/layout.inc | 16 + .../DoubleBattleColosseum/map.bin | 0 .../EverGrandeCity/border.bin | 0 data/layouts/EverGrandeCity/layout.inc | 16 + data/{maps => layouts}/EverGrandeCity/map.bin | Bin .../EverGrandeCity_ChampionsRoom}/border.bin | Bin .../EverGrandeCity_ChampionsRoom/layout.inc | 16 + .../EverGrandeCity_ChampionsRoom/map.bin | Bin .../EverGrandeCity_DrakesRoom}/border.bin | Bin .../EverGrandeCity_DrakesRoom/layout.inc | 16 + .../EverGrandeCity_DrakesRoom/map.bin | 0 .../EverGrandeCity_GlaciasRoom}/border.bin | Bin .../EverGrandeCity_GlaciasRoom/layout.inc | 16 + .../EverGrandeCity_GlaciasRoom/map.bin | 0 .../EverGrandeCity_Hall4}/border.bin | Bin data/layouts/EverGrandeCity_Hall4/layout.inc | 16 + .../EverGrandeCity_Hall4/map.bin | 0 .../EverGrandeCity_HallOfFame}/border.bin | Bin .../EverGrandeCity_HallOfFame/layout.inc | 16 + .../EverGrandeCity_HallOfFame/map.bin | 0 .../EverGrandeCity_PhoebesRoom}/border.bin | Bin .../EverGrandeCity_PhoebesRoom/layout.inc | 16 + .../EverGrandeCity_PhoebesRoom/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../EverGrandeCity_PokemonLeague_1F/map.bin | 0 .../EverGrandeCity_ShortHall}/border.bin | Bin .../EverGrandeCity_ShortHall/layout.inc | 16 + .../EverGrandeCity_ShortHall}/map.bin | 0 .../EverGrandeCity_SidneysRoom}/border.bin | Bin .../EverGrandeCity_SidneysRoom/layout.inc | 16 + .../EverGrandeCity_SidneysRoom/map.bin | 0 .../FallarborTown/border.bin | 0 data/layouts/FallarborTown/layout.inc | 16 + data/{maps => layouts}/FallarborTown/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../FarawayIsland_Entrance/border.bin | 0 .../layouts/FarawayIsland_Entrance/layout.inc | 16 + .../FarawayIsland_Entrance/map.bin | Bin .../FarawayIsland_Interior/border.bin | Bin .../layouts/FarawayIsland_Interior/layout.inc | 16 + .../FarawayIsland_Interior/map.bin | Bin data/{maps => layouts}/FieryPath/border.bin | 0 data/layouts/FieryPath/layout.inc | 16 + data/{maps => layouts}/FieryPath/map.bin | 0 data/{maps => layouts}/FortreeCity/border.bin | Bin data/layouts/FortreeCity/layout.inc | 16 + data/{maps => layouts}/FortreeCity/map.bin | 0 .../FortreeCity_DecorationShop}/border.bin | 0 .../FortreeCity_DecorationShop/layout.inc | 16 + .../FortreeCity_DecorationShop/map.bin | 0 .../FortreeCity_Gym/border.bin | Bin data/layouts/FortreeCity_Gym/layout.inc | 16 + .../{maps => layouts}/FortreeCity_Gym/map.bin | Bin .../FortreeCity_House1}/border.bin | 0 data/layouts/FortreeCity_House1/layout.inc | 16 + .../FortreeCity_House1/map.bin | 0 .../FortreeCity_House2}/border.bin | 0 data/layouts/FortreeCity_House2/layout.inc | 16 + .../FortreeCity_House2/map.bin | 0 .../GraniteCave_1F/border.bin | 0 data/layouts/GraniteCave_1F/layout.inc | 16 + data/{maps => layouts}/GraniteCave_1F/map.bin | 0 .../GraniteCave_B1F/border.bin | 0 data/layouts/GraniteCave_B1F/layout.inc | 16 + .../{maps => layouts}/GraniteCave_B1F/map.bin | 0 .../GraniteCave_B2F/border.bin | 0 data/layouts/GraniteCave_B2F/layout.inc | 16 + .../{maps => layouts}/GraniteCave_B2F/map.bin | 0 .../GraniteCave_StevensRoom/border.bin | 0 .../GraniteCave_StevensRoom/layout.inc | 16 + .../GraniteCave_StevensRoom/map.bin | 0 .../Harbor}/border.bin | 0 data/layouts/Harbor/layout.inc | 16 + .../Harbor}/map.bin | 0 .../House1}/border.bin | Bin data/layouts/House1/layout.inc | 16 + .../House1}/map.bin | 0 .../House2}/border.bin | Bin data/layouts/House2/layout.inc | 16 + .../House2}/map.bin | 0 .../House3}/border.bin | 0 data/layouts/House3/layout.inc | 16 + .../House3}/map.bin | 0 .../House4}/border.bin | 0 data/layouts/House4/layout.inc | 16 + .../House4}/map.bin | 0 .../HouseWithBed}/border.bin | 0 data/layouts/HouseWithBed/layout.inc | 16 + .../HouseWithBed}/map.bin | 0 .../InsideOfTruck/border.bin | 0 data/layouts/InsideOfTruck/layout.inc | 16 + data/{maps => layouts}/InsideOfTruck/map.bin | 0 data/{maps => layouts}/IslandCave/border.bin | 0 data/layouts/IslandCave/layout.inc | 16 + data/{maps => layouts}/IslandCave/map.bin | Bin .../IslandHarbor}/border.bin | 0 data/layouts/IslandHarbor/layout.inc | 16 + .../IslandHarbor}/map.bin | 0 data/{maps => layouts}/JaggedPass/border.bin | 0 data/layouts/JaggedPass/layout.inc | 16 + data/{maps => layouts}/JaggedPass/map.bin | Bin .../LavaridgeTown/border.bin | 0 data/layouts/LavaridgeTown/layout.inc | 16 + data/{maps => layouts}/LavaridgeTown/map.bin | 0 .../LavaridgeTown_Gym_1F}/border.bin | Bin data/layouts/LavaridgeTown_Gym_1F/layout.inc | 16 + .../LavaridgeTown_Gym_1F/map.bin | 0 .../LavaridgeTown_Gym_B1F}/border.bin | Bin data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 16 + .../LavaridgeTown_Gym_B1F/map.bin | 0 .../LavaridgeTown_HerbShop}/border.bin | Bin .../layouts/LavaridgeTown_HerbShop/layout.inc | 16 + .../LavaridgeTown_HerbShop/map.bin | 0 .../border.bin | 0 .../LavaridgeTown_PokemonCenter_1F/layout.inc | 16 + .../LavaridgeTown_PokemonCenter_1F/map.bin | 0 .../{maps => layouts}/LilycoveCity/border.bin | 0 data/layouts/LilycoveCity/layout.inc | 16 + data/{maps => layouts}/LilycoveCity/map.bin | Bin .../LilycoveCity_ContestHall}/border.bin | 0 .../LilycoveCity_ContestHall/layout.inc | 16 + .../LilycoveCity_ContestHall/map.bin | 0 .../LilycoveCity_ContestLobby}/border.bin | 0 .../LilycoveCity_ContestLobby/layout.inc | 16 + .../LilycoveCity_ContestLobby/map.bin | 0 .../LilycoveCity_CoveLilyMotel_1F}/border.bin | 0 .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 16 + .../LilycoveCity_CoveLilyMotel_1F/map.bin | 0 .../LilycoveCity_CoveLilyMotel_2F}/border.bin | 0 .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 16 + .../LilycoveCity_CoveLilyMotel_2F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_1F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_2F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_3F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_4F/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LilycoveCity_DepartmentStore_5F/map.bin | Bin .../LilycoveCity_House2}/border.bin | 0 data/layouts/LilycoveCity_House2/layout.inc | 16 + .../LilycoveCity_House2/map.bin | 0 .../border.bin | 0 .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 16 + .../LilycoveCity_LilycoveMuseum_1F/map.bin | 0 .../border.bin | 0 .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 16 + .../LilycoveCity_LilycoveMuseum_2F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../map.bin | 0 .../LinkContestRoom1}/border.bin | 0 data/layouts/LinkContestRoom1/layout.inc | 16 + .../LinkContestRoom1/map.bin | 0 .../LinkContestRoom2}/border.bin | 0 data/layouts/LinkContestRoom2/layout.inc | 16 + .../LinkContestRoom2/map.bin | 0 .../LinkContestRoom3}/border.bin | 0 data/layouts/LinkContestRoom3/layout.inc | 16 + .../LinkContestRoom3/map.bin | 0 .../LinkContestRoom4}/border.bin | 0 data/layouts/LinkContestRoom4/layout.inc | 16 + .../LinkContestRoom4/map.bin | 0 .../LinkContestRoom5}/border.bin | 0 data/layouts/LinkContestRoom5/layout.inc | 16 + .../LinkContestRoom5/map.bin | 0 .../LinkContestRoom6}/border.bin | 0 data/layouts/LinkContestRoom6/layout.inc | 16 + .../LinkContestRoom6/map.bin | 0 .../LittlerootTown/border.bin | 0 data/layouts/LittlerootTown/layout.inc | 16 + data/{maps => layouts}/LittlerootTown/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../LittlerootTown_BrendansHouse_1F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../LittlerootTown_BrendansHouse_2F/map.bin | 0 .../LittlerootTown_MaysHouse_1F/border.bin | 0 .../LittlerootTown_MaysHouse_1F/layout.inc | 16 + .../LittlerootTown_MaysHouse_1F/map.bin | 0 .../LittlerootTown_MaysHouse_2F/border.bin | 0 .../LittlerootTown_MaysHouse_2F/layout.inc | 16 + .../LittlerootTown_MaysHouse_2F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../LittlerootTown_ProfessorBirchsLab/map.bin | 0 .../MagmaHideout_1F/border.bin | 0 data/layouts/MagmaHideout_1F/layout.inc | 16 + .../{maps => layouts}/MagmaHideout_1F/map.bin | Bin .../MagmaHideout_2F_1R/border.bin | 0 data/layouts/MagmaHideout_2F_1R/layout.inc | 16 + .../MagmaHideout_2F_1R/map.bin | 0 .../MagmaHideout_2F_2R/border.bin | 0 data/layouts/MagmaHideout_2F_2R/layout.inc | 16 + .../MagmaHideout_2F_2R/map.bin | 0 .../MagmaHideout_2F_3R/border.bin | 0 data/layouts/MagmaHideout_2F_3R/layout.inc | 16 + .../MagmaHideout_2F_3R/map.bin | 0 .../MagmaHideout_3F_1R/border.bin | 0 data/layouts/MagmaHideout_3F_1R/layout.inc | 16 + .../MagmaHideout_3F_1R/map.bin | 0 .../MagmaHideout_3F_2R/border.bin | 0 data/layouts/MagmaHideout_3F_2R/layout.inc | 16 + .../MagmaHideout_3F_2R/map.bin | 0 .../MagmaHideout_3F_3R/border.bin | 0 data/layouts/MagmaHideout_3F_3R/layout.inc | 16 + .../MagmaHideout_3F_3R/map.bin | 0 .../MagmaHideout_4F/border.bin | 0 data/layouts/MagmaHideout_4F/layout.inc | 16 + .../{maps => layouts}/MagmaHideout_4F/map.bin | 0 .../MarineCave_End/border.bin | 0 data/layouts/MarineCave_End/layout.inc | 16 + data/{maps => layouts}/MarineCave_End/map.bin | 0 .../MarineCave_Entrance/border.bin | 0 data/layouts/MarineCave_Entrance/layout.inc | 16 + .../MarineCave_Entrance/map.bin | 0 .../Mart}/border.bin | Bin data/layouts/Mart/layout.inc | 16 + .../OldaleTown_Mart => layouts/Mart}/map.bin | 0 .../{maps => layouts}/MauvilleCity/border.bin | 0 data/layouts/MauvilleCity/layout.inc | 16 + data/{maps => layouts}/MauvilleCity/map.bin | Bin .../MauvilleCity_BikeShop/border.bin | 0 data/layouts/MauvilleCity_BikeShop/layout.inc | 16 + .../MauvilleCity_BikeShop/map.bin | 0 .../MauvilleCity_GameCorner}/border.bin | Bin .../MauvilleCity_GameCorner/layout.inc | 16 + .../MauvilleCity_GameCorner/map.bin | 0 .../MauvilleCity_Gym}/border.bin | Bin data/layouts/MauvilleCity_Gym/layout.inc | 16 + .../MauvilleCity_Gym/map.bin | Bin .../MeteorFalls_1F_1R}/border.bin | 0 data/layouts/MeteorFalls_1F_1R/layout.inc | 16 + .../MeteorFalls_1F_1R/map.bin | 0 .../MeteorFalls_1F_2R}/border.bin | 0 data/layouts/MeteorFalls_1F_2R/layout.inc | 16 + .../MeteorFalls_1F_2R/map.bin | 0 .../MeteorFalls_B1F_1R}/border.bin | 0 data/layouts/MeteorFalls_B1F_1R/layout.inc | 16 + .../MeteorFalls_B1F_1R/map.bin | 0 .../MeteorFalls_B1F_2R}/border.bin | 0 data/layouts/MeteorFalls_B1F_2R/layout.inc | 16 + .../MeteorFalls_B1F_2R/map.bin | 0 .../MeteorFalls_StevensCave}/border.bin | 0 .../MeteorFalls_StevensCave/layout.inc | 16 + .../MeteorFalls_StevensCave/map.bin | 0 .../MirageTower_1F/border.bin | 0 data/layouts/MirageTower_1F/layout.inc | 16 + data/{maps => layouts}/MirageTower_1F/map.bin | 0 .../MirageTower_2F/border.bin | 0 data/layouts/MirageTower_2F/layout.inc | 16 + data/{maps => layouts}/MirageTower_2F/map.bin | 0 .../MirageTower_3F/border.bin | 0 data/layouts/MirageTower_3F/layout.inc | 16 + data/{maps => layouts}/MirageTower_3F/map.bin | 0 .../MirageTower_4F/border.bin | 0 data/layouts/MirageTower_4F/layout.inc | 16 + data/{maps => layouts}/MirageTower_4F/map.bin | 0 .../{maps => layouts}/MossdeepCity/border.bin | 0 data/layouts/MossdeepCity/layout.inc | 16 + data/{maps => layouts}/MossdeepCity/map.bin | Bin .../MossdeepCity_GameCorner_1F}/border.bin | Bin .../MossdeepCity_GameCorner_1F/layout.inc | 16 + .../MossdeepCity_GameCorner_1F/map.bin | 0 .../MossdeepCity_GameCorner_B1F}/border.bin | Bin .../MossdeepCity_GameCorner_B1F/layout.inc | 16 + .../MossdeepCity_GameCorner_B1F/map.bin | 0 .../MossdeepCity_Gym/border.bin | 0 data/layouts/MossdeepCity_Gym/layout.inc | 16 + .../MossdeepCity_Gym/map.bin | 0 .../MossdeepCity_SpaceCenter_1F}/border.bin | 0 .../MossdeepCity_SpaceCenter_1F/layout.inc | 16 + .../MossdeepCity_SpaceCenter_1F/map.bin | Bin .../MossdeepCity_SpaceCenter_2F}/border.bin | 0 .../MossdeepCity_SpaceCenter_2F/layout.inc | 16 + .../MossdeepCity_SpaceCenter_2F/map.bin | Bin .../MossdeepCity_StevensHouse}/border.bin | Bin .../MossdeepCity_StevensHouse/layout.inc | 16 + .../MossdeepCity_StevensHouse/map.bin | 0 data/{maps => layouts}/MtChimney/border.bin | 0 data/layouts/MtChimney/layout.inc | 16 + data/{maps => layouts}/MtChimney/map.bin | 0 .../MtPyre_1F}/border.bin | 0 data/layouts/MtPyre_1F/layout.inc | 16 + data/{maps => layouts}/MtPyre_1F/map.bin | 0 .../MtPyre_2F}/border.bin | 0 data/layouts/MtPyre_2F/layout.inc | 16 + data/{maps => layouts}/MtPyre_2F/map.bin | 0 .../MtPyre_3F}/border.bin | 0 data/layouts/MtPyre_3F/layout.inc | 16 + data/{maps => layouts}/MtPyre_3F/map.bin | 0 .../MtPyre_4F}/border.bin | 0 data/layouts/MtPyre_4F/layout.inc | 16 + data/{maps => layouts}/MtPyre_4F/map.bin | 0 .../MtPyre_5F}/border.bin | 0 data/layouts/MtPyre_5F/layout.inc | 16 + data/{maps => layouts}/MtPyre_5F/map.bin | 0 .../MtPyre_6F}/border.bin | 0 data/layouts/MtPyre_6F/layout.inc | 16 + data/{maps => layouts}/MtPyre_6F/map.bin | 0 .../MtPyre_Exterior/border.bin | Bin data/layouts/MtPyre_Exterior/layout.inc | 16 + .../{maps => layouts}/MtPyre_Exterior/map.bin | Bin .../MtPyre_Summit/border.bin | Bin data/layouts/MtPyre_Summit/layout.inc | 16 + data/{maps => layouts}/MtPyre_Summit/map.bin | Bin .../NavelRock_B1F/border.bin | 0 data/layouts/NavelRock_B1F/layout.inc | 16 + data/{maps => layouts}/NavelRock_B1F/map.bin | 0 .../NavelRock_Bottom/border.bin | 0 data/layouts/NavelRock_Bottom/layout.inc | 16 + .../NavelRock_Bottom/map.bin | 0 .../NavelRock_Entrance/border.bin | 0 data/layouts/NavelRock_Entrance/layout.inc | 16 + .../NavelRock_Entrance/map.bin | 0 .../NavelRock_Exterior/border.bin | 0 data/layouts/NavelRock_Exterior/layout.inc | 16 + .../NavelRock_Exterior/map.bin | Bin .../NavelRock_Fork/border.bin | 0 data/layouts/NavelRock_Fork/layout.inc | 16 + data/{maps => layouts}/NavelRock_Fork/map.bin | 0 .../NavelRock_LadderRoom1}/border.bin | 0 data/layouts/NavelRock_LadderRoom1/layout.inc | 16 + .../NavelRock_LadderRoom1}/map.bin | 0 .../NavelRock_LadderRoom2}/border.bin | 0 data/layouts/NavelRock_LadderRoom2/layout.inc | 16 + .../NavelRock_LadderRoom2}/map.bin | 0 .../NavelRock_Top/border.bin | 0 data/layouts/NavelRock_Top/layout.inc | 16 + data/{maps => layouts}/NavelRock_Top/map.bin | 0 .../NewMauville_Entrance/border.bin | Bin data/layouts/NewMauville_Entrance/layout.inc | 16 + .../NewMauville_Entrance/map.bin | 0 .../NewMauville_Inside/border.bin | 0 data/layouts/NewMauville_Inside/layout.inc | 16 + .../NewMauville_Inside/map.bin | 0 data/{maps => layouts}/OldaleTown/border.bin | 0 data/layouts/OldaleTown/layout.inc | 16 + data/{maps => layouts}/OldaleTown/map.bin | 0 .../PacifidlogTown/border.bin | 0 data/layouts/PacifidlogTown/layout.inc | 16 + data/{maps => layouts}/PacifidlogTown/map.bin | 0 .../PacifidlogTown_House1}/border.bin | 0 data/layouts/PacifidlogTown_House1/layout.inc | 16 + .../PacifidlogTown_House1/map.bin | 0 .../PacifidlogTown_House2}/border.bin | 0 data/layouts/PacifidlogTown_House2/layout.inc | 16 + .../PacifidlogTown_House2/map.bin | 0 .../PetalburgCity/border.bin | 0 data/layouts/PetalburgCity/layout.inc | 16 + data/{maps => layouts}/PetalburgCity/map.bin | 0 .../PetalburgCity_Gym/border.bin | 0 data/layouts/PetalburgCity_Gym/layout.inc | 16 + .../PetalburgCity_Gym/map.bin | 0 .../PetalburgWoods/border.bin | 0 data/layouts/PetalburgWoods/layout.inc | 16 + data/{maps => layouts}/PetalburgWoods/map.bin | 0 .../PokemonCenter_1F}/border.bin | 0 data/layouts/PokemonCenter_1F/layout.inc | 16 + .../PokemonCenter_1F}/map.bin | 0 .../PokemonCenter_2F}/border.bin | 0 data/layouts/PokemonCenter_2F/layout.inc | 16 + .../PokemonCenter_2F}/map.bin | 0 .../RecordCorner}/border.bin | 0 data/layouts/RecordCorner/layout.inc | 16 + data/{maps => layouts}/RecordCorner/map.bin | 0 data/{maps => layouts}/Route101/border.bin | 0 data/layouts/Route101/layout.inc | 16 + data/{maps => layouts}/Route101/map.bin | 0 data/{maps => layouts}/Route102/border.bin | 0 data/layouts/Route102/layout.inc | 16 + data/{maps => layouts}/Route102/map.bin | 0 data/{maps => layouts}/Route103/border.bin | 0 data/layouts/Route103/layout.inc | 16 + data/{maps => layouts}/Route103/map.bin | 0 data/{maps => layouts}/Route104/border.bin | 0 data/layouts/Route104/layout.inc | 16 + data/{maps => layouts}/Route104/map.bin | Bin .../Route104_MrBrineysHouse}/border.bin | 0 .../Route104_MrBrineysHouse/layout.inc | 16 + .../Route104_MrBrineysHouse/map.bin | 0 .../Route104_PrettyPetalFlowerShop/border.bin | Bin .../Route104_PrettyPetalFlowerShop/layout.inc | 16 + .../Route104_PrettyPetalFlowerShop/map.bin | Bin .../Route104_Prototype/border.bin | 0 data/layouts/Route104_Prototype/layout.inc | 16 + .../Route104_Prototype/map.bin | 0 data/{maps => layouts}/Route105/border.bin | 0 data/layouts/Route105/layout.inc | 16 + data/{maps => layouts}/Route105/map.bin | Bin data/{maps => layouts}/Route106/border.bin | 0 data/layouts/Route106/layout.inc | 16 + data/{maps => layouts}/Route106/map.bin | Bin data/{maps => layouts}/Route107/border.bin | 0 data/layouts/Route107/layout.inc | 16 + data/{maps => layouts}/Route107/map.bin | Bin data/{maps => layouts}/Route108/border.bin | 0 data/layouts/Route108/layout.inc | 16 + data/{maps => layouts}/Route108/map.bin | 0 data/{maps => layouts}/Route109/border.bin | 0 data/layouts/Route109/layout.inc | 16 + data/{maps => layouts}/Route109/map.bin | Bin .../Route109_SeashoreHouse/border.bin | Bin .../layouts/Route109_SeashoreHouse/layout.inc | 16 + .../Route109_SeashoreHouse/map.bin | 0 data/{maps => layouts}/Route110/border.bin | 0 data/layouts/Route110/layout.inc | 16 + data/{maps => layouts}/Route110/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../Route110_TrickHouseCorridor}/border.bin | 0 .../Route110_TrickHouseCorridor/layout.inc | 16 + .../Route110_TrickHouseCorridor/map.bin | 0 .../Route110_TrickHouseEnd}/border.bin | 0 .../layouts/Route110_TrickHouseEnd/layout.inc | 16 + .../Route110_TrickHouseEnd/map.bin | 0 .../Route110_TrickHouseEntrance}/border.bin | 0 .../Route110_TrickHouseEntrance/layout.inc | 16 + .../Route110_TrickHouseEntrance/map.bin | 0 .../Route110_TrickHousePuzzle1/border.bin | Bin .../Route110_TrickHousePuzzle1/layout.inc | 16 + .../Route110_TrickHousePuzzle1/map.bin | 0 .../Route110_TrickHousePuzzle2/border.bin | Bin .../Route110_TrickHousePuzzle2/layout.inc | 16 + .../Route110_TrickHousePuzzle2/map.bin | 0 .../Route110_TrickHousePuzzle3/border.bin | Bin .../Route110_TrickHousePuzzle3/layout.inc | 16 + .../Route110_TrickHousePuzzle3/map.bin | 0 .../Route110_TrickHousePuzzle4/border.bin | Bin .../Route110_TrickHousePuzzle4/layout.inc | 16 + .../Route110_TrickHousePuzzle4/map.bin | 0 .../Route110_TrickHousePuzzle5/border.bin | Bin .../Route110_TrickHousePuzzle5/layout.inc | 16 + .../Route110_TrickHousePuzzle5/map.bin | 0 .../Route110_TrickHousePuzzle6/border.bin | Bin .../Route110_TrickHousePuzzle6/layout.inc | 16 + .../Route110_TrickHousePuzzle6/map.bin | 0 .../Route110_TrickHousePuzzle7/border.bin | Bin .../Route110_TrickHousePuzzle7/layout.inc | 16 + .../Route110_TrickHousePuzzle7/map.bin | 0 .../Route110_TrickHousePuzzle8/border.bin | Bin .../Route110_TrickHousePuzzle8/layout.inc | 16 + .../Route110_TrickHousePuzzle8/map.bin | 0 data/{maps => layouts}/Route111/border.bin | Bin data/layouts/Route111/layout.inc | 16 + data/{maps => layouts}/Route111/map.bin | Bin data/{maps => layouts}/Route112/border.bin | 0 data/layouts/Route112/layout.inc | 16 + data/{maps => layouts}/Route112/map.bin | Bin data/{maps => layouts}/Route113/border.bin | 0 data/layouts/Route113/layout.inc | 16 + data/{maps => layouts}/Route113/map.bin | Bin data/{maps => layouts}/Route114/border.bin | 0 data/layouts/Route114/layout.inc | 16 + data/{maps => layouts}/Route114/map.bin | Bin .../Route114_FossilManiacsHouse}/border.bin | 0 .../Route114_FossilManiacsHouse/layout.inc | 16 + .../Route114_FossilManiacsHouse/map.bin | 0 .../Route114_FossilManiacsTunnel/border.bin | 0 .../Route114_FossilManiacsTunnel/layout.inc | 16 + .../Route114_FossilManiacsTunnel/map.bin | 0 .../Route114_LanettesHouse}/border.bin | 0 .../layouts/Route114_LanettesHouse/layout.inc | 16 + .../Route114_LanettesHouse/map.bin | 0 data/{maps => layouts}/Route115/border.bin | 0 data/layouts/Route115/layout.inc | 16 + data/{maps => layouts}/Route115/map.bin | Bin data/{maps => layouts}/Route116/border.bin | 0 data/layouts/Route116/layout.inc | 16 + data/{maps => layouts}/Route116/map.bin | Bin .../Route116_TunnelersRestHouse}/border.bin | 0 .../Route116_TunnelersRestHouse/layout.inc | 16 + .../Route116_TunnelersRestHouse/map.bin | 0 data/{maps => layouts}/Route117/border.bin | Bin data/layouts/Route117/layout.inc | 16 + data/{maps => layouts}/Route117/map.bin | 0 .../Route117_PokemonDayCare/border.bin | 0 .../Route117_PokemonDayCare/layout.inc | 16 + .../Route117_PokemonDayCare/map.bin | 0 data/{maps => layouts}/Route118/border.bin | 0 data/layouts/Route118/layout.inc | 16 + data/{maps => layouts}/Route118/map.bin | Bin data/{maps => layouts}/Route119/border.bin | Bin data/layouts/Route119/layout.inc | 16 + data/{maps => layouts}/Route119/map.bin | Bin .../Route119_WeatherInstitute_1F}/border.bin | 0 .../Route119_WeatherInstitute_1F/layout.inc | 16 + .../Route119_WeatherInstitute_1F/map.bin | 0 .../Route119_WeatherInstitute_2F}/border.bin | 0 .../Route119_WeatherInstitute_2F/layout.inc | 16 + .../Route119_WeatherInstitute_2F/map.bin | 0 data/{maps => layouts}/Route120/border.bin | Bin data/layouts/Route120/layout.inc | 16 + data/{maps => layouts}/Route120/map.bin | Bin data/{maps => layouts}/Route121/border.bin | 0 data/layouts/Route121/layout.inc | 16 + data/{maps => layouts}/Route121/map.bin | 0 .../Route121_SafariZoneEntrance/border.bin | Bin .../Route121_SafariZoneEntrance/layout.inc | 16 + .../Route121_SafariZoneEntrance/map.bin | 0 data/{maps => layouts}/Route122/border.bin | 0 data/layouts/Route122/layout.inc | 16 + data/{maps => layouts}/Route122/map.bin | Bin data/{maps => layouts}/Route123/border.bin | Bin data/layouts/Route123/layout.inc | 16 + data/{maps => layouts}/Route123/map.bin | 0 data/{maps => layouts}/Route124/border.bin | 0 data/layouts/Route124/layout.inc | 16 + data/{maps => layouts}/Route124/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 data/{maps => layouts}/Route125/border.bin | 0 data/layouts/Route125/layout.inc | 16 + data/{maps => layouts}/Route125/map.bin | Bin data/{maps => layouts}/Route126/border.bin | 0 data/layouts/Route126/layout.inc | 16 + data/{maps => layouts}/Route126/map.bin | Bin data/{maps => layouts}/Route127/border.bin | 0 data/layouts/Route127/layout.inc | 16 + data/{maps => layouts}/Route127/map.bin | Bin data/{maps => layouts}/Route128/border.bin | 0 data/layouts/Route128/layout.inc | 16 + data/{maps => layouts}/Route128/map.bin | Bin data/{maps => layouts}/Route129/border.bin | 0 data/layouts/Route129/layout.inc | 16 + data/{maps => layouts}/Route129/map.bin | Bin data/{maps => layouts}/Route130/border.bin | 0 data/layouts/Route130/layout.inc | 16 + data/{maps => layouts}/Route130/map.bin | 0 data/{maps => layouts}/Route131/border.bin | 0 data/layouts/Route131/layout.inc | 16 + data/{maps => layouts}/Route131/map.bin | 0 data/{maps => layouts}/Route132/border.bin | 0 data/layouts/Route132/layout.inc | 16 + data/{maps => layouts}/Route132/map.bin | Bin data/{maps => layouts}/Route133/border.bin | 0 data/layouts/Route133/layout.inc | 16 + data/{maps => layouts}/Route133/map.bin | 0 data/{maps => layouts}/Route134/border.bin | 0 data/layouts/Route134/layout.inc | 16 + data/{maps => layouts}/Route134/map.bin | Bin .../{maps => layouts}/RustboroCity/border.bin | 0 data/layouts/RustboroCity/layout.inc | 16 + data/{maps => layouts}/RustboroCity/map.bin | Bin .../RustboroCity_CuttersHouse}/border.bin | 0 .../RustboroCity_CuttersHouse/layout.inc | 16 + .../RustboroCity_CuttersHouse/map.bin | 0 .../RustboroCity_DevonCorp_1F}/border.bin | 0 .../RustboroCity_DevonCorp_1F/layout.inc | 16 + .../RustboroCity_DevonCorp_1F/map.bin | 0 .../RustboroCity_DevonCorp_2F}/border.bin | 0 .../RustboroCity_DevonCorp_2F/layout.inc | 16 + .../RustboroCity_DevonCorp_2F/map.bin | 0 .../RustboroCity_DevonCorp_3F}/border.bin | 0 .../RustboroCity_DevonCorp_3F/layout.inc | 16 + .../RustboroCity_DevonCorp_3F/map.bin | 0 .../RustboroCity_Flat1_1F}/border.bin | 0 data/layouts/RustboroCity_Flat1_1F/layout.inc | 16 + .../RustboroCity_Flat1_1F/map.bin | 0 .../RustboroCity_Flat1_2F}/border.bin | 0 data/layouts/RustboroCity_Flat1_2F/layout.inc | 16 + .../RustboroCity_Flat1_2F/map.bin | 0 .../RustboroCity_Flat2_1F}/border.bin | 0 data/layouts/RustboroCity_Flat2_1F/layout.inc | 16 + .../RustboroCity_Flat2_1F/map.bin | Bin .../RustboroCity_Flat2_2F}/border.bin | 0 data/layouts/RustboroCity_Flat2_2F/layout.inc | 16 + .../RustboroCity_Flat2_2F/map.bin | Bin .../RustboroCity_Flat2_3F}/border.bin | 0 data/layouts/RustboroCity_Flat2_3F/layout.inc | 16 + .../RustboroCity_Flat2_3F/map.bin | Bin .../RustboroCity_Gym/border.bin | Bin data/layouts/RustboroCity_Gym/layout.inc | 16 + .../RustboroCity_Gym/map.bin | 0 .../RustboroCity_House}/border.bin | 0 data/layouts/RustboroCity_House/layout.inc | 16 + .../RustboroCity_House}/map.bin | 0 .../RustboroCity_House1}/border.bin | 0 data/layouts/RustboroCity_House1/layout.inc | 16 + .../RustboroCity_House1/map.bin | 0 .../RustboroCity_PokemonSchool/border.bin | 0 .../RustboroCity_PokemonSchool/layout.inc | 16 + .../RustboroCity_PokemonSchool/map.bin | Bin .../RusturfTunnel/border.bin | 0 data/layouts/RusturfTunnel/layout.inc | 16 + data/{maps => layouts}/RusturfTunnel/map.bin | 0 .../SSTidalCorridor}/border.bin | 0 data/layouts/SSTidalCorridor/layout.inc | 16 + .../{maps => layouts}/SSTidalCorridor/map.bin | 0 .../SSTidalLowerDeck}/border.bin | 0 data/layouts/SSTidalLowerDeck/layout.inc | 16 + .../SSTidalLowerDeck/map.bin | 0 .../SSTidalRooms}/border.bin | 0 data/layouts/SSTidalRooms/layout.inc | 16 + data/{maps => layouts}/SSTidalRooms/map.bin | 0 .../SafariZone_North/border.bin | 0 data/layouts/SafariZone_North/layout.inc | 16 + .../SafariZone_North/map.bin | Bin .../SafariZone_Northeast/border.bin | 0 data/layouts/SafariZone_Northeast/layout.inc | 16 + .../SafariZone_Northeast/map.bin | Bin .../SafariZone_Northwest/border.bin | 0 data/layouts/SafariZone_Northwest/layout.inc | 16 + .../SafariZone_Northwest/map.bin | Bin .../SafariZone_RestHouse/border.bin | Bin data/layouts/SafariZone_RestHouse/layout.inc | 16 + .../SafariZone_RestHouse/map.bin | 0 .../SafariZone_South/border.bin | 0 data/layouts/SafariZone_South/layout.inc | 16 + .../SafariZone_South/map.bin | Bin .../SafariZone_Southeast/border.bin | 0 data/layouts/SafariZone_Southeast/layout.inc | 16 + .../SafariZone_Southeast/map.bin | Bin .../SafariZone_Southwest/border.bin | 0 data/layouts/SafariZone_Southwest/layout.inc | 16 + .../SafariZone_Southwest/map.bin | Bin .../{maps => layouts}/ScorchedSlab/border.bin | 0 data/layouts/ScorchedSlab/layout.inc | 16 + data/{maps => layouts}/ScorchedSlab/map.bin | 0 .../SeafloorCavern_Entrance/border.bin | 0 .../SeafloorCavern_Entrance/layout.inc | 16 + .../SeafloorCavern_Entrance/map.bin | 0 .../SeafloorCavern_Room1/border.bin | 0 data/layouts/SeafloorCavern_Room1/layout.inc | 16 + .../SeafloorCavern_Room1/map.bin | 0 .../SeafloorCavern_Room2/border.bin | 0 data/layouts/SeafloorCavern_Room2/layout.inc | 16 + .../SeafloorCavern_Room2/map.bin | 0 .../SeafloorCavern_Room3/border.bin | 0 data/layouts/SeafloorCavern_Room3/layout.inc | 16 + .../SeafloorCavern_Room3/map.bin | 0 .../SeafloorCavern_Room4/border.bin | 0 data/layouts/SeafloorCavern_Room4/layout.inc | 16 + .../SeafloorCavern_Room4/map.bin | 0 .../SeafloorCavern_Room5/border.bin | 0 data/layouts/SeafloorCavern_Room5/layout.inc | 16 + .../SeafloorCavern_Room5/map.bin | 0 .../SeafloorCavern_Room6/border.bin | 0 data/layouts/SeafloorCavern_Room6/layout.inc | 16 + .../SeafloorCavern_Room6/map.bin | 0 .../SeafloorCavern_Room7/border.bin | 0 data/layouts/SeafloorCavern_Room7/layout.inc | 16 + .../SeafloorCavern_Room7/map.bin | 0 .../SeafloorCavern_Room8/border.bin | 0 data/layouts/SeafloorCavern_Room8/layout.inc | 16 + .../SeafloorCavern_Room8/map.bin | 0 .../SeafloorCavern_Room9/border.bin | 0 data/layouts/SeafloorCavern_Room9/layout.inc | 16 + .../SeafloorCavern_Room9/map.bin | 0 .../SealedChamber_InnerRoom/border.bin | Bin .../SealedChamber_InnerRoom/layout.inc | 16 + .../SealedChamber_InnerRoom/map.bin | 0 .../SealedChamber_OuterRoom/border.bin | Bin .../SealedChamber_OuterRoom/layout.inc | 16 + .../SealedChamber_OuterRoom/map.bin | 0 .../SecretBase_BlueCave1/border.bin | 0 data/layouts/SecretBase_BlueCave1/layout.inc | 16 + .../SecretBase_BlueCave1/map.bin | 0 .../SecretBase_BlueCave2/border.bin | 0 data/layouts/SecretBase_BlueCave2/layout.inc | 16 + .../SecretBase_BlueCave2/map.bin | 0 .../SecretBase_BlueCave3/border.bin | 0 data/layouts/SecretBase_BlueCave3/layout.inc | 16 + .../SecretBase_BlueCave3/map.bin | 0 .../SecretBase_BlueCave4/border.bin | 0 data/layouts/SecretBase_BlueCave4/layout.inc | 16 + .../SecretBase_BlueCave4/map.bin | 0 .../SecretBase_BrownCave1/border.bin | 0 data/layouts/SecretBase_BrownCave1/layout.inc | 16 + .../SecretBase_BrownCave1/map.bin | 0 .../SecretBase_BrownCave2/border.bin | 0 data/layouts/SecretBase_BrownCave2/layout.inc | 16 + .../SecretBase_BrownCave2/map.bin | 0 .../SecretBase_BrownCave3/border.bin | 0 data/layouts/SecretBase_BrownCave3/layout.inc | 16 + .../SecretBase_BrownCave3/map.bin | 0 .../SecretBase_BrownCave4/border.bin | 0 data/layouts/SecretBase_BrownCave4/layout.inc | 16 + .../SecretBase_BrownCave4/map.bin | 0 .../SecretBase_RedCave1/border.bin | 0 data/layouts/SecretBase_RedCave1/layout.inc | 16 + .../SecretBase_RedCave1/map.bin | 0 .../SecretBase_RedCave2/border.bin | 0 data/layouts/SecretBase_RedCave2/layout.inc | 16 + .../SecretBase_RedCave2/map.bin | 0 .../SecretBase_RedCave3/border.bin | 0 data/layouts/SecretBase_RedCave3/layout.inc | 16 + .../SecretBase_RedCave3/map.bin | 0 .../SecretBase_RedCave4/border.bin | 0 data/layouts/SecretBase_RedCave4/layout.inc | 16 + .../SecretBase_RedCave4/map.bin | 0 .../SecretBase_Shrub1/border.bin | 0 data/layouts/SecretBase_Shrub1/layout.inc | 16 + .../SecretBase_Shrub1/map.bin | 0 .../SecretBase_Shrub2/border.bin | 0 data/layouts/SecretBase_Shrub2/layout.inc | 16 + .../SecretBase_Shrub2/map.bin | 0 .../SecretBase_Shrub3/border.bin | 0 data/layouts/SecretBase_Shrub3/layout.inc | 16 + .../SecretBase_Shrub3/map.bin | 0 .../SecretBase_Shrub4/border.bin | 0 data/layouts/SecretBase_Shrub4/layout.inc | 16 + .../SecretBase_Shrub4/map.bin | 0 .../SecretBase_Tree1/border.bin | 0 data/layouts/SecretBase_Tree1/layout.inc | 16 + .../SecretBase_Tree1/map.bin | 0 .../SecretBase_Tree2/border.bin | 0 data/layouts/SecretBase_Tree2/layout.inc | 16 + .../SecretBase_Tree2/map.bin | 0 .../SecretBase_Tree3/border.bin | 0 data/layouts/SecretBase_Tree3/layout.inc | 16 + .../SecretBase_Tree3/map.bin | 0 .../SecretBase_Tree4/border.bin | 0 data/layouts/SecretBase_Tree4/layout.inc | 16 + .../SecretBase_Tree4/map.bin | 0 .../SecretBase_YellowCave1/border.bin | 0 .../layouts/SecretBase_YellowCave1/layout.inc | 16 + .../SecretBase_YellowCave1/map.bin | 0 .../SecretBase_YellowCave2/border.bin | 0 .../layouts/SecretBase_YellowCave2/layout.inc | 16 + .../SecretBase_YellowCave2/map.bin | 0 .../SecretBase_YellowCave3/border.bin | 0 .../layouts/SecretBase_YellowCave3/layout.inc | 16 + .../SecretBase_YellowCave3/map.bin | 0 .../SecretBase_YellowCave4/border.bin | 0 .../layouts/SecretBase_YellowCave4/layout.inc | 16 + .../SecretBase_YellowCave4/map.bin | 0 .../ShoalCave_HighTideEntranceRoom/border.bin | 0 .../ShoalCave_HighTideEntranceRoom/layout.inc | 16 + .../ShoalCave_HighTideEntranceRoom/map.bin | 0 .../ShoalCave_HighTideInnerRoom/border.bin | 0 .../ShoalCave_HighTideInnerRoom/layout.inc | 16 + .../ShoalCave_HighTideInnerRoom/map.bin | 0 .../ShoalCave_LowTideEntranceRoom/border.bin | 0 .../ShoalCave_LowTideEntranceRoom/layout.inc | 16 + .../ShoalCave_LowTideEntranceRoom/map.bin | 0 .../ShoalCave_LowTideIceRoom/border.bin | 0 .../ShoalCave_LowTideIceRoom/layout.inc | 16 + .../ShoalCave_LowTideIceRoom/map.bin | 0 .../ShoalCave_LowTideInnerRoom/border.bin | 0 .../ShoalCave_LowTideInnerRoom/layout.inc | 16 + .../ShoalCave_LowTideInnerRoom/map.bin | 0 .../ShoalCave_LowTideLowerRoom/border.bin | 0 .../ShoalCave_LowTideLowerRoom/layout.inc | 16 + .../ShoalCave_LowTideLowerRoom/map.bin | 0 .../ShoalCave_LowTideStairsRoom/border.bin | 0 .../ShoalCave_LowTideStairsRoom/layout.inc | 16 + .../ShoalCave_LowTideStairsRoom/map.bin | 0 .../SingleBattleColosseum}/border.bin | 0 data/layouts/SingleBattleColosseum/layout.inc | 16 + .../SingleBattleColosseum/map.bin | 0 .../SkyPillar_1F}/border.bin | 0 data/layouts/SkyPillar_1F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_1F/map.bin | 0 .../SkyPillar_2F}/border.bin | 0 data/layouts/SkyPillar_2F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_2F/map.bin | 0 .../SkyPillar_3F}/border.bin | 0 data/layouts/SkyPillar_3F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_3F/map.bin | 0 .../SkyPillar_4F}/border.bin | 0 data/layouts/SkyPillar_4F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_4F/map.bin | 0 .../SkyPillar_5F}/border.bin | 0 data/layouts/SkyPillar_5F/layout.inc | 16 + data/{maps => layouts}/SkyPillar_5F/map.bin | 0 .../SkyPillar_Entrance/border.bin | 0 data/layouts/SkyPillar_Entrance/layout.inc | 16 + .../SkyPillar_Entrance/map.bin | 0 .../SkyPillar_Outside/border.bin | 0 data/layouts/SkyPillar_Outside/layout.inc | 16 + .../SkyPillar_Outside/map.bin | 0 .../SkyPillar_Top/border.bin | 0 data/layouts/SkyPillar_Top/layout.inc | 16 + data/{maps => layouts}/SkyPillar_Top/map.bin | 0 .../SlateportCity/border.bin | 0 data/layouts/SlateportCity/layout.inc | 16 + data/{maps => layouts}/SlateportCity/map.bin | Bin .../SlateportCity_OceanicMuseum_1F/border.bin | Bin .../SlateportCity_OceanicMuseum_1F/layout.inc | 16 + .../SlateportCity_OceanicMuseum_1F/map.bin | 0 .../SlateportCity_OceanicMuseum_2F/border.bin | Bin .../SlateportCity_OceanicMuseum_2F/layout.inc | 16 + .../SlateportCity_OceanicMuseum_2F/map.bin | 0 .../SlateportCity_PokemonFanClub/border.bin | Bin .../SlateportCity_PokemonFanClub/layout.inc | 16 + .../SlateportCity_PokemonFanClub/map.bin | Bin .../border.bin | 0 .../layout.inc | 16 + .../SlateportCity_SternsShipyard_1F/map.bin | 0 .../border.bin | 0 .../layout.inc | 16 + .../SlateportCity_SternsShipyard_2F/map.bin | 0 .../SootopolisCity/border.bin | 0 data/layouts/SootopolisCity/layout.inc | 16 + data/{maps => layouts}/SootopolisCity/map.bin | 0 .../SootopolisCity_Gym_1F/border.bin | Bin data/layouts/SootopolisCity_Gym_1F/layout.inc | 16 + .../SootopolisCity_Gym_1F/map.bin | Bin .../SootopolisCity_Gym_B1F/border.bin | Bin .../layouts/SootopolisCity_Gym_B1F/layout.inc | 16 + .../SootopolisCity_Gym_B1F/map.bin | 0 .../SootopolisCity_House1/border.bin | 0 data/layouts/SootopolisCity_House1/layout.inc | 16 + .../SootopolisCity_House1/map.bin | 0 .../SootopolisCity_House2/border.bin | 0 data/layouts/SootopolisCity_House2/layout.inc | 16 + .../SootopolisCity_House2/map.bin | 0 .../SootopolisCity_House3/border.bin | 0 data/layouts/SootopolisCity_House3/layout.inc | 16 + .../SootopolisCity_House3/map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../border.bin | Bin .../layout.inc | 16 + .../map.bin | 0 .../SouthernIsland_Exterior/border.bin | 0 .../SouthernIsland_Exterior/layout.inc | 16 + .../SouthernIsland_Exterior/map.bin | 0 .../SouthernIsland_Interior/border.bin | 0 .../SouthernIsland_Interior/layout.inc | 16 + .../SouthernIsland_Interior/map.bin | 0 .../TerraCave_End/border.bin | 0 data/layouts/TerraCave_End/layout.inc | 16 + data/{maps => layouts}/TerraCave_End/map.bin | 0 .../TerraCave_Entrance/border.bin | 0 data/layouts/TerraCave_Entrance/layout.inc | 16 + .../TerraCave_Entrance/map.bin | 0 data/{maps => layouts}/TradeCenter/border.bin | 0 data/layouts/TradeCenter/layout.inc | 16 + data/{maps => layouts}/TradeCenter/map.bin | 0 .../TrainerHill_1F/border.bin | 0 data/layouts/TrainerHill_1F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_1F/map.bin | 0 .../TrainerHill_2F/border.bin | 0 data/layouts/TrainerHill_2F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_2F/map.bin | 0 .../TrainerHill_3F/border.bin | 0 data/layouts/TrainerHill_3F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_3F/map.bin | 0 .../TrainerHill_4F/border.bin | 0 data/layouts/TrainerHill_4F/layout.inc | 16 + data/{maps => layouts}/TrainerHill_4F/map.bin | 0 .../TrainerHill_Entrance/border.bin | 0 data/layouts/TrainerHill_Entrance/layout.inc | 16 + .../TrainerHill_Entrance/map.bin | 0 .../TrainerHill_Roof/border.bin | 0 data/layouts/TrainerHill_Roof/layout.inc | 16 + .../TrainerHill_Roof/map.bin | 0 data/{maps => layouts}/Underwater1/border.bin | 0 data/layouts/Underwater1/layout.inc | 16 + data/{maps => layouts}/Underwater1/map.bin | 0 data/{maps => layouts}/Underwater2/border.bin | 0 data/layouts/Underwater2/layout.inc | 16 + data/{maps => layouts}/Underwater2/map.bin | 0 data/{maps => layouts}/Underwater3/border.bin | 0 data/layouts/Underwater3/layout.inc | 16 + data/{maps => layouts}/Underwater3/map.bin | 0 data/{maps => layouts}/Underwater4/border.bin | 0 data/layouts/Underwater4/layout.inc | 16 + data/{maps => layouts}/Underwater4/map.bin | 0 data/{maps => layouts}/Underwater5/border.bin | 0 data/layouts/Underwater5/layout.inc | 16 + data/{maps => layouts}/Underwater5/map.bin | 0 data/{maps => layouts}/Underwater6/border.bin | 0 data/layouts/Underwater6/layout.inc | 16 + data/{maps => layouts}/Underwater6/map.bin | 0 data/{maps => layouts}/Underwater7/border.bin | 0 data/layouts/Underwater7/layout.inc | 16 + data/{maps => layouts}/Underwater7/map.bin | 0 .../Underwater_MarineCave/border.bin | 0 data/layouts/Underwater_MarineCave/layout.inc | 16 + .../Underwater_MarineCave/map.bin | 0 .../Underwater_Route134/border.bin | 0 data/layouts/Underwater_Route134/layout.inc | 16 + .../Underwater_Route134/map.bin | 0 .../Underwater_SeafloorCavern/border.bin | 0 .../Underwater_SeafloorCavern/layout.inc | 16 + .../Underwater_SeafloorCavern/map.bin | 0 .../Underwater_SealedChamber/border.bin | 0 .../Underwater_SealedChamber/layout.inc | 16 + .../Underwater_SealedChamber/map.bin | 0 .../Underwater_SootopolisCity/border.bin | 0 .../Underwater_SootopolisCity/layout.inc | 16 + .../Underwater_SootopolisCity/map.bin | 0 data/{maps => layouts}/UnionRoom/border.bin | Bin data/layouts/UnionRoom/layout.inc | 16 + data/{maps => layouts}/UnionRoom/map.bin | 0 .../UnknownMap_08417FC4/border.bin | 0 data/layouts/UnknownMap_08417FC4/layout.inc | 16 + .../UnknownMap_08417FC4/map.bin | 0 .../UnknownMap_08428450/border.bin | 0 data/layouts/UnknownMap_08428450/layout.inc | 16 + .../UnknownMap_08428450/map.bin | Bin .../UnknownMap_084294C4/border.bin | 0 data/layouts/UnknownMap_084294C4/layout.inc | 16 + .../UnknownMap_084294C4/map.bin | Bin .../UnknownMap_084294E8/border.bin | 0 data/layouts/UnknownMap_084294E8/layout.inc | 16 + .../UnknownMap_084294E8/map.bin | Bin .../UnknownMap_0843E6C0/border.bin | 0 data/layouts/UnknownMap_0843E6C0/layout.inc | 16 + .../UnknownMap_0843E6C0/map.bin | Bin .../UnknownMap_0843E6E4/border.bin | 0 data/layouts/UnknownMap_0843E6E4/layout.inc | 16 + .../UnknownMap_0843E6E4/map.bin | Bin .../UnknownMap_0843E708/border.bin | 0 data/layouts/UnknownMap_0843E708/layout.inc | 16 + .../UnknownMap_0843E708/map.bin | Bin .../UnknownMap_0843E72C/border.bin | 0 data/layouts/UnknownMap_0843E72C/layout.inc | 16 + .../UnknownMap_0843E72C/map.bin | Bin .../UnknownMap_0843E750/border.bin | 0 data/layouts/UnknownMap_0843E750/layout.inc | 16 + .../UnknownMap_0843E750/map.bin | Bin .../UnknownMap_0843E774/border.bin | 0 data/layouts/UnknownMap_0843E774/layout.inc | 16 + .../UnknownMap_0843E774/map.bin | Bin .../UnknownMap_0843E798/border.bin | 0 data/layouts/UnknownMap_0843E798/layout.inc | 16 + .../UnknownMap_0843E798/map.bin | Bin .../UnknownMap_0843E7BC/border.bin | 0 data/layouts/UnknownMap_0843E7BC/layout.inc | 16 + .../UnknownMap_0843E7BC/map.bin | Bin .../UnknownMap_0843E7E0/border.bin | 0 data/layouts/UnknownMap_0843E7E0/layout.inc | 16 + .../UnknownMap_0843E7E0/map.bin | Bin .../UnknownMap_0843E804/border.bin | 0 data/layouts/UnknownMap_0843E804/layout.inc | 16 + .../UnknownMap_0843E804/map.bin | Bin .../UnknownMap_0843E828/border.bin | 0 data/layouts/UnknownMap_0843E828/layout.inc | 16 + .../UnknownMap_0843E828/map.bin | Bin .../UnknownMap_0843E84C/border.bin | 0 data/layouts/UnknownMap_0843E84C/layout.inc | 16 + .../UnknownMap_0843E84C/map.bin | Bin .../UnknownMap_0843E870/border.bin | 0 data/layouts/UnknownMap_0843E870/layout.inc | 16 + .../UnknownMap_0843E870/map.bin | Bin .../UnknownMap_0843E894/border.bin | 0 data/layouts/UnknownMap_0843E894/layout.inc | 15 + .../UnknownMap_0843E894/map.bin | Bin .../UnknownMap_08447028/border.bin | 0 data/layouts/UnknownMap_08447028/layout.inc | 16 + .../UnknownMap_08447028/map.bin | 0 .../UnknownMap_0845A394/border.bin | 0 data/layouts/UnknownMap_0845A394/layout.inc | 16 + .../UnknownMap_0845A394/map.bin | Bin .../UnknownMap_0845D470/border.bin | 0 data/layouts/UnknownMap_0845D470/layout.inc | 16 + .../UnknownMap_0845D470/map.bin | 0 .../UnknownMap_0845ECB4/border.bin | 0 data/layouts/UnknownMap_0845ECB4/layout.inc | 16 + .../UnknownMap_0845ECB4/map.bin | 0 .../UnknownMap_08469200/border.bin | 0 data/layouts/UnknownMap_08469200/layout.inc | 16 + .../UnknownMap_08469200/map.bin | 0 .../UnknownMap_084693AC/border.bin | Bin data/layouts/UnknownMap_084693AC/layout.inc | 16 + .../UnknownMap_084693AC/map.bin | Bin .../UnknownMap_08470BD8/border.bin | Bin data/layouts/UnknownMap_08470BD8/layout.inc | 16 + .../UnknownMap_08470BD8/map.bin | Bin .../UnknownMap_08480DAC/border.bin | 0 data/layouts/UnknownMap_08480DAC/layout.inc | 16 + .../UnknownMap_08480DAC/map.bin | Bin .../UnknownMap_08480F54/border.bin | 0 data/layouts/UnknownMap_08480F54/layout.inc | 16 + .../UnknownMap_08480F54/map.bin | 0 .../UnknownMap_084810FC/border.bin | 0 data/layouts/UnknownMap_084810FC/layout.inc | 16 + .../UnknownMap_084810FC/map.bin | 0 .../UnknownMap_084812A4/border.bin | 0 data/layouts/UnknownMap_084812A4/layout.inc | 16 + .../UnknownMap_084812A4/map.bin | 0 .../UnknownMap_0848144C/border.bin | 0 data/layouts/UnknownMap_0848144C/layout.inc | 16 + .../UnknownMap_0848144C/map.bin | 0 .../UnknownMap_084815F4/border.bin | 0 data/layouts/UnknownMap_084815F4/layout.inc | 16 + .../UnknownMap_084815F4/map.bin | 0 .../UnknownMap_08481B24/border.bin | 0 data/layouts/UnknownMap_08481B24/layout.inc | 16 + .../UnknownMap_08481B24/map.bin | 0 .../UnknownMap_08481DBC/border.bin | Bin data/layouts/UnknownMap_08481DBC/layout.inc | 16 + .../UnknownMap_08481DBC/map.bin | 0 .../UnknownMap_25_29/border.bin | 0 data/layouts/UnknownMap_25_29/layout.inc | 16 + .../UnknownMap_25_29/map.bin | 0 .../UnknownMap_25_30/border.bin | 0 data/layouts/UnknownMap_25_30/layout.inc | 16 + .../UnknownMap_25_30/map.bin | 0 .../UnknownMap_25_31/border.bin | 0 data/layouts/UnknownMap_25_31/layout.inc | 16 + .../UnknownMap_25_31/map.bin | 0 .../UnknownMap_25_32/border.bin | 0 data/layouts/UnknownMap_25_32/layout.inc | 16 + .../UnknownMap_25_32/map.bin | 0 .../UnknownMap_25_33/border.bin | 0 data/layouts/UnknownMap_25_33/layout.inc | 16 + .../UnknownMap_25_33/map.bin | 0 .../UnknownMap_25_34/border.bin | 0 data/layouts/UnknownMap_25_34/layout.inc | 16 + .../UnknownMap_25_34/map.bin | 0 .../VerdanturfTown/border.bin | Bin data/layouts/VerdanturfTown/layout.inc | 16 + data/{maps => layouts}/VerdanturfTown/map.bin | Bin .../border.bin | Bin .../layout.inc | 16 + .../map.bin | Bin .../VerdanturfTown_WandasHouse/border.bin | Bin .../VerdanturfTown_WandasHouse/layout.inc | 16 + .../VerdanturfTown_WandasHouse/map.bin | Bin .../VictoryRoad_1F/border.bin | 0 data/layouts/VictoryRoad_1F/layout.inc | 16 + data/{maps => layouts}/VictoryRoad_1F/map.bin | 0 .../VictoryRoad_B1F/border.bin | 0 data/layouts/VictoryRoad_B1F/layout.inc | 16 + .../{maps => layouts}/VictoryRoad_B1F/map.bin | 0 .../VictoryRoad_B2F/border.bin | 0 data/layouts/VictoryRoad_B2F/layout.inc | 16 + .../{maps => layouts}/VictoryRoad_B2F/map.bin | 0 data/layouts_table.inc | 444 + data/maps.s | 6 +- .../AbandonedShip_CaptainsOffice/header.inc | 2 +- .../AbandonedShip_Corridors_1F/header.inc | 2 +- .../AbandonedShip_Corridors_B1F/header.inc | 2 +- data/maps/AbandonedShip_Deck/header.inc | 2 +- .../header.inc | 2 +- .../AbandonedShip_HiddenFloorRooms/header.inc | 2 +- data/maps/AbandonedShip_Room_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms2_B1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_1F/header.inc | 2 +- data/maps/AbandonedShip_Rooms_B1F/header.inc | 2 +- .../maps/AbandonedShip_Underwater1/header.inc | 2 +- .../maps/AbandonedShip_Underwater2/header.inc | 2 +- data/maps/AlteringCave/header.inc | 2 +- data/maps/AncientTomb/header.inc | 2 +- data/maps/AquaHideout_1F/header.inc | 2 +- data/maps/AquaHideout_B1F/header.inc | 2 +- data/maps/AquaHideout_B2F/header.inc | 2 +- .../AquaHideout_UnusedRubyMap1/header.inc | 2 +- .../AquaHideout_UnusedRubyMap2/header.inc | 2 +- .../AquaHideout_UnusedRubyMap3/header.inc | 2 +- data/maps/ArtisanCave_1F/header.inc | 2 +- data/maps/ArtisanCave_B1F/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattleDomeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_BattlePikeLobby/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/BattleFrontier_Lounge1/header.inc | 2 +- data/maps/BattleFrontier_Lounge2/header.inc | 2 +- data/maps/BattleFrontier_Lounge3/header.inc | 2 +- data/maps/BattleFrontier_Lounge4/header.inc | 2 +- data/maps/BattleFrontier_Lounge5/header.inc | 2 +- data/maps/BattleFrontier_Lounge6/header.inc | 2 +- data/maps/BattleFrontier_Lounge7/header.inc | 2 +- data/maps/BattleFrontier_Lounge8/header.inc | 2 +- data/maps/BattleFrontier_Lounge9/header.inc | 2 +- data/maps/BattleFrontier_Mart/header.inc | 2 +- .../BattleFrontier_OutsideEast/header.inc | 2 +- .../BattleFrontier_OutsideWest/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../BattleFrontier_RankingHall/header.inc | 2 +- .../BattleFrontier_ReceptionGate/header.inc | 2 +- .../BattleFrontier_ScottsHouse/header.inc | 2 +- data/maps/BattlePyramidSquare01/header.inc | 2 +- data/maps/BattlePyramidSquare02/header.inc | 2 +- data/maps/BattlePyramidSquare03/header.inc | 2 +- data/maps/BattlePyramidSquare04/header.inc | 2 +- data/maps/BattlePyramidSquare05/header.inc | 2 +- data/maps/BattlePyramidSquare06/header.inc | 2 +- data/maps/BattlePyramidSquare07/header.inc | 2 +- data/maps/BattlePyramidSquare08/header.inc | 2 +- data/maps/BattlePyramidSquare09/header.inc | 2 +- data/maps/BattlePyramidSquare10/header.inc | 2 +- data/maps/BattlePyramidSquare11/header.inc | 2 +- data/maps/BattlePyramidSquare12/header.inc | 2 +- data/maps/BattlePyramidSquare13/header.inc | 2 +- data/maps/BattlePyramidSquare14/header.inc | 2 +- data/maps/BattlePyramidSquare15/header.inc | 2 +- data/maps/BattlePyramidSquare16/header.inc | 2 +- data/maps/BirthIsland_Exterior/header.inc | 2 +- data/maps/BirthIsland_Harbor/header.inc | 2 +- data/maps/CaveOfOrigin_1F/header.inc | 2 +- data/maps/CaveOfOrigin_B1F/header.inc | 2 +- data/maps/CaveOfOrigin_Entrance/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/DesertRuins/header.inc | 2 +- data/maps/DesertUnderpass/header.inc | 2 +- data/maps/DewfordTown/header.inc | 2 +- data/maps/DewfordTown_Gym/header.inc | 2 +- data/maps/DewfordTown_Hall/header.inc | 2 +- data/maps/DewfordTown_House1/header.inc | 2 +- data/maps/DewfordTown_House2/header.inc | 2 +- .../DewfordTown_PokemonCenter_1F/header.inc | 2 +- .../DewfordTown_PokemonCenter_2F/header.inc | 2 +- data/maps/DoubleBattleColosseum/header.inc | 2 +- data/maps/EverGrandeCity/header.inc | 2 +- .../EverGrandeCity_ChampionsRoom/header.inc | 2 +- .../maps/EverGrandeCity_DrakesRoom/header.inc | 2 +- .../EverGrandeCity_GlaciasRoom/header.inc | 2 +- data/maps/EverGrandeCity_Hall1/header.inc | 2 +- data/maps/EverGrandeCity_Hall2/header.inc | 2 +- data/maps/EverGrandeCity_Hall3/header.inc | 2 +- data/maps/EverGrandeCity_Hall4/header.inc | 2 +- data/maps/EverGrandeCity_Hall5/header.inc | 2 +- .../maps/EverGrandeCity_HallOfFame/header.inc | 2 +- .../EverGrandeCity_PhoebesRoom/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../EverGrandeCity_SidneysRoom/header.inc | 2 +- data/maps/FallarborTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../FallarborTown_BattleTentLobby/header.inc | 2 +- data/maps/FallarborTown_House1/header.inc | 2 +- data/maps/FallarborTown_House2/header.inc | 2 +- data/maps/FallarborTown_Mart/header.inc | 2 +- .../FallarborTown_PokemonCenter_1F/header.inc | 2 +- .../FallarborTown_PokemonCenter_2F/header.inc | 2 +- data/maps/FarawayIsland_Entrance/header.inc | 2 +- data/maps/FarawayIsland_Interior/header.inc | 2 +- data/maps/FieryPath/header.inc | 2 +- data/maps/FortreeCity/header.inc | 2 +- .../FortreeCity_DecorationShop/header.inc | 2 +- data/maps/FortreeCity_Gym/header.inc | 2 +- data/maps/FortreeCity_House1/header.inc | 2 +- data/maps/FortreeCity_House2/header.inc | 2 +- data/maps/FortreeCity_House3/header.inc | 2 +- data/maps/FortreeCity_House4/header.inc | 2 +- data/maps/FortreeCity_House5/header.inc | 2 +- data/maps/FortreeCity_Mart/header.inc | 2 +- .../FortreeCity_PokemonCenter_1F/header.inc | 2 +- .../FortreeCity_PokemonCenter_2F/header.inc | 2 +- data/maps/GraniteCave_1F/header.inc | 2 +- data/maps/GraniteCave_B1F/header.inc | 2 +- data/maps/GraniteCave_B2F/header.inc | 2 +- data/maps/GraniteCave_StevensRoom/header.inc | 2 +- data/maps/InsideOfTruck/header.inc | 2 +- data/maps/IslandCave/header.inc | 2 +- data/maps/JaggedPass/header.inc | 2 +- data/maps/LavaridgeTown/header.inc | 2 +- data/maps/LavaridgeTown_Gym_1F/header.inc | 2 +- data/maps/LavaridgeTown_Gym_B1F/header.inc | 2 +- data/maps/LavaridgeTown_HerbShop/header.inc | 2 +- data/maps/LavaridgeTown_House/header.inc | 2 +- data/maps/LavaridgeTown_Mart/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_1F/header.inc | 2 +- .../LavaridgeTown_PokemonCenter_2F/header.inc | 2 +- data/maps/LilycoveCity/header.inc | 2 +- data/maps/LilycoveCity_ContestHall/header.inc | 2 +- .../maps/LilycoveCity_ContestLobby/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_1F/header.inc | 2 +- .../LilycoveCity_CoveLilyMotel_2F/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_Harbor/header.inc | 2 +- data/maps/LilycoveCity_House1/header.inc | 2 +- data/maps/LilycoveCity_House2/header.inc | 2 +- data/maps/LilycoveCity_House3/header.inc | 2 +- data/maps/LilycoveCity_House4/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_1F/header.inc | 2 +- .../LilycoveCity_LilycoveMuseum_2F/header.inc | 2 +- .../LilycoveCity_MoveDeletersHouse/header.inc | 2 +- .../LilycoveCity_PokemonCenter_1F/header.inc | 2 +- .../LilycoveCity_PokemonCenter_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/LilycoveCity_UnusedMart/header.inc | 2 +- data/maps/LinkContestRoom1/header.inc | 2 +- data/maps/LinkContestRoom2/header.inc | 2 +- data/maps/LinkContestRoom3/header.inc | 2 +- data/maps/LinkContestRoom4/header.inc | 2 +- data/maps/LinkContestRoom5/header.inc | 2 +- data/maps/LinkContestRoom6/header.inc | 2 +- data/maps/LittlerootTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../LittlerootTown_MaysHouse_1F/header.inc | 2 +- .../LittlerootTown_MaysHouse_2F/header.inc | 2 +- .../header.inc | 2 +- data/maps/MagmaHideout_1F/header.inc | 2 +- data/maps/MagmaHideout_2F_1R/header.inc | 2 +- data/maps/MagmaHideout_2F_2R/header.inc | 2 +- data/maps/MagmaHideout_2F_3R/header.inc | 2 +- data/maps/MagmaHideout_3F_1R/header.inc | 2 +- data/maps/MagmaHideout_3F_2R/header.inc | 2 +- data/maps/MagmaHideout_3F_3R/header.inc | 2 +- data/maps/MagmaHideout_4F/header.inc | 2 +- data/maps/MarineCave_End/header.inc | 2 +- data/maps/MarineCave_Entrance/header.inc | 2 +- data/maps/MauvilleCity/header.inc | 2 +- data/maps/MauvilleCity_BikeShop/header.inc | 2 +- data/maps/MauvilleCity_GameCorner/header.inc | 2 +- data/maps/MauvilleCity_Gym/header.inc | 2 +- data/maps/MauvilleCity_House1/header.inc | 2 +- data/maps/MauvilleCity_House2/header.inc | 2 +- data/maps/MauvilleCity_Mart/header.inc | 2 +- .../MauvilleCity_PokemonCenter_1F/header.inc | 2 +- .../MauvilleCity_PokemonCenter_2F/header.inc | 2 +- data/maps/MeteorFalls_1F_1R/header.inc | 2 +- data/maps/MeteorFalls_1F_2R/header.inc | 2 +- data/maps/MeteorFalls_B1F_1R/header.inc | 2 +- data/maps/MeteorFalls_B1F_2R/header.inc | 2 +- data/maps/MeteorFalls_StevensCave/header.inc | 2 +- data/maps/MirageTower_1F/header.inc | 2 +- data/maps/MirageTower_2F/header.inc | 2 +- data/maps/MirageTower_3F/header.inc | 2 +- data/maps/MirageTower_4F/header.inc | 2 +- data/maps/MossdeepCity/header.inc | 2 +- .../MossdeepCity_GameCorner_1F/header.inc | 2 +- .../MossdeepCity_GameCorner_B1F/header.inc | 2 +- data/maps/MossdeepCity_Gym/header.inc | 2 +- data/maps/MossdeepCity_House1/header.inc | 2 +- data/maps/MossdeepCity_House2/header.inc | 2 +- data/maps/MossdeepCity_House3/header.inc | 2 +- data/maps/MossdeepCity_House4/header.inc | 2 +- data/maps/MossdeepCity_Mart/header.inc | 2 +- .../MossdeepCity_PokemonCenter_1F/header.inc | 2 +- .../MossdeepCity_PokemonCenter_2F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_1F/header.inc | 2 +- .../MossdeepCity_SpaceCenter_2F/header.inc | 2 +- .../maps/MossdeepCity_StevensHouse/header.inc | 2 +- data/maps/MtChimney/header.inc | 2 +- .../maps/MtChimney_CableCarStation/header.inc | 2 +- data/maps/MtPyre_1F/header.inc | 2 +- data/maps/MtPyre_2F/header.inc | 2 +- data/maps/MtPyre_3F/header.inc | 2 +- data/maps/MtPyre_4F/header.inc | 2 +- data/maps/MtPyre_5F/header.inc | 2 +- data/maps/MtPyre_6F/header.inc | 2 +- data/maps/MtPyre_Exterior/header.inc | 2 +- data/maps/MtPyre_Summit/header.inc | 2 +- data/maps/NavelRock_B1F/header.inc | 2 +- data/maps/NavelRock_Bottom/header.inc | 2 +- data/maps/NavelRock_Down01/header.inc | 2 +- data/maps/NavelRock_Down02/header.inc | 2 +- data/maps/NavelRock_Down03/header.inc | 2 +- data/maps/NavelRock_Down04/header.inc | 2 +- data/maps/NavelRock_Down05/header.inc | 2 +- data/maps/NavelRock_Down06/header.inc | 2 +- data/maps/NavelRock_Down07/header.inc | 2 +- data/maps/NavelRock_Down08/header.inc | 2 +- data/maps/NavelRock_Down09/header.inc | 2 +- data/maps/NavelRock_Down10/header.inc | 2 +- data/maps/NavelRock_Down11/header.inc | 2 +- data/maps/NavelRock_Entrance/header.inc | 2 +- data/maps/NavelRock_Exterior/header.inc | 2 +- data/maps/NavelRock_Fork/header.inc | 2 +- data/maps/NavelRock_Harbor/header.inc | 2 +- data/maps/NavelRock_Top/header.inc | 2 +- data/maps/NavelRock_Up1/header.inc | 2 +- data/maps/NavelRock_Up2/header.inc | 2 +- data/maps/NavelRock_Up3/header.inc | 2 +- data/maps/NavelRock_Up4/header.inc | 2 +- data/maps/NewMauville_Entrance/header.inc | 2 +- data/maps/NewMauville_Inside/header.inc | 2 +- data/maps/OldaleTown/header.inc | 2 +- data/maps/OldaleTown_House1/header.inc | 2 +- data/maps/OldaleTown_House2/header.inc | 2 +- data/maps/OldaleTown_Mart/header.inc | 2 +- .../OldaleTown_PokemonCenter_1F/header.inc | 2 +- .../OldaleTown_PokemonCenter_2F/header.inc | 2 +- data/maps/PacifidlogTown/header.inc | 2 +- data/maps/PacifidlogTown_House1/header.inc | 2 +- data/maps/PacifidlogTown_House2/header.inc | 2 +- data/maps/PacifidlogTown_House3/header.inc | 2 +- data/maps/PacifidlogTown_House4/header.inc | 2 +- data/maps/PacifidlogTown_House5/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/PetalburgCity/header.inc | 2 +- data/maps/PetalburgCity_Gym/header.inc | 2 +- data/maps/PetalburgCity_House1/header.inc | 2 +- data/maps/PetalburgCity_House2/header.inc | 2 +- data/maps/PetalburgCity_Mart/header.inc | 2 +- .../PetalburgCity_PokemonCenter_1F/header.inc | 2 +- .../PetalburgCity_PokemonCenter_2F/header.inc | 2 +- .../maps/PetalburgCity_WallysHouse/header.inc | 2 +- data/maps/PetalburgWoods/header.inc | 2 +- data/maps/RecordCorner/header.inc | 2 +- data/maps/Route101/header.inc | 2 +- data/maps/Route102/header.inc | 2 +- data/maps/Route103/header.inc | 2 +- data/maps/Route104/header.inc | 2 +- data/maps/Route104_MrBrineysHouse/header.inc | 2 +- .../Route104_PrettyPetalFlowerShop/header.inc | 2 +- data/maps/Route104_Prototype/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route105/header.inc | 2 +- data/maps/Route106/header.inc | 2 +- data/maps/Route107/header.inc | 2 +- data/maps/Route108/header.inc | 2 +- data/maps/Route109/header.inc | 2 +- data/maps/Route109_SeashoreHouse/header.inc | 2 +- data/maps/Route110/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../Route110_TrickHouseCorridor/header.inc | 2 +- data/maps/Route110_TrickHouseEnd/header.inc | 2 +- .../Route110_TrickHouseEntrance/header.inc | 2 +- .../Route110_TrickHousePuzzle1/header.inc | 2 +- .../Route110_TrickHousePuzzle2/header.inc | 2 +- .../Route110_TrickHousePuzzle3/header.inc | 2 +- .../Route110_TrickHousePuzzle4/header.inc | 2 +- .../Route110_TrickHousePuzzle5/header.inc | 2 +- .../Route110_TrickHousePuzzle6/header.inc | 2 +- .../Route110_TrickHousePuzzle7/header.inc | 2 +- .../Route110_TrickHousePuzzle8/header.inc | 2 +- data/maps/Route111/header.inc | 2 +- .../maps/Route111_OldLadysRestStop/header.inc | 2 +- .../Route111_WinstrateFamilysHouse/header.inc | 2 +- data/maps/Route112/header.inc | 2 +- data/maps/Route112_CableCarStation/header.inc | 2 +- data/maps/Route113/header.inc | 2 +- data/maps/Route113_GlassWorkshop/header.inc | 2 +- data/maps/Route114/header.inc | 2 +- .../Route114_FossilManiacsHouse/header.inc | 2 +- .../Route114_FossilManiacsTunnel/header.inc | 2 +- data/maps/Route114_LanettesHouse/header.inc | 2 +- data/maps/Route115/header.inc | 2 +- data/maps/Route116/header.inc | 2 +- .../Route116_TunnelersRestHouse/header.inc | 2 +- data/maps/Route117/header.inc | 2 +- data/maps/Route117_PokemonDayCare/header.inc | 2 +- data/maps/Route118/header.inc | 2 +- data/maps/Route119/header.inc | 2 +- data/maps/Route119_House/header.inc | 2 +- .../Route119_WeatherInstitute_1F/header.inc | 2 +- .../Route119_WeatherInstitute_2F/header.inc | 2 +- data/maps/Route120/header.inc | 2 +- data/maps/Route121/header.inc | 2 +- .../Route121_SafariZoneEntrance/header.inc | 2 +- data/maps/Route122/header.inc | 2 +- data/maps/Route123/header.inc | 2 +- .../Route123_BerryMastersHouse/header.inc | 2 +- data/maps/Route124/header.inc | 2 +- .../header.inc | 2 +- data/maps/Route125/header.inc | 2 +- data/maps/Route126/header.inc | 2 +- data/maps/Route127/header.inc | 2 +- data/maps/Route128/header.inc | 2 +- data/maps/Route129/header.inc | 2 +- data/maps/Route130/header.inc | 2 +- data/maps/Route131/header.inc | 2 +- data/maps/Route132/header.inc | 2 +- data/maps/Route133/header.inc | 2 +- data/maps/Route134/header.inc | 2 +- data/maps/RustboroCity/header.inc | 2 +- .../maps/RustboroCity_CuttersHouse/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_1F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_2F/header.inc | 2 +- .../maps/RustboroCity_DevonCorp_3F/header.inc | 2 +- data/maps/RustboroCity_Flat1_1F/header.inc | 2 +- data/maps/RustboroCity_Flat1_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_1F/header.inc | 2 +- data/maps/RustboroCity_Flat2_2F/header.inc | 2 +- data/maps/RustboroCity_Flat2_3F/header.inc | 2 +- data/maps/RustboroCity_Gym/header.inc | 2 +- data/maps/RustboroCity_House1/header.inc | 2 +- data/maps/RustboroCity_House2/header.inc | 2 +- data/maps/RustboroCity_House3/header.inc | 2 +- data/maps/RustboroCity_Mart/header.inc | 2 +- .../RustboroCity_PokemonCenter_1F/header.inc | 2 +- .../RustboroCity_PokemonCenter_2F/header.inc | 2 +- .../RustboroCity_PokemonSchool/header.inc | 2 +- data/maps/RusturfTunnel/header.inc | 2 +- data/maps/SSTidalCorridor/header.inc | 2 +- data/maps/SSTidalLowerDeck/header.inc | 2 +- data/maps/SSTidalRooms/header.inc | 2 +- data/maps/SafariZone_North/header.inc | 2 +- data/maps/SafariZone_Northeast/header.inc | 2 +- data/maps/SafariZone_Northwest/header.inc | 2 +- data/maps/SafariZone_RestHouse/header.inc | 2 +- data/maps/SafariZone_South/header.inc | 2 +- data/maps/SafariZone_Southeast/header.inc | 2 +- data/maps/SafariZone_Southwest/header.inc | 2 +- data/maps/ScorchedSlab/header.inc | 2 +- data/maps/SeafloorCavern_Entrance/header.inc | 2 +- data/maps/SeafloorCavern_Room1/header.inc | 2 +- data/maps/SeafloorCavern_Room2/header.inc | 2 +- data/maps/SeafloorCavern_Room3/header.inc | 2 +- data/maps/SeafloorCavern_Room4/header.inc | 2 +- data/maps/SeafloorCavern_Room5/header.inc | 2 +- data/maps/SeafloorCavern_Room6/header.inc | 2 +- data/maps/SeafloorCavern_Room7/header.inc | 2 +- data/maps/SeafloorCavern_Room8/header.inc | 2 +- data/maps/SeafloorCavern_Room9/header.inc | 2 +- data/maps/SealedChamber_InnerRoom/header.inc | 2 +- data/maps/SealedChamber_OuterRoom/header.inc | 2 +- data/maps/SecretBase_BlueCave1/header.inc | 2 +- data/maps/SecretBase_BlueCave2/header.inc | 2 +- data/maps/SecretBase_BlueCave3/header.inc | 2 +- data/maps/SecretBase_BlueCave4/header.inc | 2 +- data/maps/SecretBase_BrownCave1/header.inc | 2 +- data/maps/SecretBase_BrownCave2/header.inc | 2 +- data/maps/SecretBase_BrownCave3/header.inc | 2 +- data/maps/SecretBase_BrownCave4/header.inc | 2 +- data/maps/SecretBase_RedCave1/header.inc | 2 +- data/maps/SecretBase_RedCave2/header.inc | 2 +- data/maps/SecretBase_RedCave3/header.inc | 2 +- data/maps/SecretBase_RedCave4/header.inc | 2 +- data/maps/SecretBase_Shrub1/header.inc | 2 +- data/maps/SecretBase_Shrub2/header.inc | 2 +- data/maps/SecretBase_Shrub3/header.inc | 2 +- data/maps/SecretBase_Shrub4/header.inc | 2 +- data/maps/SecretBase_Tree1/header.inc | 2 +- data/maps/SecretBase_Tree2/header.inc | 2 +- data/maps/SecretBase_Tree3/header.inc | 2 +- data/maps/SecretBase_Tree4/header.inc | 2 +- data/maps/SecretBase_YellowCave1/header.inc | 2 +- data/maps/SecretBase_YellowCave2/header.inc | 2 +- data/maps/SecretBase_YellowCave3/header.inc | 2 +- data/maps/SecretBase_YellowCave4/header.inc | 2 +- .../ShoalCave_HighTideEntranceRoom/header.inc | 2 +- .../ShoalCave_HighTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideEntranceRoom/header.inc | 2 +- data/maps/ShoalCave_LowTideIceRoom/header.inc | 2 +- .../ShoalCave_LowTideInnerRoom/header.inc | 2 +- .../ShoalCave_LowTideLowerRoom/header.inc | 2 +- .../ShoalCave_LowTideStairsRoom/header.inc | 2 +- data/maps/SingleBattleColosseum/header.inc | 2 +- data/maps/SkyPillar_1F/header.inc | 2 +- data/maps/SkyPillar_2F/header.inc | 2 +- data/maps/SkyPillar_3F/header.inc | 2 +- data/maps/SkyPillar_4F/header.inc | 2 +- data/maps/SkyPillar_5F/header.inc | 2 +- data/maps/SkyPillar_Entrance/header.inc | 2 +- data/maps/SkyPillar_Outside/header.inc | 2 +- data/maps/SkyPillar_Top/header.inc | 2 +- data/maps/SlateportCity/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../SlateportCity_BattleTentLobby/header.inc | 2 +- data/maps/SlateportCity_Harbor/header.inc | 2 +- data/maps/SlateportCity_House1/header.inc | 2 +- data/maps/SlateportCity_House2/header.inc | 2 +- data/maps/SlateportCity_Mart/header.inc | 2 +- .../SlateportCity_OceanicMuseum_1F/header.inc | 2 +- .../SlateportCity_OceanicMuseum_2F/header.inc | 2 +- .../SlateportCity_PokemonCenter_1F/header.inc | 2 +- .../SlateportCity_PokemonCenter_2F/header.inc | 2 +- .../SlateportCity_PokemonFanClub/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity/header.inc | 2 +- data/maps/SootopolisCity_Gym_1F/header.inc | 2 +- data/maps/SootopolisCity_Gym_B1F/header.inc | 2 +- data/maps/SootopolisCity_House1/header.inc | 2 +- data/maps/SootopolisCity_House2/header.inc | 2 +- data/maps/SootopolisCity_House3/header.inc | 2 +- data/maps/SootopolisCity_House4/header.inc | 2 +- data/maps/SootopolisCity_House5/header.inc | 2 +- data/maps/SootopolisCity_House6/header.inc | 2 +- data/maps/SootopolisCity_House7/header.inc | 2 +- .../header.inc | 2 +- data/maps/SootopolisCity_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- data/maps/SouthernIsland_Exterior/header.inc | 2 +- data/maps/SouthernIsland_Interior/header.inc | 2 +- data/maps/TerraCave_End/header.inc | 2 +- data/maps/TerraCave_Entrance/header.inc | 2 +- data/maps/TradeCenter/header.inc | 2 +- data/maps/TrainerHill_1F/header.inc | 2 +- data/maps/TrainerHill_2F/header.inc | 2 +- data/maps/TrainerHill_3F/header.inc | 2 +- data/maps/TrainerHill_4F/header.inc | 2 +- data/maps/TrainerHill_Elevator/header.inc | 2 +- data/maps/TrainerHill_Entrance/header.inc | 2 +- data/maps/TrainerHill_Roof/header.inc | 2 +- data/maps/Underwater1/header.inc | 2 +- data/maps/Underwater2/header.inc | 2 +- data/maps/Underwater3/header.inc | 2 +- data/maps/Underwater4/header.inc | 2 +- data/maps/Underwater5/header.inc | 2 +- data/maps/Underwater6/header.inc | 2 +- data/maps/Underwater7/header.inc | 2 +- data/maps/Underwater_MarineCave/header.inc | 2 +- data/maps/Underwater_Route134/header.inc | 2 +- .../maps/Underwater_SeafloorCavern/header.inc | 2 +- data/maps/Underwater_SealedChamber/header.inc | 2 +- .../maps/Underwater_SootopolisCity/header.inc | 2 +- data/maps/UnionRoom/header.inc | 2 +- data/maps/UnknownMap_25_29/header.inc | 2 +- data/maps/UnknownMap_25_30/header.inc | 2 +- data/maps/UnknownMap_25_31/header.inc | 2 +- data/maps/UnknownMap_25_32/header.inc | 2 +- data/maps/UnknownMap_25_33/header.inc | 2 +- data/maps/UnknownMap_25_34/header.inc | 2 +- data/maps/VerdanturfTown/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_BattleTentLobby/header.inc | 2 +- .../header.inc | 2 +- data/maps/VerdanturfTown_House/header.inc | 2 +- data/maps/VerdanturfTown_Mart/header.inc | 2 +- .../header.inc | 2 +- .../header.inc | 2 +- .../VerdanturfTown_WandasHouse/header.inc | 2 +- data/maps/VictoryRoad_1F/header.inc | 2 +- data/maps/VictoryRoad_B1F/header.inc | 2 +- data/maps/VictoryRoad_B2F/header.inc | 2 +- data/maps/_assets.inc | 7606 ----------------- data/maps/attributes_table.inc | 444 - data/maps/{_groups.inc => groups.inc} | 0 1848 files changed, 8462 insertions(+), 8572 deletions(-) create mode 100755 data/layouts.inc rename data/{maps => layouts}/AbandonedShip_CaptainsOffice/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_CaptainsOffice/layout.inc rename data/{maps => layouts}/AbandonedShip_CaptainsOffice/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Corridors_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Corridors_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Corridors_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Corridors_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Corridors_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Corridors_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Deck/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Deck/layout.inc rename data/{maps => layouts}/AbandonedShip_Deck/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_HiddenFloorCorridors/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc rename data/{maps => layouts}/AbandonedShip_HiddenFloorCorridors/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_HiddenFloorRooms/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc rename data/{maps => layouts}/AbandonedShip_HiddenFloorRooms/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Room_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Room_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Room_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms2_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms2_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms2_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms2_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms2_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms_1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms_1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms_1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Rooms_B1F/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Rooms_B1F/layout.inc rename data/{maps => layouts}/AbandonedShip_Rooms_B1F/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Underwater1/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Underwater1/layout.inc rename data/{maps => layouts}/AbandonedShip_Underwater1/map.bin (100%) rename data/{maps => layouts}/AbandonedShip_Underwater2/border.bin (100%) create mode 100644 data/layouts/AbandonedShip_Underwater2/layout.inc rename data/{maps => layouts}/AbandonedShip_Underwater2/map.bin (100%) rename data/{maps => layouts}/AlteringCave/border.bin (100%) create mode 100644 data/layouts/AlteringCave/layout.inc rename data/{maps => layouts}/AlteringCave/map.bin (100%) rename data/{maps => layouts}/AncientTomb/border.bin (100%) create mode 100644 data/layouts/AncientTomb/layout.inc rename data/{maps => layouts}/AncientTomb/map.bin (100%) rename data/{maps => layouts}/AquaHideout_1F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_1F/layout.inc rename data/{maps => layouts}/AquaHideout_1F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_B1F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_B1F/layout.inc rename data/{maps => layouts}/AquaHideout_B1F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_B2F/border.bin (100%) create mode 100644 data/layouts/AquaHideout_B2F/layout.inc rename data/{maps => layouts}/AquaHideout_B2F/map.bin (100%) rename data/{maps => layouts}/AquaHideout_UnusedRubyMap1/border.bin (100%) create mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/layout.inc rename data/{maps => layouts}/AquaHideout_UnusedRubyMap1/map.bin (100%) rename data/{maps => layouts}/AquaHideout_UnusedRubyMap2/border.bin (100%) create mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/layout.inc rename data/{maps => layouts}/AquaHideout_UnusedRubyMap2/map.bin (100%) rename data/{maps => layouts}/AquaHideout_UnusedRubyMap3/border.bin (100%) create mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/layout.inc rename data/{maps => layouts}/AquaHideout_UnusedRubyMap3/map.bin (100%) rename data/{maps => layouts}/ArtisanCave_1F/border.bin (100%) create mode 100644 data/layouts/ArtisanCave_1F/layout.inc rename data/{maps => layouts}/ArtisanCave_1F/map.bin (100%) rename data/{maps => layouts}/ArtisanCave_B1F/border.bin (100%) create mode 100644 data/layouts/ArtisanCave_B1F/layout.inc rename data/{maps => layouts}/ArtisanCave_B1F/map.bin (100%) rename data/{maps/BattleFrontier_BattleArenaBattleRoom => layouts/BattleElevator}/border.bin (100%) create mode 100644 data/layouts/BattleElevator/layout.inc rename data/{maps/BattleFrontier_BattleTowerElevator => layouts/BattleElevator}/map.bin (100%) rename data/{maps/BattleFrontier_BattleArenaCorridor => layouts/BattleFrontier_BattleArenaBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleArenaBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleArenaLobby => layouts/BattleFrontier_BattleArenaCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleArenaCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomeBattleRoom => layouts/BattleFrontier_BattleArenaLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleArenaLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomeCorridor => layouts/BattleFrontier_BattleDomeBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomeBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomeLobby => layouts/BattleFrontier_BattleDomeCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomeCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattleDomePreBattleRoom => layouts/BattleFrontier_BattleDomeLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomeLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattleFactoryBattleRoom => layouts/BattleFrontier_BattleDomePreBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleDomePreBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleFactoryLobby => layouts/BattleFrontier_BattleFactoryBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleFactoryBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleFactoryPreBattleRoom => layouts/BattleFrontier_BattleFactoryLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleFactoryLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattlePalaceLobby => layouts/BattleFrontier_BattleFactoryPreBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleFactoryPreBattleRoom/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattlePalaceBattleRoom/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePalaceBattleRoom/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattlePalaceCorridor/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePalaceCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeCorridor => layouts/BattleFrontier_BattlePalaceLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePalaceLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeLobby => layouts/BattleFrontier_BattlePikeCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeRandomRoom1 => layouts/BattleFrontier_BattlePikeLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeRandomRoom2 => layouts/BattleFrontier_BattlePikeRandomRoom1}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeRandomRoom1/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeRandomRoom3 => layouts/BattleFrontier_BattlePikeRandomRoom2}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeRandomRoom2/map.bin (100%) rename data/{maps/BattleFrontier_BattlePikeThreePathRoom => layouts/BattleFrontier_BattlePikeRandomRoom3}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeRandomRoom3/map.bin (100%) rename data/{maps/BattleFrontier_BattlePointExchangeServiceCorner => layouts/BattleFrontier_BattlePikeThreePathRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePikeThreePathRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattlePyramidEmptySquare => layouts/BattleFrontier_BattlePointExchangeServiceCorner}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePointExchangeServiceCorner/map.bin (100%) rename data/{maps/BattleFrontier_BattlePyramidLobby => layouts/BattleFrontier_BattlePyramidEmptySquare}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePyramidEmptySquare/map.bin (100%) rename data/{maps/BattleFrontier_BattlePyramidTop => layouts/BattleFrontier_BattlePyramidLobby}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePyramidLobby/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerBattleRoom => layouts/BattleFrontier_BattlePyramidTop}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/layout.inc rename data/{maps => layouts}/BattleFrontier_BattlePyramidTop/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerCorridor => layouts/BattleFrontier_BattleTowerBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerBattleRoom/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerCorridor2 => layouts/BattleFrontier_BattleTowerCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerCorridor/map.bin (100%) rename data/{maps/BattleFrontier_BattleTowerElevator => layouts/BattleFrontier_BattleTowerCorridor2}/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerCorridor2/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattleTowerLobby/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerLobby/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_BattleTowerMultiBattleRoom/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc rename data/{maps => layouts}/BattleFrontier_BattleTowerMultiBattleRoom/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_Lounge1/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_Lounge1/layout.inc rename data/{maps/BattleFrontier_Lounge2 => layouts/BattleFrontier_Lounge1}/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_Lounge2/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_Lounge2/layout.inc rename data/{maps/BattleFrontier_Lounge1 => layouts/BattleFrontier_Lounge2}/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_OutsideEast/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_OutsideEast/layout.inc rename data/{maps => layouts}/BattleFrontier_OutsideEast/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_OutsideWest/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_OutsideWest/layout.inc rename data/{maps => layouts}/BattleFrontier_OutsideWest/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_RankingHall/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_RankingHall/layout.inc rename data/{maps => layouts}/BattleFrontier_RankingHall/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_ReceptionGate/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_ReceptionGate/layout.inc rename data/{maps => layouts}/BattleFrontier_ReceptionGate/map.bin (100%) rename data/{maps => layouts}/BattleFrontier_ScottsHouse/border.bin (100%) create mode 100644 data/layouts/BattleFrontier_ScottsHouse/layout.inc rename data/{maps => layouts}/BattleFrontier_ScottsHouse/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare01/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare01/layout.inc rename data/{maps => layouts}/BattlePyramidSquare01/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare02/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare02/layout.inc rename data/{maps => layouts}/BattlePyramidSquare02/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare03/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare03/layout.inc rename data/{maps => layouts}/BattlePyramidSquare03/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare04/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare04/layout.inc rename data/{maps => layouts}/BattlePyramidSquare04/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare05/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare05/layout.inc rename data/{maps => layouts}/BattlePyramidSquare05/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare06/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare06/layout.inc rename data/{maps => layouts}/BattlePyramidSquare06/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare07/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare07/layout.inc rename data/{maps => layouts}/BattlePyramidSquare07/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare08/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare08/layout.inc rename data/{maps => layouts}/BattlePyramidSquare08/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare09/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare09/layout.inc rename data/{maps => layouts}/BattlePyramidSquare09/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare10/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare10/layout.inc rename data/{maps => layouts}/BattlePyramidSquare10/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare11/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare11/layout.inc rename data/{maps => layouts}/BattlePyramidSquare11/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare12/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare12/layout.inc rename data/{maps => layouts}/BattlePyramidSquare12/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare13/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare13/layout.inc rename data/{maps => layouts}/BattlePyramidSquare13/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare14/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare14/layout.inc rename data/{maps => layouts}/BattlePyramidSquare14/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare15/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare15/layout.inc rename data/{maps => layouts}/BattlePyramidSquare15/map.bin (100%) rename data/{maps => layouts}/BattlePyramidSquare16/border.bin (100%) create mode 100644 data/layouts/BattlePyramidSquare16/layout.inc rename data/{maps => layouts}/BattlePyramidSquare16/map.bin (100%) rename data/{maps/DewfordTown_Gym => layouts/BattleTentBattleRoom}/border.bin (100%) create mode 100644 data/layouts/BattleTentBattleRoom/layout.inc rename data/{maps/FallarborTown_BattleTentBattleRoom => layouts/BattleTentBattleRoom}/map.bin (100%) rename data/{maps/EverGrandeCity_ChampionsRoom => layouts/BattleTentCorridor}/border.bin (100%) create mode 100644 data/layouts/BattleTentCorridor/layout.inc rename data/{maps/FallarborTown_BattleTentCorridor => layouts/BattleTentCorridor}/map.bin (100%) rename data/{maps/EverGrandeCity_DrakesRoom => layouts/BattleTentLobby}/border.bin (100%) create mode 100644 data/layouts/BattleTentLobby/layout.inc rename data/{maps/FallarborTown_BattleTentLobby => layouts/BattleTentLobby}/map.bin (100%) rename data/{maps => layouts}/BirthIsland_Exterior/border.bin (100%) create mode 100644 data/layouts/BirthIsland_Exterior/layout.inc rename data/{maps => layouts}/BirthIsland_Exterior/map.bin (100%) rename data/{maps/BirthIsland_Harbor => layouts/CableCarStation}/border.bin (100%) create mode 100644 data/layouts/CableCarStation/layout.inc rename data/{maps/Route112_CableCarStation => layouts/CableCarStation}/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_1F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_1F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_1F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_B1F/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_B1F/layout.inc rename data/{maps => layouts}/CaveOfOrigin_B1F/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_Entrance/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_Entrance/layout.inc rename data/{maps => layouts}/CaveOfOrigin_Entrance/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap1/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap1/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap2/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap2/map.bin (100%) rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap3/border.bin (100%) create mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc rename data/{maps => layouts}/CaveOfOrigin_UnusedRubySapphireMap3/map.bin (100%) rename data/{maps => layouts}/DesertRuins/border.bin (100%) create mode 100644 data/layouts/DesertRuins/layout.inc rename data/{maps => layouts}/DesertRuins/map.bin (100%) rename data/{maps => layouts}/DesertUnderpass/border.bin (100%) create mode 100644 data/layouts/DesertUnderpass/layout.inc rename data/{maps => layouts}/DesertUnderpass/map.bin (100%) rename data/{maps => layouts}/DewfordTown/border.bin (100%) create mode 100644 data/layouts/DewfordTown/layout.inc rename data/{maps => layouts}/DewfordTown/map.bin (100%) rename data/{maps/EverGrandeCity_GlaciasRoom => layouts/DewfordTown_Gym}/border.bin (100%) create mode 100644 data/layouts/DewfordTown_Gym/layout.inc rename data/{maps => layouts}/DewfordTown_Gym/map.bin (100%) rename data/{maps => layouts}/DewfordTown_Hall/border.bin (100%) create mode 100644 data/layouts/DewfordTown_Hall/layout.inc rename data/{maps => layouts}/DewfordTown_Hall/map.bin (100%) rename data/{maps/DewfordTown_House1 => layouts/DoubleBattleColosseum}/border.bin (100%) create mode 100644 data/layouts/DoubleBattleColosseum/layout.inc rename data/{maps => layouts}/DoubleBattleColosseum/map.bin (100%) rename data/{maps => layouts}/EverGrandeCity/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity/layout.inc rename data/{maps => layouts}/EverGrandeCity/map.bin (100%) rename data/{maps/EverGrandeCity_Hall1 => layouts/EverGrandeCity_ChampionsRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_ChampionsRoom/map.bin (100%) rename data/{maps/EverGrandeCity_Hall4 => layouts/EverGrandeCity_DrakesRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_DrakesRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_DrakesRoom/map.bin (100%) rename data/{maps/EverGrandeCity_HallOfFame => layouts/EverGrandeCity_GlaciasRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_GlaciasRoom/map.bin (100%) rename data/{maps/EverGrandeCity_PhoebesRoom => layouts/EverGrandeCity_Hall4}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_Hall4/layout.inc rename data/{maps => layouts}/EverGrandeCity_Hall4/map.bin (100%) rename data/{maps/EverGrandeCity_SidneysRoom => layouts/EverGrandeCity_HallOfFame}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_HallOfFame/layout.inc rename data/{maps => layouts}/EverGrandeCity_HallOfFame/map.bin (100%) rename data/{maps/FallarborTown_BattleTentBattleRoom => layouts/EverGrandeCity_PhoebesRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_PhoebesRoom/map.bin (100%) rename data/{maps/DewfordTown_House2 => layouts/EverGrandeCity_PokemonLeague_1F}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc rename data/{maps => layouts}/EverGrandeCity_PokemonLeague_1F/map.bin (100%) rename data/{maps/FallarborTown_BattleTentCorridor => layouts/EverGrandeCity_ShortHall}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_ShortHall/layout.inc rename data/{maps/EverGrandeCity_Hall1 => layouts/EverGrandeCity_ShortHall}/map.bin (100%) rename data/{maps/FallarborTown_BattleTentLobby => layouts/EverGrandeCity_SidneysRoom}/border.bin (100%) create mode 100644 data/layouts/EverGrandeCity_SidneysRoom/layout.inc rename data/{maps => layouts}/EverGrandeCity_SidneysRoom/map.bin (100%) rename data/{maps => layouts}/FallarborTown/border.bin (100%) create mode 100644 data/layouts/FallarborTown/layout.inc rename data/{maps => layouts}/FallarborTown/map.bin (100%) rename data/{maps/DoubleBattleColosseum => layouts/FallarborTown_LeftoverRSContestHall}/border.bin (100%) create mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc rename data/{maps => layouts}/FallarborTown_LeftoverRSContestHall/map.bin (100%) rename data/{maps/EverGrandeCity_PokemonLeague_1F => layouts/FallarborTown_LeftoverRSContestLobby}/border.bin (100%) create mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc rename data/{maps => layouts}/FallarborTown_LeftoverRSContestLobby/map.bin (100%) rename data/{maps => layouts}/FarawayIsland_Entrance/border.bin (100%) create mode 100644 data/layouts/FarawayIsland_Entrance/layout.inc rename data/{maps => layouts}/FarawayIsland_Entrance/map.bin (100%) rename data/{maps => layouts}/FarawayIsland_Interior/border.bin (100%) create mode 100644 data/layouts/FarawayIsland_Interior/layout.inc rename data/{maps => layouts}/FarawayIsland_Interior/map.bin (100%) rename data/{maps => layouts}/FieryPath/border.bin (100%) create mode 100644 data/layouts/FieryPath/layout.inc rename data/{maps => layouts}/FieryPath/map.bin (100%) rename data/{maps => layouts}/FortreeCity/border.bin (100%) create mode 100644 data/layouts/FortreeCity/layout.inc rename data/{maps => layouts}/FortreeCity/map.bin (100%) rename data/{maps/FallarborTown_LeftoverRSContestHall => layouts/FortreeCity_DecorationShop}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_DecorationShop/layout.inc rename data/{maps => layouts}/FortreeCity_DecorationShop/map.bin (100%) rename data/{maps => layouts}/FortreeCity_Gym/border.bin (100%) create mode 100644 data/layouts/FortreeCity_Gym/layout.inc rename data/{maps => layouts}/FortreeCity_Gym/map.bin (100%) rename data/{maps/FallarborTown_LeftoverRSContestLobby => layouts/FortreeCity_House1}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_House1/layout.inc rename data/{maps => layouts}/FortreeCity_House1/map.bin (100%) rename data/{maps/FortreeCity_DecorationShop => layouts/FortreeCity_House2}/border.bin (100%) create mode 100644 data/layouts/FortreeCity_House2/layout.inc rename data/{maps => layouts}/FortreeCity_House2/map.bin (100%) rename data/{maps => layouts}/GraniteCave_1F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_1F/layout.inc rename data/{maps => layouts}/GraniteCave_1F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_B1F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_B1F/layout.inc rename data/{maps => layouts}/GraniteCave_B1F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_B2F/border.bin (100%) create mode 100644 data/layouts/GraniteCave_B2F/layout.inc rename data/{maps => layouts}/GraniteCave_B2F/map.bin (100%) rename data/{maps => layouts}/GraniteCave_StevensRoom/border.bin (100%) create mode 100644 data/layouts/GraniteCave_StevensRoom/layout.inc rename data/{maps => layouts}/GraniteCave_StevensRoom/map.bin (100%) rename data/{maps/FortreeCity_House1 => layouts/Harbor}/border.bin (100%) create mode 100644 data/layouts/Harbor/layout.inc rename data/{maps/SlateportCity_Harbor => layouts/Harbor}/map.bin (100%) rename data/{maps/LavaridgeTown_Gym_1F => layouts/House1}/border.bin (100%) create mode 100644 data/layouts/House1/layout.inc rename data/{maps/OldaleTown_House1 => layouts/House1}/map.bin (100%) rename data/{maps/LavaridgeTown_Gym_B1F => layouts/House2}/border.bin (100%) create mode 100644 data/layouts/House2/layout.inc rename data/{maps/OldaleTown_House2 => layouts/House2}/map.bin (100%) rename data/{maps/FortreeCity_House2 => layouts/House3}/border.bin (100%) create mode 100644 data/layouts/House3/layout.inc rename data/{maps/DewfordTown_House1 => layouts/House3}/map.bin (100%) rename data/{maps/LavaridgeTown_PokemonCenter_1F => layouts/House4}/border.bin (100%) create mode 100644 data/layouts/House4/layout.inc rename data/{maps/DewfordTown_House2 => layouts/House4}/map.bin (100%) rename data/{maps/LilycoveCity_ContestHall => layouts/HouseWithBed}/border.bin (100%) create mode 100644 data/layouts/HouseWithBed/layout.inc rename data/{maps/PetalburgCity_House2 => layouts/HouseWithBed}/map.bin (100%) rename data/{maps => layouts}/InsideOfTruck/border.bin (100%) create mode 100644 data/layouts/InsideOfTruck/layout.inc rename data/{maps => layouts}/InsideOfTruck/map.bin (100%) rename data/{maps => layouts}/IslandCave/border.bin (100%) create mode 100644 data/layouts/IslandCave/layout.inc rename data/{maps => layouts}/IslandCave/map.bin (100%) rename data/{maps/LilycoveCity_ContestLobby => layouts/IslandHarbor}/border.bin (100%) create mode 100644 data/layouts/IslandHarbor/layout.inc rename data/{maps/BirthIsland_Harbor => layouts/IslandHarbor}/map.bin (100%) rename data/{maps => layouts}/JaggedPass/border.bin (100%) create mode 100644 data/layouts/JaggedPass/layout.inc rename data/{maps => layouts}/JaggedPass/map.bin (100%) rename data/{maps => layouts}/LavaridgeTown/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown/layout.inc rename data/{maps => layouts}/LavaridgeTown/map.bin (100%) rename data/{maps/LavaridgeTown_HerbShop => layouts/LavaridgeTown_Gym_1F}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_Gym_1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_Gym_1F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStoreElevator => layouts/LavaridgeTown_Gym_B1F}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_Gym_B1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_Gym_B1F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_1F => layouts/LavaridgeTown_HerbShop}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_HerbShop/layout.inc rename data/{maps => layouts}/LavaridgeTown_HerbShop/map.bin (100%) rename data/{maps/LilycoveCity_CoveLilyMotel_1F => layouts/LavaridgeTown_PokemonCenter_1F}/border.bin (100%) create mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc rename data/{maps => layouts}/LavaridgeTown_PokemonCenter_1F/map.bin (100%) rename data/{maps => layouts}/LilycoveCity/border.bin (100%) create mode 100644 data/layouts/LilycoveCity/layout.inc rename data/{maps => layouts}/LilycoveCity/map.bin (100%) rename data/{maps/LilycoveCity_CoveLilyMotel_2F => layouts/LilycoveCity_ContestHall}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_ContestHall/layout.inc rename data/{maps => layouts}/LilycoveCity_ContestHall/map.bin (100%) rename data/{maps/LilycoveCity_House2 => layouts/LilycoveCity_ContestLobby}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_ContestLobby/layout.inc rename data/{maps => layouts}/LilycoveCity_ContestLobby/map.bin (100%) rename data/{maps/LilycoveCity_LilycoveMuseum_1F => layouts/LilycoveCity_CoveLilyMotel_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_CoveLilyMotel_1F/map.bin (100%) rename data/{maps/LilycoveCity_LilycoveMuseum_2F => layouts/LilycoveCity_CoveLilyMotel_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_CoveLilyMotel_2F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_2F => layouts/LilycoveCity_DepartmentStoreElevator}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStoreElevator/map.bin (100%) rename data/{maps => layouts}/LilycoveCity_DepartmentStoreRooftop/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStoreRooftop/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_3F => layouts/LilycoveCity_DepartmentStore_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_1F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_4F => layouts/LilycoveCity_DepartmentStore_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_2F/map.bin (100%) rename data/{maps/LilycoveCity_DepartmentStore_5F => layouts/LilycoveCity_DepartmentStore_3F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_3F/map.bin (100%) rename data/{maps/LittlerootTown_BrendansHouse_1F => layouts/LilycoveCity_DepartmentStore_4F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_4F/map.bin (100%) rename data/{maps/MauvilleCity_GameCorner => layouts/LilycoveCity_DepartmentStore_5F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc rename data/{maps => layouts}/LilycoveCity_DepartmentStore_5F/map.bin (100%) rename data/{maps/LilycoveCity_PokemonTrainerFanClub => layouts/LilycoveCity_House2}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_House2/layout.inc rename data/{maps => layouts}/LilycoveCity_House2/map.bin (100%) rename data/{maps/LinkContestRoom1 => layouts/LilycoveCity_LilycoveMuseum_1F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc rename data/{maps => layouts}/LilycoveCity_LilycoveMuseum_1F/map.bin (100%) rename data/{maps/LinkContestRoom2 => layouts/LilycoveCity_LilycoveMuseum_2F}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc rename data/{maps => layouts}/LilycoveCity_LilycoveMuseum_2F/map.bin (100%) rename data/{maps/LinkContestRoom3 => layouts/LilycoveCity_PokemonTrainerFanClub}/border.bin (100%) create mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc rename data/{maps => layouts}/LilycoveCity_PokemonTrainerFanClub/map.bin (100%) rename data/{maps/LinkContestRoom4 => layouts/LinkContestRoom1}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom1/layout.inc rename data/{maps => layouts}/LinkContestRoom1/map.bin (100%) rename data/{maps/LinkContestRoom5 => layouts/LinkContestRoom2}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom2/layout.inc rename data/{maps => layouts}/LinkContestRoom2/map.bin (100%) rename data/{maps/LinkContestRoom6 => layouts/LinkContestRoom3}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom3/layout.inc rename data/{maps => layouts}/LinkContestRoom3/map.bin (100%) rename data/{maps/LittlerootTown_ProfessorBirchsLab => layouts/LinkContestRoom4}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom4/layout.inc rename data/{maps => layouts}/LinkContestRoom4/map.bin (100%) rename data/{maps/MeteorFalls_1F_1R => layouts/LinkContestRoom5}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom5/layout.inc rename data/{maps => layouts}/LinkContestRoom5/map.bin (100%) rename data/{maps/MeteorFalls_1F_2R => layouts/LinkContestRoom6}/border.bin (100%) create mode 100644 data/layouts/LinkContestRoom6/layout.inc rename data/{maps => layouts}/LinkContestRoom6/map.bin (100%) rename data/{maps => layouts}/LittlerootTown/border.bin (100%) create mode 100644 data/layouts/LittlerootTown/layout.inc rename data/{maps => layouts}/LittlerootTown/map.bin (100%) rename data/{maps/MauvilleCity_Gym => layouts/LittlerootTown_BrendansHouse_1F}/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc rename data/{maps => layouts}/LittlerootTown_BrendansHouse_1F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_BrendansHouse_2F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc rename data/{maps => layouts}/LittlerootTown_BrendansHouse_2F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_MaysHouse_1F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/layout.inc rename data/{maps => layouts}/LittlerootTown_MaysHouse_1F/map.bin (100%) rename data/{maps => layouts}/LittlerootTown_MaysHouse_2F/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/layout.inc rename data/{maps => layouts}/LittlerootTown_MaysHouse_2F/map.bin (100%) rename data/{maps/MeteorFalls_B1F_1R => layouts/LittlerootTown_ProfessorBirchsLab}/border.bin (100%) create mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc rename data/{maps => layouts}/LittlerootTown_ProfessorBirchsLab/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_1F/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_1F/layout.inc rename data/{maps => layouts}/MagmaHideout_1F/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_2F_1R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_2F_1R/layout.inc rename data/{maps => layouts}/MagmaHideout_2F_1R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_2F_2R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_2F_2R/layout.inc rename data/{maps => layouts}/MagmaHideout_2F_2R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_2F_3R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_2F_3R/layout.inc rename data/{maps => layouts}/MagmaHideout_2F_3R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_3F_1R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_3F_1R/layout.inc rename data/{maps => layouts}/MagmaHideout_3F_1R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_3F_2R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_3F_2R/layout.inc rename data/{maps => layouts}/MagmaHideout_3F_2R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_3F_3R/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_3F_3R/layout.inc rename data/{maps => layouts}/MagmaHideout_3F_3R/map.bin (100%) rename data/{maps => layouts}/MagmaHideout_4F/border.bin (100%) create mode 100644 data/layouts/MagmaHideout_4F/layout.inc rename data/{maps => layouts}/MagmaHideout_4F/map.bin (100%) rename data/{maps => layouts}/MarineCave_End/border.bin (100%) create mode 100644 data/layouts/MarineCave_End/layout.inc rename data/{maps => layouts}/MarineCave_End/map.bin (100%) rename data/{maps => layouts}/MarineCave_Entrance/border.bin (100%) create mode 100644 data/layouts/MarineCave_Entrance/layout.inc rename data/{maps => layouts}/MarineCave_Entrance/map.bin (100%) rename data/{maps/MossdeepCity_GameCorner_1F => layouts/Mart}/border.bin (100%) create mode 100644 data/layouts/Mart/layout.inc rename data/{maps/OldaleTown_Mart => layouts/Mart}/map.bin (100%) rename data/{maps => layouts}/MauvilleCity/border.bin (100%) create mode 100644 data/layouts/MauvilleCity/layout.inc rename data/{maps => layouts}/MauvilleCity/map.bin (100%) rename data/{maps => layouts}/MauvilleCity_BikeShop/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_BikeShop/layout.inc rename data/{maps => layouts}/MauvilleCity_BikeShop/map.bin (100%) rename data/{maps/MossdeepCity_GameCorner_B1F => layouts/MauvilleCity_GameCorner}/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_GameCorner/layout.inc rename data/{maps => layouts}/MauvilleCity_GameCorner/map.bin (100%) rename data/{maps/MossdeepCity_StevensHouse => layouts/MauvilleCity_Gym}/border.bin (100%) create mode 100644 data/layouts/MauvilleCity_Gym/layout.inc rename data/{maps => layouts}/MauvilleCity_Gym/map.bin (100%) rename data/{maps/MeteorFalls_B1F_2R => layouts/MeteorFalls_1F_1R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_1F_1R/layout.inc rename data/{maps => layouts}/MeteorFalls_1F_1R/map.bin (100%) rename data/{maps/MeteorFalls_StevensCave => layouts/MeteorFalls_1F_2R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_1F_2R/layout.inc rename data/{maps => layouts}/MeteorFalls_1F_2R/map.bin (100%) rename data/{maps/MossdeepCity_SpaceCenter_1F => layouts/MeteorFalls_B1F_1R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_B1F_1R/layout.inc rename data/{maps => layouts}/MeteorFalls_B1F_1R/map.bin (100%) rename data/{maps/MossdeepCity_SpaceCenter_2F => layouts/MeteorFalls_B1F_2R}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_B1F_2R/layout.inc rename data/{maps => layouts}/MeteorFalls_B1F_2R/map.bin (100%) rename data/{maps/MtPyre_1F => layouts/MeteorFalls_StevensCave}/border.bin (100%) create mode 100644 data/layouts/MeteorFalls_StevensCave/layout.inc rename data/{maps => layouts}/MeteorFalls_StevensCave/map.bin (100%) rename data/{maps => layouts}/MirageTower_1F/border.bin (100%) create mode 100644 data/layouts/MirageTower_1F/layout.inc rename data/{maps => layouts}/MirageTower_1F/map.bin (100%) rename data/{maps => layouts}/MirageTower_2F/border.bin (100%) create mode 100644 data/layouts/MirageTower_2F/layout.inc rename data/{maps => layouts}/MirageTower_2F/map.bin (100%) rename data/{maps => layouts}/MirageTower_3F/border.bin (100%) create mode 100644 data/layouts/MirageTower_3F/layout.inc rename data/{maps => layouts}/MirageTower_3F/map.bin (100%) rename data/{maps => layouts}/MirageTower_4F/border.bin (100%) create mode 100644 data/layouts/MirageTower_4F/layout.inc rename data/{maps => layouts}/MirageTower_4F/map.bin (100%) rename data/{maps => layouts}/MossdeepCity/border.bin (100%) create mode 100644 data/layouts/MossdeepCity/layout.inc rename data/{maps => layouts}/MossdeepCity/map.bin (100%) rename data/{maps/OldaleTown_House1 => layouts/MossdeepCity_GameCorner_1F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_GameCorner_1F/layout.inc rename data/{maps => layouts}/MossdeepCity_GameCorner_1F/map.bin (100%) rename data/{maps/OldaleTown_House2 => layouts/MossdeepCity_GameCorner_B1F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/layout.inc rename data/{maps => layouts}/MossdeepCity_GameCorner_B1F/map.bin (100%) rename data/{maps => layouts}/MossdeepCity_Gym/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_Gym/layout.inc rename data/{maps => layouts}/MossdeepCity_Gym/map.bin (100%) rename data/{maps/MtPyre_2F => layouts/MossdeepCity_SpaceCenter_1F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc rename data/{maps => layouts}/MossdeepCity_SpaceCenter_1F/map.bin (100%) rename data/{maps/MtPyre_3F => layouts/MossdeepCity_SpaceCenter_2F}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc rename data/{maps => layouts}/MossdeepCity_SpaceCenter_2F/map.bin (100%) rename data/{maps/OldaleTown_Mart => layouts/MossdeepCity_StevensHouse}/border.bin (100%) create mode 100644 data/layouts/MossdeepCity_StevensHouse/layout.inc rename data/{maps => layouts}/MossdeepCity_StevensHouse/map.bin (100%) rename data/{maps => layouts}/MtChimney/border.bin (100%) create mode 100644 data/layouts/MtChimney/layout.inc rename data/{maps => layouts}/MtChimney/map.bin (100%) rename data/{maps/MtPyre_4F => layouts/MtPyre_1F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_1F/layout.inc rename data/{maps => layouts}/MtPyre_1F/map.bin (100%) rename data/{maps/MtPyre_5F => layouts/MtPyre_2F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_2F/layout.inc rename data/{maps => layouts}/MtPyre_2F/map.bin (100%) rename data/{maps/MtPyre_6F => layouts/MtPyre_3F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_3F/layout.inc rename data/{maps => layouts}/MtPyre_3F/map.bin (100%) rename data/{maps/OldaleTown_PokemonCenter_1F => layouts/MtPyre_4F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_4F/layout.inc rename data/{maps => layouts}/MtPyre_4F/map.bin (100%) rename data/{maps/OldaleTown_PokemonCenter_2F => layouts/MtPyre_5F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_5F/layout.inc rename data/{maps => layouts}/MtPyre_5F/map.bin (100%) rename data/{maps/PacifidlogTown_House1 => layouts/MtPyre_6F}/border.bin (100%) create mode 100644 data/layouts/MtPyre_6F/layout.inc rename data/{maps => layouts}/MtPyre_6F/map.bin (100%) rename data/{maps => layouts}/MtPyre_Exterior/border.bin (100%) create mode 100644 data/layouts/MtPyre_Exterior/layout.inc rename data/{maps => layouts}/MtPyre_Exterior/map.bin (100%) rename data/{maps => layouts}/MtPyre_Summit/border.bin (100%) create mode 100644 data/layouts/MtPyre_Summit/layout.inc rename data/{maps => layouts}/MtPyre_Summit/map.bin (100%) rename data/{maps => layouts}/NavelRock_B1F/border.bin (100%) create mode 100644 data/layouts/NavelRock_B1F/layout.inc rename data/{maps => layouts}/NavelRock_B1F/map.bin (100%) rename data/{maps => layouts}/NavelRock_Bottom/border.bin (100%) create mode 100644 data/layouts/NavelRock_Bottom/layout.inc rename data/{maps => layouts}/NavelRock_Bottom/map.bin (100%) rename data/{maps => layouts}/NavelRock_Entrance/border.bin (100%) create mode 100644 data/layouts/NavelRock_Entrance/layout.inc rename data/{maps => layouts}/NavelRock_Entrance/map.bin (100%) rename data/{maps => layouts}/NavelRock_Exterior/border.bin (100%) create mode 100644 data/layouts/NavelRock_Exterior/layout.inc rename data/{maps => layouts}/NavelRock_Exterior/map.bin (100%) rename data/{maps => layouts}/NavelRock_Fork/border.bin (100%) create mode 100644 data/layouts/NavelRock_Fork/layout.inc rename data/{maps => layouts}/NavelRock_Fork/map.bin (100%) rename data/{maps/NavelRock_Up1 => layouts/NavelRock_LadderRoom1}/border.bin (100%) create mode 100644 data/layouts/NavelRock_LadderRoom1/layout.inc rename data/{maps/NavelRock_Up1 => layouts/NavelRock_LadderRoom1}/map.bin (100%) rename data/{maps/NavelRock_Up2 => layouts/NavelRock_LadderRoom2}/border.bin (100%) create mode 100644 data/layouts/NavelRock_LadderRoom2/layout.inc rename data/{maps/NavelRock_Up2 => layouts/NavelRock_LadderRoom2}/map.bin (100%) rename data/{maps => layouts}/NavelRock_Top/border.bin (100%) create mode 100644 data/layouts/NavelRock_Top/layout.inc rename data/{maps => layouts}/NavelRock_Top/map.bin (100%) rename data/{maps => layouts}/NewMauville_Entrance/border.bin (100%) create mode 100644 data/layouts/NewMauville_Entrance/layout.inc rename data/{maps => layouts}/NewMauville_Entrance/map.bin (100%) rename data/{maps => layouts}/NewMauville_Inside/border.bin (100%) create mode 100644 data/layouts/NewMauville_Inside/layout.inc rename data/{maps => layouts}/NewMauville_Inside/map.bin (100%) rename data/{maps => layouts}/OldaleTown/border.bin (100%) create mode 100644 data/layouts/OldaleTown/layout.inc rename data/{maps => layouts}/OldaleTown/map.bin (100%) rename data/{maps => layouts}/PacifidlogTown/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown/layout.inc rename data/{maps => layouts}/PacifidlogTown/map.bin (100%) rename data/{maps/PacifidlogTown_House2 => layouts/PacifidlogTown_House1}/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown_House1/layout.inc rename data/{maps => layouts}/PacifidlogTown_House1/map.bin (100%) rename data/{maps/PetalburgCity_House2 => layouts/PacifidlogTown_House2}/border.bin (100%) create mode 100644 data/layouts/PacifidlogTown_House2/layout.inc rename data/{maps => layouts}/PacifidlogTown_House2/map.bin (100%) rename data/{maps => layouts}/PetalburgCity/border.bin (100%) create mode 100644 data/layouts/PetalburgCity/layout.inc rename data/{maps => layouts}/PetalburgCity/map.bin (100%) rename data/{maps => layouts}/PetalburgCity_Gym/border.bin (100%) create mode 100644 data/layouts/PetalburgCity_Gym/layout.inc rename data/{maps => layouts}/PetalburgCity_Gym/map.bin (100%) rename data/{maps => layouts}/PetalburgWoods/border.bin (100%) create mode 100644 data/layouts/PetalburgWoods/layout.inc rename data/{maps => layouts}/PetalburgWoods/map.bin (100%) rename data/{maps/RecordCorner => layouts/PokemonCenter_1F}/border.bin (100%) create mode 100644 data/layouts/PokemonCenter_1F/layout.inc rename data/{maps/OldaleTown_PokemonCenter_1F => layouts/PokemonCenter_1F}/map.bin (100%) rename data/{maps/Route104_MrBrineysHouse => layouts/PokemonCenter_2F}/border.bin (100%) create mode 100644 data/layouts/PokemonCenter_2F/layout.inc rename data/{maps/OldaleTown_PokemonCenter_2F => layouts/PokemonCenter_2F}/map.bin (100%) rename data/{maps/Route110_TrickHouseCorridor => layouts/RecordCorner}/border.bin (100%) create mode 100644 data/layouts/RecordCorner/layout.inc rename data/{maps => layouts}/RecordCorner/map.bin (100%) rename data/{maps => layouts}/Route101/border.bin (100%) create mode 100644 data/layouts/Route101/layout.inc rename data/{maps => layouts}/Route101/map.bin (100%) rename data/{maps => layouts}/Route102/border.bin (100%) create mode 100644 data/layouts/Route102/layout.inc rename data/{maps => layouts}/Route102/map.bin (100%) rename data/{maps => layouts}/Route103/border.bin (100%) create mode 100644 data/layouts/Route103/layout.inc rename data/{maps => layouts}/Route103/map.bin (100%) rename data/{maps => layouts}/Route104/border.bin (100%) create mode 100644 data/layouts/Route104/layout.inc rename data/{maps => layouts}/Route104/map.bin (100%) rename data/{maps/Route110_TrickHouseEnd => layouts/Route104_MrBrineysHouse}/border.bin (100%) create mode 100644 data/layouts/Route104_MrBrineysHouse/layout.inc rename data/{maps => layouts}/Route104_MrBrineysHouse/map.bin (100%) rename data/{maps => layouts}/Route104_PrettyPetalFlowerShop/border.bin (100%) create mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/layout.inc rename data/{maps => layouts}/Route104_PrettyPetalFlowerShop/map.bin (100%) rename data/{maps => layouts}/Route104_Prototype/border.bin (100%) create mode 100644 data/layouts/Route104_Prototype/layout.inc rename data/{maps => layouts}/Route104_Prototype/map.bin (100%) rename data/{maps => layouts}/Route105/border.bin (100%) create mode 100644 data/layouts/Route105/layout.inc rename data/{maps => layouts}/Route105/map.bin (100%) rename data/{maps => layouts}/Route106/border.bin (100%) create mode 100644 data/layouts/Route106/layout.inc rename data/{maps => layouts}/Route106/map.bin (100%) rename data/{maps => layouts}/Route107/border.bin (100%) create mode 100644 data/layouts/Route107/layout.inc rename data/{maps => layouts}/Route107/map.bin (100%) rename data/{maps => layouts}/Route108/border.bin (100%) create mode 100644 data/layouts/Route108/layout.inc rename data/{maps => layouts}/Route108/map.bin (100%) rename data/{maps => layouts}/Route109/border.bin (100%) create mode 100644 data/layouts/Route109/layout.inc rename data/{maps => layouts}/Route109/map.bin (100%) rename data/{maps => layouts}/Route109_SeashoreHouse/border.bin (100%) create mode 100644 data/layouts/Route109_SeashoreHouse/layout.inc rename data/{maps => layouts}/Route109_SeashoreHouse/map.bin (100%) rename data/{maps => layouts}/Route110/border.bin (100%) create mode 100644 data/layouts/Route110/layout.inc rename data/{maps => layouts}/Route110/map.bin (100%) rename data/{maps/Route110_SeasideCyclingRoadEntrance1 => layouts/Route110_SeasideCyclingRoadEntrance}/border.bin (100%) create mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc rename data/{maps/Route110_SeasideCyclingRoadEntrance1 => layouts/Route110_SeasideCyclingRoadEntrance}/map.bin (100%) rename data/{maps/Route110_TrickHouseEntrance => layouts/Route110_TrickHouseCorridor}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseCorridor/layout.inc rename data/{maps => layouts}/Route110_TrickHouseCorridor/map.bin (100%) rename data/{maps/Route112_CableCarStation => layouts/Route110_TrickHouseEnd}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseEnd/layout.inc rename data/{maps => layouts}/Route110_TrickHouseEnd/map.bin (100%) rename data/{maps/Route114_FossilManiacsHouse => layouts/Route110_TrickHouseEntrance}/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHouseEntrance/layout.inc rename data/{maps => layouts}/Route110_TrickHouseEntrance/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle1/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle1/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle1/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle2/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle2/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle2/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle3/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle3/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle3/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle4/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle4/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle4/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle5/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle5/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle5/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle6/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle6/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle6/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle7/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle7/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle7/map.bin (100%) rename data/{maps => layouts}/Route110_TrickHousePuzzle8/border.bin (100%) create mode 100644 data/layouts/Route110_TrickHousePuzzle8/layout.inc rename data/{maps => layouts}/Route110_TrickHousePuzzle8/map.bin (100%) rename data/{maps => layouts}/Route111/border.bin (100%) create mode 100644 data/layouts/Route111/layout.inc rename data/{maps => layouts}/Route111/map.bin (100%) rename data/{maps => layouts}/Route112/border.bin (100%) create mode 100644 data/layouts/Route112/layout.inc rename data/{maps => layouts}/Route112/map.bin (100%) rename data/{maps => layouts}/Route113/border.bin (100%) create mode 100644 data/layouts/Route113/layout.inc rename data/{maps => layouts}/Route113/map.bin (100%) rename data/{maps => layouts}/Route114/border.bin (100%) create mode 100644 data/layouts/Route114/layout.inc rename data/{maps => layouts}/Route114/map.bin (100%) rename data/{maps/Route114_LanettesHouse => layouts/Route114_FossilManiacsHouse}/border.bin (100%) create mode 100644 data/layouts/Route114_FossilManiacsHouse/layout.inc rename data/{maps => layouts}/Route114_FossilManiacsHouse/map.bin (100%) rename data/{maps => layouts}/Route114_FossilManiacsTunnel/border.bin (100%) create mode 100644 data/layouts/Route114_FossilManiacsTunnel/layout.inc rename data/{maps => layouts}/Route114_FossilManiacsTunnel/map.bin (100%) rename data/{maps/Route116_TunnelersRestHouse => layouts/Route114_LanettesHouse}/border.bin (100%) create mode 100644 data/layouts/Route114_LanettesHouse/layout.inc rename data/{maps => layouts}/Route114_LanettesHouse/map.bin (100%) rename data/{maps => layouts}/Route115/border.bin (100%) create mode 100644 data/layouts/Route115/layout.inc rename data/{maps => layouts}/Route115/map.bin (100%) rename data/{maps => layouts}/Route116/border.bin (100%) create mode 100644 data/layouts/Route116/layout.inc rename data/{maps => layouts}/Route116/map.bin (100%) rename data/{maps/Route119_WeatherInstitute_1F => layouts/Route116_TunnelersRestHouse}/border.bin (100%) create mode 100644 data/layouts/Route116_TunnelersRestHouse/layout.inc rename data/{maps => layouts}/Route116_TunnelersRestHouse/map.bin (100%) rename data/{maps => layouts}/Route117/border.bin (100%) create mode 100644 data/layouts/Route117/layout.inc rename data/{maps => layouts}/Route117/map.bin (100%) rename data/{maps => layouts}/Route117_PokemonDayCare/border.bin (100%) create mode 100644 data/layouts/Route117_PokemonDayCare/layout.inc rename data/{maps => layouts}/Route117_PokemonDayCare/map.bin (100%) rename data/{maps => layouts}/Route118/border.bin (100%) create mode 100644 data/layouts/Route118/layout.inc rename data/{maps => layouts}/Route118/map.bin (100%) rename data/{maps => layouts}/Route119/border.bin (100%) create mode 100644 data/layouts/Route119/layout.inc rename data/{maps => layouts}/Route119/map.bin (100%) rename data/{maps/Route119_WeatherInstitute_2F => layouts/Route119_WeatherInstitute_1F}/border.bin (100%) create mode 100644 data/layouts/Route119_WeatherInstitute_1F/layout.inc rename data/{maps => layouts}/Route119_WeatherInstitute_1F/map.bin (100%) rename data/{maps/RustboroCity_CuttersHouse => layouts/Route119_WeatherInstitute_2F}/border.bin (100%) create mode 100644 data/layouts/Route119_WeatherInstitute_2F/layout.inc rename data/{maps => layouts}/Route119_WeatherInstitute_2F/map.bin (100%) rename data/{maps => layouts}/Route120/border.bin (100%) create mode 100644 data/layouts/Route120/layout.inc rename data/{maps => layouts}/Route120/map.bin (100%) rename data/{maps => layouts}/Route121/border.bin (100%) create mode 100644 data/layouts/Route121/layout.inc rename data/{maps => layouts}/Route121/map.bin (100%) rename data/{maps => layouts}/Route121_SafariZoneEntrance/border.bin (100%) create mode 100644 data/layouts/Route121_SafariZoneEntrance/layout.inc rename data/{maps => layouts}/Route121_SafariZoneEntrance/map.bin (100%) rename data/{maps => layouts}/Route122/border.bin (100%) create mode 100644 data/layouts/Route122/layout.inc rename data/{maps => layouts}/Route122/map.bin (100%) rename data/{maps => layouts}/Route123/border.bin (100%) create mode 100644 data/layouts/Route123/layout.inc rename data/{maps => layouts}/Route123/map.bin (100%) rename data/{maps => layouts}/Route124/border.bin (100%) create mode 100644 data/layouts/Route124/layout.inc rename data/{maps => layouts}/Route124/map.bin (100%) rename data/{maps => layouts}/Route124_DivingTreasureHuntersHouse/border.bin (100%) create mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc rename data/{maps => layouts}/Route124_DivingTreasureHuntersHouse/map.bin (100%) rename data/{maps => layouts}/Route125/border.bin (100%) create mode 100644 data/layouts/Route125/layout.inc rename data/{maps => layouts}/Route125/map.bin (100%) rename data/{maps => layouts}/Route126/border.bin (100%) create mode 100644 data/layouts/Route126/layout.inc rename data/{maps => layouts}/Route126/map.bin (100%) rename data/{maps => layouts}/Route127/border.bin (100%) create mode 100644 data/layouts/Route127/layout.inc rename data/{maps => layouts}/Route127/map.bin (100%) rename data/{maps => layouts}/Route128/border.bin (100%) create mode 100644 data/layouts/Route128/layout.inc rename data/{maps => layouts}/Route128/map.bin (100%) rename data/{maps => layouts}/Route129/border.bin (100%) create mode 100644 data/layouts/Route129/layout.inc rename data/{maps => layouts}/Route129/map.bin (100%) rename data/{maps => layouts}/Route130/border.bin (100%) create mode 100644 data/layouts/Route130/layout.inc rename data/{maps => layouts}/Route130/map.bin (100%) rename data/{maps => layouts}/Route131/border.bin (100%) create mode 100644 data/layouts/Route131/layout.inc rename data/{maps => layouts}/Route131/map.bin (100%) rename data/{maps => layouts}/Route132/border.bin (100%) create mode 100644 data/layouts/Route132/layout.inc rename data/{maps => layouts}/Route132/map.bin (100%) rename data/{maps => layouts}/Route133/border.bin (100%) create mode 100644 data/layouts/Route133/layout.inc rename data/{maps => layouts}/Route133/map.bin (100%) rename data/{maps => layouts}/Route134/border.bin (100%) create mode 100644 data/layouts/Route134/layout.inc rename data/{maps => layouts}/Route134/map.bin (100%) rename data/{maps => layouts}/RustboroCity/border.bin (100%) create mode 100644 data/layouts/RustboroCity/layout.inc rename data/{maps => layouts}/RustboroCity/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_1F => layouts/RustboroCity_CuttersHouse}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_CuttersHouse/layout.inc rename data/{maps => layouts}/RustboroCity_CuttersHouse/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_2F => layouts/RustboroCity_DevonCorp_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_1F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_1F/map.bin (100%) rename data/{maps/RustboroCity_DevonCorp_3F => layouts/RustboroCity_DevonCorp_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_2F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_2F/map.bin (100%) rename data/{maps/RustboroCity_Flat1_1F => layouts/RustboroCity_DevonCorp_3F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_DevonCorp_3F/layout.inc rename data/{maps => layouts}/RustboroCity_DevonCorp_3F/map.bin (100%) rename data/{maps/RustboroCity_Flat1_2F => layouts/RustboroCity_Flat1_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat1_1F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat1_1F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_1F => layouts/RustboroCity_Flat1_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat1_2F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat1_2F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_2F => layouts/RustboroCity_Flat2_1F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_1F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_1F/map.bin (100%) rename data/{maps/RustboroCity_Flat2_3F => layouts/RustboroCity_Flat2_2F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_2F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_2F/map.bin (100%) rename data/{maps/RustboroCity_House1 => layouts/RustboroCity_Flat2_3F}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Flat2_3F/layout.inc rename data/{maps => layouts}/RustboroCity_Flat2_3F/map.bin (100%) rename data/{maps => layouts}/RustboroCity_Gym/border.bin (100%) create mode 100644 data/layouts/RustboroCity_Gym/layout.inc rename data/{maps => layouts}/RustboroCity_Gym/map.bin (100%) rename data/{maps/RustboroCity_House2 => layouts/RustboroCity_House}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_House/layout.inc rename data/{maps/RustboroCity_House2 => layouts/RustboroCity_House}/map.bin (100%) rename data/{maps/SSTidalCorridor => layouts/RustboroCity_House1}/border.bin (100%) create mode 100644 data/layouts/RustboroCity_House1/layout.inc rename data/{maps => layouts}/RustboroCity_House1/map.bin (100%) rename data/{maps => layouts}/RustboroCity_PokemonSchool/border.bin (100%) create mode 100644 data/layouts/RustboroCity_PokemonSchool/layout.inc rename data/{maps => layouts}/RustboroCity_PokemonSchool/map.bin (100%) rename data/{maps => layouts}/RusturfTunnel/border.bin (100%) create mode 100644 data/layouts/RusturfTunnel/layout.inc rename data/{maps => layouts}/RusturfTunnel/map.bin (100%) rename data/{maps/SSTidalLowerDeck => layouts/SSTidalCorridor}/border.bin (100%) create mode 100644 data/layouts/SSTidalCorridor/layout.inc rename data/{maps => layouts}/SSTidalCorridor/map.bin (100%) rename data/{maps/SSTidalRooms => layouts/SSTidalLowerDeck}/border.bin (100%) create mode 100644 data/layouts/SSTidalLowerDeck/layout.inc rename data/{maps => layouts}/SSTidalLowerDeck/map.bin (100%) rename data/{maps/SingleBattleColosseum => layouts/SSTidalRooms}/border.bin (100%) create mode 100644 data/layouts/SSTidalRooms/layout.inc rename data/{maps => layouts}/SSTidalRooms/map.bin (100%) rename data/{maps => layouts}/SafariZone_North/border.bin (100%) create mode 100644 data/layouts/SafariZone_North/layout.inc rename data/{maps => layouts}/SafariZone_North/map.bin (100%) rename data/{maps => layouts}/SafariZone_Northeast/border.bin (100%) create mode 100644 data/layouts/SafariZone_Northeast/layout.inc rename data/{maps => layouts}/SafariZone_Northeast/map.bin (100%) rename data/{maps => layouts}/SafariZone_Northwest/border.bin (100%) create mode 100644 data/layouts/SafariZone_Northwest/layout.inc rename data/{maps => layouts}/SafariZone_Northwest/map.bin (100%) rename data/{maps => layouts}/SafariZone_RestHouse/border.bin (100%) create mode 100644 data/layouts/SafariZone_RestHouse/layout.inc rename data/{maps => layouts}/SafariZone_RestHouse/map.bin (100%) rename data/{maps => layouts}/SafariZone_South/border.bin (100%) create mode 100644 data/layouts/SafariZone_South/layout.inc rename data/{maps => layouts}/SafariZone_South/map.bin (100%) rename data/{maps => layouts}/SafariZone_Southeast/border.bin (100%) create mode 100644 data/layouts/SafariZone_Southeast/layout.inc rename data/{maps => layouts}/SafariZone_Southeast/map.bin (100%) rename data/{maps => layouts}/SafariZone_Southwest/border.bin (100%) create mode 100644 data/layouts/SafariZone_Southwest/layout.inc rename data/{maps => layouts}/SafariZone_Southwest/map.bin (100%) rename data/{maps => layouts}/ScorchedSlab/border.bin (100%) create mode 100644 data/layouts/ScorchedSlab/layout.inc rename data/{maps => layouts}/ScorchedSlab/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Entrance/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Entrance/layout.inc rename data/{maps => layouts}/SeafloorCavern_Entrance/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room1/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room1/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room1/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room2/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room2/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room2/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room3/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room3/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room3/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room4/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room4/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room4/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room5/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room5/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room5/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room6/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room6/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room6/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room7/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room7/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room7/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room8/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room8/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room8/map.bin (100%) rename data/{maps => layouts}/SeafloorCavern_Room9/border.bin (100%) create mode 100644 data/layouts/SeafloorCavern_Room9/layout.inc rename data/{maps => layouts}/SeafloorCavern_Room9/map.bin (100%) rename data/{maps => layouts}/SealedChamber_InnerRoom/border.bin (100%) create mode 100644 data/layouts/SealedChamber_InnerRoom/layout.inc rename data/{maps => layouts}/SealedChamber_InnerRoom/map.bin (100%) rename data/{maps => layouts}/SealedChamber_OuterRoom/border.bin (100%) create mode 100644 data/layouts/SealedChamber_OuterRoom/layout.inc rename data/{maps => layouts}/SealedChamber_OuterRoom/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave1/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave2/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave3/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_BlueCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_BlueCave4/layout.inc rename data/{maps => layouts}/SecretBase_BlueCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave1/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave2/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave3/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_BrownCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_BrownCave4/layout.inc rename data/{maps => layouts}/SecretBase_BrownCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave1/layout.inc rename data/{maps => layouts}/SecretBase_RedCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave2/layout.inc rename data/{maps => layouts}/SecretBase_RedCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave3/layout.inc rename data/{maps => layouts}/SecretBase_RedCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_RedCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_RedCave4/layout.inc rename data/{maps => layouts}/SecretBase_RedCave4/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub1/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub1/layout.inc rename data/{maps => layouts}/SecretBase_Shrub1/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub2/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub2/layout.inc rename data/{maps => layouts}/SecretBase_Shrub2/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub3/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub3/layout.inc rename data/{maps => layouts}/SecretBase_Shrub3/map.bin (100%) rename data/{maps => layouts}/SecretBase_Shrub4/border.bin (100%) create mode 100644 data/layouts/SecretBase_Shrub4/layout.inc rename data/{maps => layouts}/SecretBase_Shrub4/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree1/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree1/layout.inc rename data/{maps => layouts}/SecretBase_Tree1/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree2/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree2/layout.inc rename data/{maps => layouts}/SecretBase_Tree2/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree3/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree3/layout.inc rename data/{maps => layouts}/SecretBase_Tree3/map.bin (100%) rename data/{maps => layouts}/SecretBase_Tree4/border.bin (100%) create mode 100644 data/layouts/SecretBase_Tree4/layout.inc rename data/{maps => layouts}/SecretBase_Tree4/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave1/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave1/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave1/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave2/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave2/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave2/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave3/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave3/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave3/map.bin (100%) rename data/{maps => layouts}/SecretBase_YellowCave4/border.bin (100%) create mode 100644 data/layouts/SecretBase_YellowCave4/layout.inc rename data/{maps => layouts}/SecretBase_YellowCave4/map.bin (100%) rename data/{maps => layouts}/ShoalCave_HighTideEntranceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_HighTideEntranceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_HighTideInnerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_HighTideInnerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideEntranceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideEntranceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideIceRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideIceRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideIceRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideInnerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideInnerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideLowerRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideLowerRoom/map.bin (100%) rename data/{maps => layouts}/ShoalCave_LowTideStairsRoom/border.bin (100%) create mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/layout.inc rename data/{maps => layouts}/ShoalCave_LowTideStairsRoom/map.bin (100%) rename data/{maps/SkyPillar_1F => layouts/SingleBattleColosseum}/border.bin (100%) create mode 100644 data/layouts/SingleBattleColosseum/layout.inc rename data/{maps => layouts}/SingleBattleColosseum/map.bin (100%) rename data/{maps/SkyPillar_2F => layouts/SkyPillar_1F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_1F/layout.inc rename data/{maps => layouts}/SkyPillar_1F/map.bin (100%) rename data/{maps/SkyPillar_3F => layouts/SkyPillar_2F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_2F/layout.inc rename data/{maps => layouts}/SkyPillar_2F/map.bin (100%) rename data/{maps/SkyPillar_4F => layouts/SkyPillar_3F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_3F/layout.inc rename data/{maps => layouts}/SkyPillar_3F/map.bin (100%) rename data/{maps/SkyPillar_5F => layouts/SkyPillar_4F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_4F/layout.inc rename data/{maps => layouts}/SkyPillar_4F/map.bin (100%) rename data/{maps/SlateportCity_Harbor => layouts/SkyPillar_5F}/border.bin (100%) create mode 100644 data/layouts/SkyPillar_5F/layout.inc rename data/{maps => layouts}/SkyPillar_5F/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Entrance/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Entrance/layout.inc rename data/{maps => layouts}/SkyPillar_Entrance/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Outside/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Outside/layout.inc rename data/{maps => layouts}/SkyPillar_Outside/map.bin (100%) rename data/{maps => layouts}/SkyPillar_Top/border.bin (100%) create mode 100644 data/layouts/SkyPillar_Top/layout.inc rename data/{maps => layouts}/SkyPillar_Top/map.bin (100%) rename data/{maps => layouts}/SlateportCity/border.bin (100%) create mode 100644 data/layouts/SlateportCity/layout.inc rename data/{maps => layouts}/SlateportCity/map.bin (100%) rename data/{maps => layouts}/SlateportCity_OceanicMuseum_1F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc rename data/{maps => layouts}/SlateportCity_OceanicMuseum_1F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_OceanicMuseum_2F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc rename data/{maps => layouts}/SlateportCity_OceanicMuseum_2F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_PokemonFanClub/border.bin (100%) create mode 100644 data/layouts/SlateportCity_PokemonFanClub/layout.inc rename data/{maps => layouts}/SlateportCity_PokemonFanClub/map.bin (100%) rename data/{maps => layouts}/SlateportCity_SternsShipyard_1F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/layout.inc rename data/{maps => layouts}/SlateportCity_SternsShipyard_1F/map.bin (100%) rename data/{maps => layouts}/SlateportCity_SternsShipyard_2F/border.bin (100%) create mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/layout.inc rename data/{maps => layouts}/SlateportCity_SternsShipyard_2F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity/border.bin (100%) create mode 100644 data/layouts/SootopolisCity/layout.inc rename data/{maps => layouts}/SootopolisCity/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_Gym_1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_Gym_1F/layout.inc rename data/{maps => layouts}/SootopolisCity_Gym_1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_Gym_B1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_Gym_B1F/layout.inc rename data/{maps => layouts}/SootopolisCity_Gym_B1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House1/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House1/layout.inc rename data/{maps => layouts}/SootopolisCity_House1/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House2/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House2/layout.inc rename data/{maps => layouts}/SootopolisCity_House2/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_House3/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_House3/layout.inc rename data/{maps => layouts}/SootopolisCity_House3/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_LotadAndSeedotHouse/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc rename data/{maps => layouts}/SootopolisCity_LotadAndSeedotHouse/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_1F/map.bin (100%) rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_B1F/border.bin (100%) create mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc rename data/{maps => layouts}/SootopolisCity_MysteryEventsHouse_B1F/map.bin (100%) rename data/{maps => layouts}/SouthernIsland_Exterior/border.bin (100%) create mode 100644 data/layouts/SouthernIsland_Exterior/layout.inc rename data/{maps => layouts}/SouthernIsland_Exterior/map.bin (100%) rename data/{maps => layouts}/SouthernIsland_Interior/border.bin (100%) create mode 100644 data/layouts/SouthernIsland_Interior/layout.inc rename data/{maps => layouts}/SouthernIsland_Interior/map.bin (100%) rename data/{maps => layouts}/TerraCave_End/border.bin (100%) create mode 100644 data/layouts/TerraCave_End/layout.inc rename data/{maps => layouts}/TerraCave_End/map.bin (100%) rename data/{maps => layouts}/TerraCave_Entrance/border.bin (100%) create mode 100644 data/layouts/TerraCave_Entrance/layout.inc rename data/{maps => layouts}/TerraCave_Entrance/map.bin (100%) rename data/{maps => layouts}/TradeCenter/border.bin (100%) create mode 100644 data/layouts/TradeCenter/layout.inc rename data/{maps => layouts}/TradeCenter/map.bin (100%) rename data/{maps => layouts}/TrainerHill_1F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_1F/layout.inc rename data/{maps => layouts}/TrainerHill_1F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_2F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_2F/layout.inc rename data/{maps => layouts}/TrainerHill_2F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_3F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_3F/layout.inc rename data/{maps => layouts}/TrainerHill_3F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_4F/border.bin (100%) create mode 100644 data/layouts/TrainerHill_4F/layout.inc rename data/{maps => layouts}/TrainerHill_4F/map.bin (100%) rename data/{maps => layouts}/TrainerHill_Entrance/border.bin (100%) create mode 100644 data/layouts/TrainerHill_Entrance/layout.inc rename data/{maps => layouts}/TrainerHill_Entrance/map.bin (100%) rename data/{maps => layouts}/TrainerHill_Roof/border.bin (100%) create mode 100644 data/layouts/TrainerHill_Roof/layout.inc rename data/{maps => layouts}/TrainerHill_Roof/map.bin (100%) rename data/{maps => layouts}/Underwater1/border.bin (100%) create mode 100644 data/layouts/Underwater1/layout.inc rename data/{maps => layouts}/Underwater1/map.bin (100%) rename data/{maps => layouts}/Underwater2/border.bin (100%) create mode 100644 data/layouts/Underwater2/layout.inc rename data/{maps => layouts}/Underwater2/map.bin (100%) rename data/{maps => layouts}/Underwater3/border.bin (100%) create mode 100644 data/layouts/Underwater3/layout.inc rename data/{maps => layouts}/Underwater3/map.bin (100%) rename data/{maps => layouts}/Underwater4/border.bin (100%) create mode 100644 data/layouts/Underwater4/layout.inc rename data/{maps => layouts}/Underwater4/map.bin (100%) rename data/{maps => layouts}/Underwater5/border.bin (100%) create mode 100644 data/layouts/Underwater5/layout.inc rename data/{maps => layouts}/Underwater5/map.bin (100%) rename data/{maps => layouts}/Underwater6/border.bin (100%) create mode 100644 data/layouts/Underwater6/layout.inc rename data/{maps => layouts}/Underwater6/map.bin (100%) rename data/{maps => layouts}/Underwater7/border.bin (100%) create mode 100644 data/layouts/Underwater7/layout.inc rename data/{maps => layouts}/Underwater7/map.bin (100%) rename data/{maps => layouts}/Underwater_MarineCave/border.bin (100%) create mode 100644 data/layouts/Underwater_MarineCave/layout.inc rename data/{maps => layouts}/Underwater_MarineCave/map.bin (100%) rename data/{maps => layouts}/Underwater_Route134/border.bin (100%) create mode 100644 data/layouts/Underwater_Route134/layout.inc rename data/{maps => layouts}/Underwater_Route134/map.bin (100%) rename data/{maps => layouts}/Underwater_SeafloorCavern/border.bin (100%) create mode 100644 data/layouts/Underwater_SeafloorCavern/layout.inc rename data/{maps => layouts}/Underwater_SeafloorCavern/map.bin (100%) rename data/{maps => layouts}/Underwater_SealedChamber/border.bin (100%) create mode 100644 data/layouts/Underwater_SealedChamber/layout.inc rename data/{maps => layouts}/Underwater_SealedChamber/map.bin (100%) rename data/{maps => layouts}/Underwater_SootopolisCity/border.bin (100%) create mode 100644 data/layouts/Underwater_SootopolisCity/layout.inc rename data/{maps => layouts}/Underwater_SootopolisCity/map.bin (100%) rename data/{maps => layouts}/UnionRoom/border.bin (100%) create mode 100644 data/layouts/UnionRoom/layout.inc rename data/{maps => layouts}/UnionRoom/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08417FC4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08417FC4/layout.inc rename data/{maps => layouts}/UnknownMap_08417FC4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08428450/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08428450/layout.inc rename data/{maps => layouts}/UnknownMap_08428450/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084294C4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084294C4/layout.inc rename data/{maps => layouts}/UnknownMap_084294C4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084294E8/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084294E8/layout.inc rename data/{maps => layouts}/UnknownMap_084294E8/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E6C0/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E6C0/layout.inc rename data/{maps => layouts}/UnknownMap_0843E6C0/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E6E4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E6E4/layout.inc rename data/{maps => layouts}/UnknownMap_0843E6E4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E708/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E708/layout.inc rename data/{maps => layouts}/UnknownMap_0843E708/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E72C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E72C/layout.inc rename data/{maps => layouts}/UnknownMap_0843E72C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E750/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E750/layout.inc rename data/{maps => layouts}/UnknownMap_0843E750/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E774/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E774/layout.inc rename data/{maps => layouts}/UnknownMap_0843E774/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E798/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E798/layout.inc rename data/{maps => layouts}/UnknownMap_0843E798/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E7BC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E7BC/layout.inc rename data/{maps => layouts}/UnknownMap_0843E7BC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E7E0/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E7E0/layout.inc rename data/{maps => layouts}/UnknownMap_0843E7E0/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E804/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E804/layout.inc rename data/{maps => layouts}/UnknownMap_0843E804/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E828/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E828/layout.inc rename data/{maps => layouts}/UnknownMap_0843E828/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E84C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E84C/layout.inc rename data/{maps => layouts}/UnknownMap_0843E84C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E870/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0843E870/layout.inc rename data/{maps => layouts}/UnknownMap_0843E870/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0843E894/border.bin (100%) create mode 100755 data/layouts/UnknownMap_0843E894/layout.inc rename data/{maps => layouts}/UnknownMap_0843E894/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08447028/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08447028/layout.inc rename data/{maps => layouts}/UnknownMap_08447028/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0845A394/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0845A394/layout.inc rename data/{maps => layouts}/UnknownMap_0845A394/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0845D470/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0845D470/layout.inc rename data/{maps => layouts}/UnknownMap_0845D470/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0845ECB4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0845ECB4/layout.inc rename data/{maps => layouts}/UnknownMap_0845ECB4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08469200/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08469200/layout.inc rename data/{maps => layouts}/UnknownMap_08469200/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084693AC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084693AC/layout.inc rename data/{maps => layouts}/UnknownMap_084693AC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08470BD8/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08470BD8/layout.inc rename data/{maps => layouts}/UnknownMap_08470BD8/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08480DAC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08480DAC/layout.inc rename data/{maps => layouts}/UnknownMap_08480DAC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08480F54/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08480F54/layout.inc rename data/{maps => layouts}/UnknownMap_08480F54/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084810FC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084810FC/layout.inc rename data/{maps => layouts}/UnknownMap_084810FC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084812A4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084812A4/layout.inc rename data/{maps => layouts}/UnknownMap_084812A4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_0848144C/border.bin (100%) create mode 100644 data/layouts/UnknownMap_0848144C/layout.inc rename data/{maps => layouts}/UnknownMap_0848144C/map.bin (100%) rename data/{maps => layouts}/UnknownMap_084815F4/border.bin (100%) create mode 100644 data/layouts/UnknownMap_084815F4/layout.inc rename data/{maps => layouts}/UnknownMap_084815F4/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08481B24/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08481B24/layout.inc rename data/{maps => layouts}/UnknownMap_08481B24/map.bin (100%) rename data/{maps => layouts}/UnknownMap_08481DBC/border.bin (100%) create mode 100644 data/layouts/UnknownMap_08481DBC/layout.inc rename data/{maps => layouts}/UnknownMap_08481DBC/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_29/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_29/layout.inc rename data/{maps => layouts}/UnknownMap_25_29/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_30/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_30/layout.inc rename data/{maps => layouts}/UnknownMap_25_30/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_31/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_31/layout.inc rename data/{maps => layouts}/UnknownMap_25_31/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_32/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_32/layout.inc rename data/{maps => layouts}/UnknownMap_25_32/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_33/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_33/layout.inc rename data/{maps => layouts}/UnknownMap_25_33/map.bin (100%) rename data/{maps => layouts}/UnknownMap_25_34/border.bin (100%) create mode 100644 data/layouts/UnknownMap_25_34/layout.inc rename data/{maps => layouts}/UnknownMap_25_34/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown/layout.inc rename data/{maps => layouts}/VerdanturfTown/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown_BattleTentBattleRoom/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc rename data/{maps => layouts}/VerdanturfTown_BattleTentBattleRoom/map.bin (100%) rename data/{maps => layouts}/VerdanturfTown_WandasHouse/border.bin (100%) create mode 100644 data/layouts/VerdanturfTown_WandasHouse/layout.inc rename data/{maps => layouts}/VerdanturfTown_WandasHouse/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_1F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_1F/layout.inc rename data/{maps => layouts}/VictoryRoad_1F/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_B1F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_B1F/layout.inc rename data/{maps => layouts}/VictoryRoad_B1F/map.bin (100%) rename data/{maps => layouts}/VictoryRoad_B2F/border.bin (100%) create mode 100644 data/layouts/VictoryRoad_B2F/layout.inc rename data/{maps => layouts}/VictoryRoad_B2F/map.bin (100%) create mode 100644 data/layouts_table.inc delete mode 100644 data/maps/_assets.inc delete mode 100644 data/maps/attributes_table.inc rename data/maps/{_groups.inc => groups.inc} (100%) diff --git a/Makefile b/Makefile index 2afb830cf3..eb15d11ab6 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ include graphics_file_rules.mk %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress -%.bin: %.aif ; $(AIF) $< $@ +sound/%.bin: sound/%.aif ; $(AIF) $< $@ sound/songs/%.s: sound/songs/%.mid cd $(@D) && ../../$(MID) $( Date: Wed, 20 Jun 2018 17:41:41 -0500 Subject: [PATCH 4/9] Move events and scripts into map dirs --- data/event_scripts.s | 1036 ++++++++--------- data/map_events.s | 1036 ++++++++--------- .../events.inc} | 0 .../AbandonedShip_CaptainsOffice/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Corridors_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Corridors_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Deck/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Room_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms2_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms2_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Underwater1/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Underwater2/scripts.inc} | 0 .../events.inc} | 0 .../AlteringCave/scripts.inc} | 0 .../events.inc} | 0 .../AncientTomb/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_1F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_B2F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap1/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap2/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap3/scripts.inc} | 0 .../events.inc} | 0 .../ArtisanCave_1F/scripts.inc} | 0 .../events.inc} | 0 .../ArtisanCave_B1F/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge1/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge2/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge3/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge4/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge5/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge6/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge7/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge8/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge9/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Mart/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_OutsideEast/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_OutsideWest/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_RankingHall/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_ReceptionGate/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_ScottsHouse/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare01/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare02/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare03/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare04/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare05/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare06/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare07/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare08/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare09/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare10/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare11/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare12/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare13/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare14/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare15/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare16/scripts.inc} | 0 .../events.inc} | 0 .../BirthIsland_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../BirthIsland_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_1F/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_B1F/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../DesertRuins/scripts.inc} | 0 .../events.inc} | 0 .../DesertUnderpass/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_Gym/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_Hall/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../DoubleBattleColosseum/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_ChampionsRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_DrakesRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_GlaciasRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall1/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall2/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall3/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall4/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall5/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_HallOfFame/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_PhoebesRoom/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_SidneysRoom/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../FarawayIsland_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../FarawayIsland_Interior/scripts.inc} | 0 .../FieryPath.inc => FieryPath/events.inc} | 0 .../FieryPath/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_DecorationShop/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House5/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_1F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_B1F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_B2F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_StevensRoom/scripts.inc} | 0 .../events.inc} | 0 .../InsideOfTruck/scripts.inc} | 0 .../IslandCave.inc => IslandCave/events.inc} | 0 .../IslandCave/scripts.inc} | 0 .../JaggedPass.inc => JaggedPass/events.inc} | 0 .../JaggedPass/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Gym_1F/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Gym_B1F/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_HerbShop/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_House/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_ContestHall/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_ContestLobby/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_UnusedMart/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom1/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom2/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom3/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom4/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom5/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom6/scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown_MaysHouse_1F/scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown_MaysHouse_2F/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_1F/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_3R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_3R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_4F/scripts.inc} | 0 .../events.inc} | 0 .../MarineCave_End/scripts.inc} | 0 .../events.inc} | 0 .../MarineCave_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_BikeShop/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_GameCorner/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_1F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_1F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_B1F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_B1F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_StevensCave/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_1F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_2F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_3F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_4F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_GameCorner_1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_GameCorner_B1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_SpaceCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_SpaceCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_StevensHouse/scripts.inc} | 0 .../MtChimney.inc => MtChimney/events.inc} | 0 .../MtChimney/scripts.inc} | 0 .../events.inc} | 0 .../MtChimney_CableCarStation/scripts.inc} | 0 .../MtPyre_1F.inc => MtPyre_1F/events.inc} | 0 .../MtPyre_1F/scripts.inc} | 0 .../MtPyre_2F.inc => MtPyre_2F/events.inc} | 0 .../MtPyre_2F/scripts.inc} | 0 .../MtPyre_3F.inc => MtPyre_3F/events.inc} | 0 .../MtPyre_3F/scripts.inc} | 0 .../MtPyre_4F.inc => MtPyre_4F/events.inc} | 0 .../MtPyre_4F/scripts.inc} | 0 .../MtPyre_5F.inc => MtPyre_5F/events.inc} | 0 .../MtPyre_5F/scripts.inc} | 0 .../MtPyre_6F.inc => MtPyre_6F/events.inc} | 0 .../MtPyre_6F/scripts.inc} | 0 .../events.inc} | 0 .../MtPyre_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../MtPyre_Summit/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_B1F/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Bottom/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down01/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down02/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down03/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down04/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down05/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down06/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down07/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down08/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down09/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down10/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down11/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Fork/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Top/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up1/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up2/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up3/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up4/scripts.inc} | 0 .../events.inc} | 0 .../NewMauville_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../NewMauville_Inside/scripts.inc} | 0 .../OldaleTown.inc => OldaleTown/events.inc} | 0 .../OldaleTown/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House3/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House4/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House5/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_WallysHouse/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgWoods/scripts.inc} | 0 .../events.inc} | 0 .../RecordCorner/scripts.inc} | 0 .../Route101.inc => Route101/events.inc} | 0 .../Route101/scripts.inc} | 0 .../Route102.inc => Route102/events.inc} | 0 .../Route102/scripts.inc} | 0 .../Route103.inc => Route103/events.inc} | 0 .../Route103/scripts.inc} | 0 .../Route104.inc => Route104/events.inc} | 0 .../Route104/scripts.inc} | 0 .../events.inc} | 0 .../Route104_MrBrineysHouse/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../Route104_Prototype/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route105.inc => Route105/events.inc} | 0 .../Route105/scripts.inc} | 0 .../Route106.inc => Route106/events.inc} | 0 .../Route106/scripts.inc} | 0 .../Route107.inc => Route107/events.inc} | 0 .../Route107/scripts.inc} | 0 .../Route108.inc => Route108/events.inc} | 0 .../Route108/scripts.inc} | 0 .../Route109.inc => Route109/events.inc} | 0 .../Route109/scripts.inc} | 0 .../events.inc} | 0 .../Route109_SeashoreHouse/scripts.inc} | 0 .../Route110.inc => Route110/events.inc} | 0 .../Route110/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseCorridor/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseEnd/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseEntrance/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle1/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle2/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle3/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle4/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle5/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle6/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle7/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle8/scripts.inc} | 0 .../Route111.inc => Route111/events.inc} | 0 .../Route111/scripts.inc} | 0 .../events.inc} | 0 .../Route111_OldLadysRestStop/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route112.inc => Route112/events.inc} | 0 .../Route112/scripts.inc} | 0 .../events.inc} | 0 .../Route112_CableCarStation/scripts.inc} | 0 .../Route113.inc => Route113/events.inc} | 0 .../Route113/scripts.inc} | 0 .../events.inc} | 0 .../Route113_GlassWorkshop/scripts.inc} | 0 .../Route114.inc => Route114/events.inc} | 0 .../Route114/scripts.inc} | 0 .../events.inc} | 0 .../Route114_FossilManiacsHouse/scripts.inc} | 0 .../events.inc} | 0 .../Route114_FossilManiacsTunnel/scripts.inc} | 0 .../events.inc} | 0 .../Route114_LanettesHouse/scripts.inc} | 0 .../Route115.inc => Route115/events.inc} | 0 .../Route115/scripts.inc} | 0 .../Route116.inc => Route116/events.inc} | 0 .../Route116/scripts.inc} | 0 .../events.inc} | 0 .../Route116_TunnelersRestHouse/scripts.inc} | 0 .../Route117.inc => Route117/events.inc} | 0 .../Route117/scripts.inc} | 0 .../events.inc} | 0 .../Route117_PokemonDayCare/scripts.inc} | 0 .../Route118.inc => Route118/events.inc} | 0 .../Route118/scripts.inc} | 0 .../Route119.inc => Route119/events.inc} | 0 .../Route119/scripts.inc} | 0 .../events.inc} | 0 .../Route119_House/scripts.inc} | 0 .../events.inc} | 0 .../Route119_WeatherInstitute_1F/scripts.inc} | 0 .../events.inc} | 0 .../Route119_WeatherInstitute_2F/scripts.inc} | 0 .../Route120.inc => Route120/events.inc} | 0 .../Route120/scripts.inc} | 0 .../Route121.inc => Route121/events.inc} | 0 .../Route121/scripts.inc} | 0 .../events.inc} | 0 .../Route121_SafariZoneEntrance/scripts.inc} | 0 .../Route122.inc => Route122/events.inc} | 0 .../Route122/scripts.inc} | 0 .../Route123.inc => Route123/events.inc} | 0 .../Route123/scripts.inc} | 0 .../events.inc} | 0 .../Route123_BerryMastersHouse/scripts.inc} | 0 .../Route124.inc => Route124/events.inc} | 0 .../Route124/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route125.inc => Route125/events.inc} | 0 .../Route125/scripts.inc} | 0 .../Route126.inc => Route126/events.inc} | 0 .../Route126/scripts.inc} | 0 .../Route127.inc => Route127/events.inc} | 0 .../Route127/scripts.inc} | 0 .../Route128.inc => Route128/events.inc} | 0 .../Route128/scripts.inc} | 0 .../Route129.inc => Route129/events.inc} | 0 .../Route129/scripts.inc} | 0 .../Route130.inc => Route130/events.inc} | 0 .../Route130/scripts.inc} | 0 .../Route131.inc => Route131/events.inc} | 0 .../Route131/scripts.inc} | 0 .../Route132.inc => Route132/events.inc} | 0 .../Route132/scripts.inc} | 0 .../Route133.inc => Route133/events.inc} | 0 .../Route133/scripts.inc} | 0 .../Route134.inc => Route134/events.inc} | 0 .../Route134/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_CuttersHouse/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_3F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat1_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat1_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_3F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_PokemonSchool/scripts.inc} | 0 .../events.inc} | 0 .../RusturfTunnel/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalCorridor/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalLowerDeck/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalRooms/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_North/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Northeast/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Northwest/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_RestHouse/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_South/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Southeast/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Southwest/scripts.inc} | 0 .../events.inc} | 0 .../ScorchedSlab/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room1/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room2/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room3/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room4/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room5/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room6/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room7/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room8/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room9/scripts.inc} | 0 .../events.inc} | 0 .../SealedChamber_InnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../SealedChamber_OuterRoom/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave4/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_HighTideInnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideIceRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideInnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideLowerRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideStairsRoom/scripts.inc} | 0 .../events.inc} | 0 .../SingleBattleColosseum/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_1F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_2F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_3F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_4F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_5F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Outside/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Top/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_PokemonFanClub/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Gym_1F/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Gym_B1F/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House5/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House6/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House7/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SouthernIsland_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../SouthernIsland_Interior/scripts.inc} | 0 .../events.inc} | 0 .../TerraCave_End/scripts.inc} | 0 .../events.inc} | 0 .../TerraCave_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../TradeCenter/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_1F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_2F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_3F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_4F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Elevator/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Roof/scripts.inc} | 0 .../events.inc} | 0 .../Underwater1/scripts.inc} | 0 .../events.inc} | 0 .../Underwater2/scripts.inc} | 0 .../events.inc} | 0 .../Underwater3/scripts.inc} | 0 .../events.inc} | 0 .../Underwater4/scripts.inc} | 0 .../events.inc} | 0 .../Underwater5/scripts.inc} | 0 .../events.inc} | 0 .../Underwater6/scripts.inc} | 0 .../events.inc} | 0 .../Underwater7/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_MarineCave/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_Route134/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SeafloorCavern/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SealedChamber/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SootopolisCity/scripts.inc} | 0 .../UnionRoom.inc => UnionRoom/events.inc} | 0 .../UnionRoom/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_29/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_30/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_31/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_32/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_33/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_34/scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_House/scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_WandasHouse/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_1F/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_B1F/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_B2F/scripts.inc} | 0 1038 files changed, 1036 insertions(+), 1036 deletions(-) rename data/maps/{events/AbandonedShip_CaptainsOffice.inc => AbandonedShip_CaptainsOffice/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_CaptainsOffice.inc => maps/AbandonedShip_CaptainsOffice/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_1F.inc => AbandonedShip_Corridors_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_1F.inc => maps/AbandonedShip_Corridors_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_B1F.inc => AbandonedShip_Corridors_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_B1F.inc => maps/AbandonedShip_Corridors_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Deck.inc => AbandonedShip_Deck/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Deck.inc => maps/AbandonedShip_Deck/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorCorridors.inc => AbandonedShip_HiddenFloorCorridors/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorCorridors.inc => maps/AbandonedShip_HiddenFloorCorridors/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorRooms.inc => AbandonedShip_HiddenFloorRooms/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorRooms.inc => maps/AbandonedShip_HiddenFloorRooms/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Room_B1F.inc => AbandonedShip_Room_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Room_B1F.inc => maps/AbandonedShip_Room_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_1F.inc => AbandonedShip_Rooms2_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_1F.inc => maps/AbandonedShip_Rooms2_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_B1F.inc => AbandonedShip_Rooms2_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_B1F.inc => maps/AbandonedShip_Rooms2_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_1F.inc => AbandonedShip_Rooms_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_1F.inc => maps/AbandonedShip_Rooms_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_B1F.inc => AbandonedShip_Rooms_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_B1F.inc => maps/AbandonedShip_Rooms_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater1.inc => AbandonedShip_Underwater1/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater1.inc => maps/AbandonedShip_Underwater1/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater2.inc => AbandonedShip_Underwater2/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater2.inc => maps/AbandonedShip_Underwater2/scripts.inc} (100%) rename data/maps/{events/AlteringCave.inc => AlteringCave/events.inc} (100%) rename data/{scripts/maps/AlteringCave.inc => maps/AlteringCave/scripts.inc} (100%) rename data/maps/{events/AncientTomb.inc => AncientTomb/events.inc} (100%) rename data/{scripts/maps/AncientTomb.inc => maps/AncientTomb/scripts.inc} (100%) rename data/maps/{events/AquaHideout_1F.inc => AquaHideout_1F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_1F.inc => maps/AquaHideout_1F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_B1F.inc => AquaHideout_B1F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_B1F.inc => maps/AquaHideout_B1F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_B2F.inc => AquaHideout_B2F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_B2F.inc => maps/AquaHideout_B2F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap1.inc => AquaHideout_UnusedRubyMap1/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap1.inc => maps/AquaHideout_UnusedRubyMap1/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap2.inc => AquaHideout_UnusedRubyMap2/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap2.inc => maps/AquaHideout_UnusedRubyMap2/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap3.inc => AquaHideout_UnusedRubyMap3/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap3.inc => maps/AquaHideout_UnusedRubyMap3/scripts.inc} (100%) rename data/maps/{events/ArtisanCave_1F.inc => ArtisanCave_1F/events.inc} (100%) rename data/{scripts/maps/ArtisanCave_1F.inc => maps/ArtisanCave_1F/scripts.inc} (100%) rename data/maps/{events/ArtisanCave_B1F.inc => ArtisanCave_B1F/events.inc} (100%) rename data/{scripts/maps/ArtisanCave_B1F.inc => maps/ArtisanCave_B1F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaBattleRoom.inc => BattleFrontier_BattleArenaBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc => maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaCorridor.inc => BattleFrontier_BattleArenaCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaCorridor.inc => maps/BattleFrontier_BattleArenaCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaLobby.inc => BattleFrontier_BattleArenaLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaLobby.inc => maps/BattleFrontier_BattleArenaLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeBattleRoom.inc => BattleFrontier_BattleDomeBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc => maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeCorridor.inc => BattleFrontier_BattleDomeCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeCorridor.inc => maps/BattleFrontier_BattleDomeCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeLobby.inc => BattleFrontier_BattleDomeLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeLobby.inc => maps/BattleFrontier_BattleDomeLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomePreBattleRoom.inc => BattleFrontier_BattleDomePreBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc => maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryBattleRoom.inc => BattleFrontier_BattleFactoryBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc => maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryLobby.inc => BattleFrontier_BattleFactoryLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryLobby.inc => maps/BattleFrontier_BattleFactoryLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryPreBattleRoom.inc => BattleFrontier_BattleFactoryPreBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc => maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceBattleRoom.inc => BattleFrontier_BattlePalaceBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc => maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceCorridor.inc => BattleFrontier_BattlePalaceCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceCorridor.inc => maps/BattleFrontier_BattlePalaceCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceLobby.inc => BattleFrontier_BattlePalaceLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceLobby.inc => maps/BattleFrontier_BattlePalaceLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeCorridor.inc => BattleFrontier_BattlePikeCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeCorridor.inc => maps/BattleFrontier_BattlePikeCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeLobby.inc => BattleFrontier_BattlePikeLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeLobby.inc => maps/BattleFrontier_BattlePikeLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom1.inc => BattleFrontier_BattlePikeRandomRoom1/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc => maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom2.inc => BattleFrontier_BattlePikeRandomRoom2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc => maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom3.inc => BattleFrontier_BattlePikeRandomRoom3/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc => maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeThreePathRoom.inc => BattleFrontier_BattlePikeThreePathRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc => maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePointExchangeServiceCorner.inc => BattleFrontier_BattlePointExchangeServiceCorner/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc => maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidEmptySquare.inc => BattleFrontier_BattlePyramidEmptySquare/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc => maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidLobby.inc => BattleFrontier_BattlePyramidLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidLobby.inc => maps/BattleFrontier_BattlePyramidLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidTop.inc => BattleFrontier_BattlePyramidTop/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidTop.inc => maps/BattleFrontier_BattlePyramidTop/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerBattleRoom.inc => BattleFrontier_BattleTowerBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc => maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerBattleRoom2.inc => BattleFrontier_BattleTowerBattleRoom2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc => maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerCorridor.inc => BattleFrontier_BattleTowerCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerCorridor.inc => maps/BattleFrontier_BattleTowerCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerCorridor2.inc => BattleFrontier_BattleTowerCorridor2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerCorridor2.inc => maps/BattleFrontier_BattleTowerCorridor2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerElevator.inc => BattleFrontier_BattleTowerElevator/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerElevator.inc => maps/BattleFrontier_BattleTowerElevator/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerLobby.inc => BattleFrontier_BattleTowerLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerLobby.inc => maps/BattleFrontier_BattleTowerLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerMultiBattleRoom.inc => BattleFrontier_BattleTowerMultiBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc => maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge1.inc => BattleFrontier_Lounge1/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge1.inc => maps/BattleFrontier_Lounge1/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge2.inc => BattleFrontier_Lounge2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge2.inc => maps/BattleFrontier_Lounge2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge3.inc => BattleFrontier_Lounge3/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge3.inc => maps/BattleFrontier_Lounge3/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge4.inc => BattleFrontier_Lounge4/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge4.inc => maps/BattleFrontier_Lounge4/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge5.inc => BattleFrontier_Lounge5/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge5.inc => maps/BattleFrontier_Lounge5/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge6.inc => BattleFrontier_Lounge6/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge6.inc => maps/BattleFrontier_Lounge6/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge7.inc => BattleFrontier_Lounge7/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge7.inc => maps/BattleFrontier_Lounge7/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge8.inc => BattleFrontier_Lounge8/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge8.inc => maps/BattleFrontier_Lounge8/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge9.inc => BattleFrontier_Lounge9/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge9.inc => maps/BattleFrontier_Lounge9/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Mart.inc => BattleFrontier_Mart/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Mart.inc => maps/BattleFrontier_Mart/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_OutsideEast.inc => BattleFrontier_OutsideEast/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_OutsideEast.inc => maps/BattleFrontier_OutsideEast/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_OutsideWest.inc => BattleFrontier_OutsideWest/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_OutsideWest.inc => maps/BattleFrontier_OutsideWest/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_PokemonCenter_1F.inc => BattleFrontier_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_PokemonCenter_1F.inc => maps/BattleFrontier_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_PokemonCenter_2F.inc => BattleFrontier_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_PokemonCenter_2F.inc => maps/BattleFrontier_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_RankingHall.inc => BattleFrontier_RankingHall/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_RankingHall.inc => maps/BattleFrontier_RankingHall/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_ReceptionGate.inc => BattleFrontier_ReceptionGate/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_ReceptionGate.inc => maps/BattleFrontier_ReceptionGate/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_ScottsHouse.inc => BattleFrontier_ScottsHouse/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_ScottsHouse.inc => maps/BattleFrontier_ScottsHouse/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare01.inc => BattlePyramidSquare01/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare01.inc => maps/BattlePyramidSquare01/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare02.inc => BattlePyramidSquare02/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare02.inc => maps/BattlePyramidSquare02/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare03.inc => BattlePyramidSquare03/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare03.inc => maps/BattlePyramidSquare03/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare04.inc => BattlePyramidSquare04/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare04.inc => maps/BattlePyramidSquare04/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare05.inc => BattlePyramidSquare05/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare05.inc => maps/BattlePyramidSquare05/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare06.inc => BattlePyramidSquare06/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare06.inc => maps/BattlePyramidSquare06/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare07.inc => BattlePyramidSquare07/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare07.inc => maps/BattlePyramidSquare07/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare08.inc => BattlePyramidSquare08/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare08.inc => maps/BattlePyramidSquare08/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare09.inc => BattlePyramidSquare09/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare09.inc => maps/BattlePyramidSquare09/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare10.inc => BattlePyramidSquare10/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare10.inc => maps/BattlePyramidSquare10/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare11.inc => BattlePyramidSquare11/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare11.inc => maps/BattlePyramidSquare11/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare12.inc => BattlePyramidSquare12/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare12.inc => maps/BattlePyramidSquare12/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare13.inc => BattlePyramidSquare13/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare13.inc => maps/BattlePyramidSquare13/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare14.inc => BattlePyramidSquare14/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare14.inc => maps/BattlePyramidSquare14/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare15.inc => BattlePyramidSquare15/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare15.inc => maps/BattlePyramidSquare15/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare16.inc => BattlePyramidSquare16/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare16.inc => maps/BattlePyramidSquare16/scripts.inc} (100%) rename data/maps/{events/BirthIsland_Exterior.inc => BirthIsland_Exterior/events.inc} (100%) rename data/{scripts/maps/BirthIsland_Exterior.inc => maps/BirthIsland_Exterior/scripts.inc} (100%) rename data/maps/{events/BirthIsland_Harbor.inc => BirthIsland_Harbor/events.inc} (100%) rename data/{scripts/maps/BirthIsland_Harbor.inc => maps/BirthIsland_Harbor/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_1F.inc => CaveOfOrigin_1F/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_1F.inc => maps/CaveOfOrigin_1F/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_B1F.inc => CaveOfOrigin_B1F/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_B1F.inc => maps/CaveOfOrigin_B1F/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_Entrance.inc => CaveOfOrigin_Entrance/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_Entrance.inc => maps/CaveOfOrigin_Entrance/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap1.inc => CaveOfOrigin_UnusedRubySapphireMap1/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc => maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap2.inc => CaveOfOrigin_UnusedRubySapphireMap2/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc => maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap3.inc => CaveOfOrigin_UnusedRubySapphireMap3/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc => maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc} (100%) rename data/maps/{events/DesertRuins.inc => DesertRuins/events.inc} (100%) rename data/{scripts/maps/DesertRuins.inc => maps/DesertRuins/scripts.inc} (100%) rename data/maps/{events/DesertUnderpass.inc => DesertUnderpass/events.inc} (100%) rename data/{scripts/maps/DesertUnderpass.inc => maps/DesertUnderpass/scripts.inc} (100%) rename data/maps/{events/DewfordTown.inc => DewfordTown/events.inc} (100%) rename data/{scripts/maps/DewfordTown.inc => maps/DewfordTown/scripts.inc} (100%) rename data/maps/{events/DewfordTown_Gym.inc => DewfordTown_Gym/events.inc} (100%) rename data/{scripts/maps/DewfordTown_Gym.inc => maps/DewfordTown_Gym/scripts.inc} (100%) rename data/maps/{events/DewfordTown_Hall.inc => DewfordTown_Hall/events.inc} (100%) rename data/{scripts/maps/DewfordTown_Hall.inc => maps/DewfordTown_Hall/scripts.inc} (100%) rename data/maps/{events/DewfordTown_House1.inc => DewfordTown_House1/events.inc} (100%) rename data/{scripts/maps/DewfordTown_House1.inc => maps/DewfordTown_House1/scripts.inc} (100%) rename data/maps/{events/DewfordTown_House2.inc => DewfordTown_House2/events.inc} (100%) rename data/{scripts/maps/DewfordTown_House2.inc => maps/DewfordTown_House2/scripts.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_1F.inc => DewfordTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_1F.inc => maps/DewfordTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_2F.inc => DewfordTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_2F.inc => maps/DewfordTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/DoubleBattleColosseum.inc => DoubleBattleColosseum/events.inc} (100%) rename data/{scripts/maps/DoubleBattleColosseum.inc => maps/DoubleBattleColosseum/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity.inc => EverGrandeCity/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity.inc => maps/EverGrandeCity/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_ChampionsRoom.inc => EverGrandeCity_ChampionsRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_ChampionsRoom.inc => maps/EverGrandeCity_ChampionsRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_DrakesRoom.inc => EverGrandeCity_DrakesRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_DrakesRoom.inc => maps/EverGrandeCity_DrakesRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_GlaciasRoom.inc => EverGrandeCity_GlaciasRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_GlaciasRoom.inc => maps/EverGrandeCity_GlaciasRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall1.inc => EverGrandeCity_Hall1/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall1.inc => maps/EverGrandeCity_Hall1/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall2.inc => EverGrandeCity_Hall2/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall2.inc => maps/EverGrandeCity_Hall2/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall3.inc => EverGrandeCity_Hall3/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall3.inc => maps/EverGrandeCity_Hall3/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall4.inc => EverGrandeCity_Hall4/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall4.inc => maps/EverGrandeCity_Hall4/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall5.inc => EverGrandeCity_Hall5/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall5.inc => maps/EverGrandeCity_Hall5/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_HallOfFame.inc => EverGrandeCity_HallOfFame/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_HallOfFame.inc => maps/EverGrandeCity_HallOfFame/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PhoebesRoom.inc => EverGrandeCity_PhoebesRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PhoebesRoom.inc => maps/EverGrandeCity_PhoebesRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_1F.inc => EverGrandeCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_1F.inc => maps/EverGrandeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_2F.inc => EverGrandeCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_2F.inc => maps/EverGrandeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonLeague_1F.inc => EverGrandeCity_PokemonLeague_1F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonLeague_1F.inc => maps/EverGrandeCity_PokemonLeague_1F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonLeague_2F.inc => EverGrandeCity_PokemonLeague_2F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonLeague_2F.inc => maps/EverGrandeCity_PokemonLeague_2F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_SidneysRoom.inc => EverGrandeCity_SidneysRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_SidneysRoom.inc => maps/EverGrandeCity_SidneysRoom/scripts.inc} (100%) rename data/maps/{events/FallarborTown.inc => FallarborTown/events.inc} (100%) rename data/{scripts/maps/FallarborTown.inc => maps/FallarborTown/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentBattleRoom.inc => FallarborTown_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentBattleRoom.inc => maps/FallarborTown_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentCorridor.inc => FallarborTown_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentCorridor.inc => maps/FallarborTown_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentLobby.inc => FallarborTown_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentLobby.inc => maps/FallarborTown_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/FallarborTown_House1.inc => FallarborTown_House1/events.inc} (100%) rename data/{scripts/maps/FallarborTown_House1.inc => maps/FallarborTown_House1/scripts.inc} (100%) rename data/maps/{events/FallarborTown_House2.inc => FallarborTown_House2/events.inc} (100%) rename data/{scripts/maps/FallarborTown_House2.inc => maps/FallarborTown_House2/scripts.inc} (100%) rename data/maps/{events/FallarborTown_Mart.inc => FallarborTown_Mart/events.inc} (100%) rename data/{scripts/maps/FallarborTown_Mart.inc => maps/FallarborTown_Mart/scripts.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_1F.inc => FallarborTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_1F.inc => maps/FallarborTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_2F.inc => FallarborTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_2F.inc => maps/FallarborTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/FarawayIsland_Entrance.inc => FarawayIsland_Entrance/events.inc} (100%) rename data/{scripts/maps/FarawayIsland_Entrance.inc => maps/FarawayIsland_Entrance/scripts.inc} (100%) rename data/maps/{events/FarawayIsland_Interior.inc => FarawayIsland_Interior/events.inc} (100%) rename data/{scripts/maps/FarawayIsland_Interior.inc => maps/FarawayIsland_Interior/scripts.inc} (100%) rename data/maps/{events/FieryPath.inc => FieryPath/events.inc} (100%) rename data/{scripts/maps/FieryPath.inc => maps/FieryPath/scripts.inc} (100%) rename data/maps/{events/FortreeCity.inc => FortreeCity/events.inc} (100%) rename data/{scripts/maps/FortreeCity.inc => maps/FortreeCity/scripts.inc} (100%) rename data/maps/{events/FortreeCity_DecorationShop.inc => FortreeCity_DecorationShop/events.inc} (100%) rename data/{scripts/maps/FortreeCity_DecorationShop.inc => maps/FortreeCity_DecorationShop/scripts.inc} (100%) rename data/maps/{events/FortreeCity_Gym.inc => FortreeCity_Gym/events.inc} (100%) rename data/{scripts/maps/FortreeCity_Gym.inc => maps/FortreeCity_Gym/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House1.inc => FortreeCity_House1/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House1.inc => maps/FortreeCity_House1/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House2.inc => FortreeCity_House2/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House2.inc => maps/FortreeCity_House2/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House3.inc => FortreeCity_House3/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House3.inc => maps/FortreeCity_House3/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House4.inc => FortreeCity_House4/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House4.inc => maps/FortreeCity_House4/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House5.inc => FortreeCity_House5/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House5.inc => maps/FortreeCity_House5/scripts.inc} (100%) rename data/maps/{events/FortreeCity_Mart.inc => FortreeCity_Mart/events.inc} (100%) rename data/{scripts/maps/FortreeCity_Mart.inc => maps/FortreeCity_Mart/scripts.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_1F.inc => FortreeCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_1F.inc => maps/FortreeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_2F.inc => FortreeCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_2F.inc => maps/FortreeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_1F.inc => GraniteCave_1F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_1F.inc => maps/GraniteCave_1F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_B1F.inc => GraniteCave_B1F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_B1F.inc => maps/GraniteCave_B1F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_B2F.inc => GraniteCave_B2F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_B2F.inc => maps/GraniteCave_B2F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_StevensRoom.inc => GraniteCave_StevensRoom/events.inc} (100%) rename data/{scripts/maps/GraniteCave_StevensRoom.inc => maps/GraniteCave_StevensRoom/scripts.inc} (100%) rename data/maps/{events/InsideOfTruck.inc => InsideOfTruck/events.inc} (100%) rename data/{scripts/maps/InsideOfTruck.inc => maps/InsideOfTruck/scripts.inc} (100%) rename data/maps/{events/IslandCave.inc => IslandCave/events.inc} (100%) rename data/{scripts/maps/IslandCave.inc => maps/IslandCave/scripts.inc} (100%) rename data/maps/{events/JaggedPass.inc => JaggedPass/events.inc} (100%) rename data/{scripts/maps/JaggedPass.inc => maps/JaggedPass/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown.inc => LavaridgeTown/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown.inc => maps/LavaridgeTown/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_1F.inc => LavaridgeTown_Gym_1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_1F.inc => maps/LavaridgeTown_Gym_1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_B1F.inc => LavaridgeTown_Gym_B1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_B1F.inc => maps/LavaridgeTown_Gym_B1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_HerbShop.inc => LavaridgeTown_HerbShop/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_HerbShop.inc => maps/LavaridgeTown_HerbShop/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_House.inc => LavaridgeTown_House/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_House.inc => maps/LavaridgeTown_House/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Mart.inc => LavaridgeTown_Mart/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Mart.inc => maps/LavaridgeTown_Mart/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_1F.inc => LavaridgeTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_1F.inc => maps/LavaridgeTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_2F.inc => LavaridgeTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_2F.inc => maps/LavaridgeTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity.inc => LilycoveCity/events.inc} (100%) rename data/{scripts/maps/LilycoveCity.inc => maps/LilycoveCity/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_ContestHall.inc => LilycoveCity_ContestHall/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestHall.inc => maps/LilycoveCity_ContestHall/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_ContestLobby.inc => LilycoveCity_ContestLobby/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestLobby.inc => maps/LilycoveCity_ContestLobby/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_1F.inc => LilycoveCity_CoveLilyMotel_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc => maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_2F.inc => LilycoveCity_CoveLilyMotel_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc => maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreElevator.inc => LilycoveCity_DepartmentStoreElevator/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreElevator.inc => maps/LilycoveCity_DepartmentStoreElevator/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreRooftop.inc => LilycoveCity_DepartmentStoreRooftop/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc => maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_1F.inc => LilycoveCity_DepartmentStore_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_1F.inc => maps/LilycoveCity_DepartmentStore_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_2F.inc => LilycoveCity_DepartmentStore_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_2F.inc => maps/LilycoveCity_DepartmentStore_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_3F.inc => LilycoveCity_DepartmentStore_3F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_3F.inc => maps/LilycoveCity_DepartmentStore_3F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_4F.inc => LilycoveCity_DepartmentStore_4F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_4F.inc => maps/LilycoveCity_DepartmentStore_4F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_5F.inc => LilycoveCity_DepartmentStore_5F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_5F.inc => maps/LilycoveCity_DepartmentStore_5F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_Harbor.inc => LilycoveCity_Harbor/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_Harbor.inc => maps/LilycoveCity_Harbor/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House1.inc => LilycoveCity_House1/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House1.inc => maps/LilycoveCity_House1/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House2.inc => LilycoveCity_House2/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House2.inc => maps/LilycoveCity_House2/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House3.inc => LilycoveCity_House3/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House3.inc => maps/LilycoveCity_House3/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House4.inc => LilycoveCity_House4/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House4.inc => maps/LilycoveCity_House4/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_1F.inc => LilycoveCity_LilycoveMuseum_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc => maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_2F.inc => LilycoveCity_LilycoveMuseum_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc => maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_MoveDeletersHouse.inc => LilycoveCity_MoveDeletersHouse/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_MoveDeletersHouse.inc => maps/LilycoveCity_MoveDeletersHouse/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_1F.inc => LilycoveCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_1F.inc => maps/LilycoveCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_2F.inc => LilycoveCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_2F.inc => maps/LilycoveCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonTrainerFanClub.inc => LilycoveCity_PokemonTrainerFanClub/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc => maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_UnusedMart.inc => LilycoveCity_UnusedMart/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_UnusedMart.inc => maps/LilycoveCity_UnusedMart/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom1.inc => LinkContestRoom1/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom1.inc => maps/LinkContestRoom1/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom2.inc => LinkContestRoom2/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom2.inc => maps/LinkContestRoom2/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom3.inc => LinkContestRoom3/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom3.inc => maps/LinkContestRoom3/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom4.inc => LinkContestRoom4/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom4.inc => maps/LinkContestRoom4/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom5.inc => LinkContestRoom5/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom5.inc => maps/LinkContestRoom5/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom6.inc => LinkContestRoom6/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom6.inc => maps/LinkContestRoom6/scripts.inc} (100%) rename data/maps/{events/LittlerootTown.inc => LittlerootTown/events.inc} (100%) rename data/{scripts/maps/LittlerootTown.inc => maps/LittlerootTown/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_1F.inc => LittlerootTown_BrendansHouse_1F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_1F.inc => maps/LittlerootTown_BrendansHouse_1F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_2F.inc => LittlerootTown_BrendansHouse_2F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_2F.inc => maps/LittlerootTown_BrendansHouse_2F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_1F.inc => LittlerootTown_MaysHouse_1F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_1F.inc => maps/LittlerootTown_MaysHouse_1F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_2F.inc => LittlerootTown_MaysHouse_2F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_2F.inc => maps/LittlerootTown_MaysHouse_2F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_ProfessorBirchsLab.inc => LittlerootTown_ProfessorBirchsLab/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_ProfessorBirchsLab.inc => maps/LittlerootTown_ProfessorBirchsLab/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_1F.inc => MagmaHideout_1F/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_1F.inc => maps/MagmaHideout_1F/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_1R.inc => MagmaHideout_2F_1R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_1R.inc => maps/MagmaHideout_2F_1R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_2R.inc => MagmaHideout_2F_2R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_2R.inc => maps/MagmaHideout_2F_2R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_3R.inc => MagmaHideout_2F_3R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_3R.inc => maps/MagmaHideout_2F_3R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_1R.inc => MagmaHideout_3F_1R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_1R.inc => maps/MagmaHideout_3F_1R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_2R.inc => MagmaHideout_3F_2R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_2R.inc => maps/MagmaHideout_3F_2R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_3R.inc => MagmaHideout_3F_3R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_3R.inc => maps/MagmaHideout_3F_3R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_4F.inc => MagmaHideout_4F/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_4F.inc => maps/MagmaHideout_4F/scripts.inc} (100%) rename data/maps/{events/MarineCave_End.inc => MarineCave_End/events.inc} (100%) rename data/{scripts/maps/MarineCave_End.inc => maps/MarineCave_End/scripts.inc} (100%) rename data/maps/{events/MarineCave_Entrance.inc => MarineCave_Entrance/events.inc} (100%) rename data/{scripts/maps/MarineCave_Entrance.inc => maps/MarineCave_Entrance/scripts.inc} (100%) rename data/maps/{events/MauvilleCity.inc => MauvilleCity/events.inc} (100%) rename data/{scripts/maps/MauvilleCity.inc => maps/MauvilleCity/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_BikeShop.inc => MauvilleCity_BikeShop/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_BikeShop.inc => maps/MauvilleCity_BikeShop/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_GameCorner.inc => MauvilleCity_GameCorner/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_GameCorner.inc => maps/MauvilleCity_GameCorner/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_Gym.inc => MauvilleCity_Gym/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_Gym.inc => maps/MauvilleCity_Gym/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_House1.inc => MauvilleCity_House1/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_House1.inc => maps/MauvilleCity_House1/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_House2.inc => MauvilleCity_House2/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_House2.inc => maps/MauvilleCity_House2/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_Mart.inc => MauvilleCity_Mart/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_Mart.inc => maps/MauvilleCity_Mart/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_1F.inc => MauvilleCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_1F.inc => maps/MauvilleCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_2F.inc => MauvilleCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_2F.inc => maps/MauvilleCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_1F_1R.inc => MeteorFalls_1F_1R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_1R.inc => maps/MeteorFalls_1F_1R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_1F_2R.inc => MeteorFalls_1F_2R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_2R.inc => maps/MeteorFalls_1F_2R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_1R.inc => MeteorFalls_B1F_1R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_1R.inc => maps/MeteorFalls_B1F_1R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_2R.inc => MeteorFalls_B1F_2R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_2R.inc => maps/MeteorFalls_B1F_2R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_StevensCave.inc => MeteorFalls_StevensCave/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_StevensCave.inc => maps/MeteorFalls_StevensCave/scripts.inc} (100%) rename data/maps/{events/MirageTower_1F.inc => MirageTower_1F/events.inc} (100%) rename data/{scripts/maps/MirageTower_1F.inc => maps/MirageTower_1F/scripts.inc} (100%) rename data/maps/{events/MirageTower_2F.inc => MirageTower_2F/events.inc} (100%) rename data/{scripts/maps/MirageTower_2F.inc => maps/MirageTower_2F/scripts.inc} (100%) rename data/maps/{events/MirageTower_3F.inc => MirageTower_3F/events.inc} (100%) rename data/{scripts/maps/MirageTower_3F.inc => maps/MirageTower_3F/scripts.inc} (100%) rename data/maps/{events/MirageTower_4F.inc => MirageTower_4F/events.inc} (100%) rename data/{scripts/maps/MirageTower_4F.inc => maps/MirageTower_4F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity.inc => MossdeepCity/events.inc} (100%) rename data/{scripts/maps/MossdeepCity.inc => maps/MossdeepCity/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_1F.inc => MossdeepCity_GameCorner_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_1F.inc => maps/MossdeepCity_GameCorner_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_B1F.inc => MossdeepCity_GameCorner_B1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_B1F.inc => maps/MossdeepCity_GameCorner_B1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_Gym.inc => MossdeepCity_Gym/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_Gym.inc => maps/MossdeepCity_Gym/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House1.inc => MossdeepCity_House1/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House1.inc => maps/MossdeepCity_House1/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House2.inc => MossdeepCity_House2/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House2.inc => maps/MossdeepCity_House2/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House3.inc => MossdeepCity_House3/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House3.inc => maps/MossdeepCity_House3/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House4.inc => MossdeepCity_House4/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House4.inc => maps/MossdeepCity_House4/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_Mart.inc => MossdeepCity_Mart/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_Mart.inc => maps/MossdeepCity_Mart/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_1F.inc => MossdeepCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_1F.inc => maps/MossdeepCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_2F.inc => MossdeepCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_2F.inc => maps/MossdeepCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_1F.inc => MossdeepCity_SpaceCenter_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_1F.inc => maps/MossdeepCity_SpaceCenter_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_2F.inc => MossdeepCity_SpaceCenter_2F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_2F.inc => maps/MossdeepCity_SpaceCenter_2F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_StevensHouse.inc => MossdeepCity_StevensHouse/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_StevensHouse.inc => maps/MossdeepCity_StevensHouse/scripts.inc} (100%) rename data/maps/{events/MtChimney.inc => MtChimney/events.inc} (100%) rename data/{scripts/maps/MtChimney.inc => maps/MtChimney/scripts.inc} (100%) rename data/maps/{events/MtChimney_CableCarStation.inc => MtChimney_CableCarStation/events.inc} (100%) rename data/{scripts/maps/MtChimney_CableCarStation.inc => maps/MtChimney_CableCarStation/scripts.inc} (100%) rename data/maps/{events/MtPyre_1F.inc => MtPyre_1F/events.inc} (100%) rename data/{scripts/maps/MtPyre_1F.inc => maps/MtPyre_1F/scripts.inc} (100%) rename data/maps/{events/MtPyre_2F.inc => MtPyre_2F/events.inc} (100%) rename data/{scripts/maps/MtPyre_2F.inc => maps/MtPyre_2F/scripts.inc} (100%) rename data/maps/{events/MtPyre_3F.inc => MtPyre_3F/events.inc} (100%) rename data/{scripts/maps/MtPyre_3F.inc => maps/MtPyre_3F/scripts.inc} (100%) rename data/maps/{events/MtPyre_4F.inc => MtPyre_4F/events.inc} (100%) rename data/{scripts/maps/MtPyre_4F.inc => maps/MtPyre_4F/scripts.inc} (100%) rename data/maps/{events/MtPyre_5F.inc => MtPyre_5F/events.inc} (100%) rename data/{scripts/maps/MtPyre_5F.inc => maps/MtPyre_5F/scripts.inc} (100%) rename data/maps/{events/MtPyre_6F.inc => MtPyre_6F/events.inc} (100%) rename data/{scripts/maps/MtPyre_6F.inc => maps/MtPyre_6F/scripts.inc} (100%) rename data/maps/{events/MtPyre_Exterior.inc => MtPyre_Exterior/events.inc} (100%) rename data/{scripts/maps/MtPyre_Exterior.inc => maps/MtPyre_Exterior/scripts.inc} (100%) rename data/maps/{events/MtPyre_Summit.inc => MtPyre_Summit/events.inc} (100%) rename data/{scripts/maps/MtPyre_Summit.inc => maps/MtPyre_Summit/scripts.inc} (100%) rename data/maps/{events/NavelRock_B1F.inc => NavelRock_B1F/events.inc} (100%) rename data/{scripts/maps/NavelRock_B1F.inc => maps/NavelRock_B1F/scripts.inc} (100%) rename data/maps/{events/NavelRock_Bottom.inc => NavelRock_Bottom/events.inc} (100%) rename data/{scripts/maps/NavelRock_Bottom.inc => maps/NavelRock_Bottom/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down01.inc => NavelRock_Down01/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down01.inc => maps/NavelRock_Down01/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down02.inc => NavelRock_Down02/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down02.inc => maps/NavelRock_Down02/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down03.inc => NavelRock_Down03/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down03.inc => maps/NavelRock_Down03/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down04.inc => NavelRock_Down04/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down04.inc => maps/NavelRock_Down04/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down05.inc => NavelRock_Down05/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down05.inc => maps/NavelRock_Down05/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down06.inc => NavelRock_Down06/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down06.inc => maps/NavelRock_Down06/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down07.inc => NavelRock_Down07/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down07.inc => maps/NavelRock_Down07/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down08.inc => NavelRock_Down08/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down08.inc => maps/NavelRock_Down08/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down09.inc => NavelRock_Down09/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down09.inc => maps/NavelRock_Down09/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down10.inc => NavelRock_Down10/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down10.inc => maps/NavelRock_Down10/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down11.inc => NavelRock_Down11/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down11.inc => maps/NavelRock_Down11/scripts.inc} (100%) rename data/maps/{events/NavelRock_Entrance.inc => NavelRock_Entrance/events.inc} (100%) rename data/{scripts/maps/NavelRock_Entrance.inc => maps/NavelRock_Entrance/scripts.inc} (100%) rename data/maps/{events/NavelRock_Exterior.inc => NavelRock_Exterior/events.inc} (100%) rename data/{scripts/maps/NavelRock_Exterior.inc => maps/NavelRock_Exterior/scripts.inc} (100%) rename data/maps/{events/NavelRock_Fork.inc => NavelRock_Fork/events.inc} (100%) rename data/{scripts/maps/NavelRock_Fork.inc => maps/NavelRock_Fork/scripts.inc} (100%) rename data/maps/{events/NavelRock_Harbor.inc => NavelRock_Harbor/events.inc} (100%) rename data/{scripts/maps/NavelRock_Harbor.inc => maps/NavelRock_Harbor/scripts.inc} (100%) rename data/maps/{events/NavelRock_Top.inc => NavelRock_Top/events.inc} (100%) rename data/{scripts/maps/NavelRock_Top.inc => maps/NavelRock_Top/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up1.inc => NavelRock_Up1/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up1.inc => maps/NavelRock_Up1/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up2.inc => NavelRock_Up2/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up2.inc => maps/NavelRock_Up2/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up3.inc => NavelRock_Up3/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up3.inc => maps/NavelRock_Up3/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up4.inc => NavelRock_Up4/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up4.inc => maps/NavelRock_Up4/scripts.inc} (100%) rename data/maps/{events/NewMauville_Entrance.inc => NewMauville_Entrance/events.inc} (100%) rename data/{scripts/maps/NewMauville_Entrance.inc => maps/NewMauville_Entrance/scripts.inc} (100%) rename data/maps/{events/NewMauville_Inside.inc => NewMauville_Inside/events.inc} (100%) rename data/{scripts/maps/NewMauville_Inside.inc => maps/NewMauville_Inside/scripts.inc} (100%) rename data/maps/{events/OldaleTown.inc => OldaleTown/events.inc} (100%) rename data/{scripts/maps/OldaleTown.inc => maps/OldaleTown/scripts.inc} (100%) rename data/maps/{events/OldaleTown_House1.inc => OldaleTown_House1/events.inc} (100%) rename data/{scripts/maps/OldaleTown_House1.inc => maps/OldaleTown_House1/scripts.inc} (100%) rename data/maps/{events/OldaleTown_House2.inc => OldaleTown_House2/events.inc} (100%) rename data/{scripts/maps/OldaleTown_House2.inc => maps/OldaleTown_House2/scripts.inc} (100%) rename data/maps/{events/OldaleTown_Mart.inc => OldaleTown_Mart/events.inc} (100%) rename data/{scripts/maps/OldaleTown_Mart.inc => maps/OldaleTown_Mart/scripts.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_1F.inc => OldaleTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_1F.inc => maps/OldaleTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_2F.inc => OldaleTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_2F.inc => maps/OldaleTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown.inc => PacifidlogTown/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown.inc => maps/PacifidlogTown/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House1.inc => PacifidlogTown_House1/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House1.inc => maps/PacifidlogTown_House1/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House2.inc => PacifidlogTown_House2/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House2.inc => maps/PacifidlogTown_House2/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House3.inc => PacifidlogTown_House3/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House3.inc => maps/PacifidlogTown_House3/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House4.inc => PacifidlogTown_House4/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House4.inc => maps/PacifidlogTown_House4/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House5.inc => PacifidlogTown_House5/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House5.inc => maps/PacifidlogTown_House5/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_1F.inc => PacifidlogTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_1F.inc => maps/PacifidlogTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_2F.inc => PacifidlogTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_2F.inc => maps/PacifidlogTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity.inc => PetalburgCity/events.inc} (100%) rename data/{scripts/maps/PetalburgCity.inc => maps/PetalburgCity/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_Gym.inc => PetalburgCity_Gym/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_Gym.inc => maps/PetalburgCity_Gym/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_House1.inc => PetalburgCity_House1/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_House1.inc => maps/PetalburgCity_House1/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_House2.inc => PetalburgCity_House2/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_House2.inc => maps/PetalburgCity_House2/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_Mart.inc => PetalburgCity_Mart/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_Mart.inc => maps/PetalburgCity_Mart/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_1F.inc => PetalburgCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_1F.inc => maps/PetalburgCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_2F.inc => PetalburgCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_2F.inc => maps/PetalburgCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_WallysHouse.inc => PetalburgCity_WallysHouse/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_WallysHouse.inc => maps/PetalburgCity_WallysHouse/scripts.inc} (100%) rename data/maps/{events/PetalburgWoods.inc => PetalburgWoods/events.inc} (100%) rename data/{scripts/maps/PetalburgWoods.inc => maps/PetalburgWoods/scripts.inc} (100%) rename data/maps/{events/RecordCorner.inc => RecordCorner/events.inc} (100%) rename data/{scripts/maps/RecordCorner.inc => maps/RecordCorner/scripts.inc} (100%) rename data/maps/{events/Route101.inc => Route101/events.inc} (100%) rename data/{scripts/maps/Route101.inc => maps/Route101/scripts.inc} (100%) rename data/maps/{events/Route102.inc => Route102/events.inc} (100%) rename data/{scripts/maps/Route102.inc => maps/Route102/scripts.inc} (100%) rename data/maps/{events/Route103.inc => Route103/events.inc} (100%) rename data/{scripts/maps/Route103.inc => maps/Route103/scripts.inc} (100%) rename data/maps/{events/Route104.inc => Route104/events.inc} (100%) rename data/{scripts/maps/Route104.inc => maps/Route104/scripts.inc} (100%) rename data/maps/{events/Route104_MrBrineysHouse.inc => Route104_MrBrineysHouse/events.inc} (100%) rename data/{scripts/maps/Route104_MrBrineysHouse.inc => maps/Route104_MrBrineysHouse/scripts.inc} (100%) rename data/maps/{events/Route104_PrettyPetalFlowerShop.inc => Route104_PrettyPetalFlowerShop/events.inc} (100%) rename data/{scripts/maps/Route104_PrettyPetalFlowerShop.inc => maps/Route104_PrettyPetalFlowerShop/scripts.inc} (100%) rename data/maps/{events/Route104_Prototype.inc => Route104_Prototype/events.inc} (100%) rename data/{scripts/maps/Route104_Prototype.inc => maps/Route104_Prototype/scripts.inc} (100%) rename data/maps/{events/Route104_PrototypePrettyPetalFlowerShop.inc => Route104_PrototypePrettyPetalFlowerShop/events.inc} (100%) rename data/{scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc => maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc} (100%) rename data/maps/{events/Route105.inc => Route105/events.inc} (100%) rename data/{scripts/maps/Route105.inc => maps/Route105/scripts.inc} (100%) rename data/maps/{events/Route106.inc => Route106/events.inc} (100%) rename data/{scripts/maps/Route106.inc => maps/Route106/scripts.inc} (100%) rename data/maps/{events/Route107.inc => Route107/events.inc} (100%) rename data/{scripts/maps/Route107.inc => maps/Route107/scripts.inc} (100%) rename data/maps/{events/Route108.inc => Route108/events.inc} (100%) rename data/{scripts/maps/Route108.inc => maps/Route108/scripts.inc} (100%) rename data/maps/{events/Route109.inc => Route109/events.inc} (100%) rename data/{scripts/maps/Route109.inc => maps/Route109/scripts.inc} (100%) rename data/maps/{events/Route109_SeashoreHouse.inc => Route109_SeashoreHouse/events.inc} (100%) rename data/{scripts/maps/Route109_SeashoreHouse.inc => maps/Route109_SeashoreHouse/scripts.inc} (100%) rename data/maps/{events/Route110.inc => Route110/events.inc} (100%) rename data/{scripts/maps/Route110.inc => maps/Route110/scripts.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadEntrance1.inc => Route110_SeasideCyclingRoadEntrance1/events.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc => maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadEntrance2.inc => Route110_SeasideCyclingRoadEntrance2/events.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc => maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseCorridor.inc => Route110_TrickHouseCorridor/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseCorridor.inc => maps/Route110_TrickHouseCorridor/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseEnd.inc => Route110_TrickHouseEnd/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEnd.inc => maps/Route110_TrickHouseEnd/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseEntrance.inc => Route110_TrickHouseEntrance/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEntrance.inc => maps/Route110_TrickHouseEntrance/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle1.inc => Route110_TrickHousePuzzle1/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle1.inc => maps/Route110_TrickHousePuzzle1/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle2.inc => Route110_TrickHousePuzzle2/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle2.inc => maps/Route110_TrickHousePuzzle2/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle3.inc => Route110_TrickHousePuzzle3/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle3.inc => maps/Route110_TrickHousePuzzle3/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle4.inc => Route110_TrickHousePuzzle4/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle4.inc => maps/Route110_TrickHousePuzzle4/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle5.inc => Route110_TrickHousePuzzle5/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle5.inc => maps/Route110_TrickHousePuzzle5/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle6.inc => Route110_TrickHousePuzzle6/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle6.inc => maps/Route110_TrickHousePuzzle6/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle7.inc => Route110_TrickHousePuzzle7/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle7.inc => maps/Route110_TrickHousePuzzle7/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle8.inc => Route110_TrickHousePuzzle8/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle8.inc => maps/Route110_TrickHousePuzzle8/scripts.inc} (100%) rename data/maps/{events/Route111.inc => Route111/events.inc} (100%) rename data/{scripts/maps/Route111.inc => maps/Route111/scripts.inc} (100%) rename data/maps/{events/Route111_OldLadysRestStop.inc => Route111_OldLadysRestStop/events.inc} (100%) rename data/{scripts/maps/Route111_OldLadysRestStop.inc => maps/Route111_OldLadysRestStop/scripts.inc} (100%) rename data/maps/{events/Route111_WinstrateFamilysHouse.inc => Route111_WinstrateFamilysHouse/events.inc} (100%) rename data/{scripts/maps/Route111_WinstrateFamilysHouse.inc => maps/Route111_WinstrateFamilysHouse/scripts.inc} (100%) rename data/maps/{events/Route112.inc => Route112/events.inc} (100%) rename data/{scripts/maps/Route112.inc => maps/Route112/scripts.inc} (100%) rename data/maps/{events/Route112_CableCarStation.inc => Route112_CableCarStation/events.inc} (100%) rename data/{scripts/maps/Route112_CableCarStation.inc => maps/Route112_CableCarStation/scripts.inc} (100%) rename data/maps/{events/Route113.inc => Route113/events.inc} (100%) rename data/{scripts/maps/Route113.inc => maps/Route113/scripts.inc} (100%) rename data/maps/{events/Route113_GlassWorkshop.inc => Route113_GlassWorkshop/events.inc} (100%) rename data/{scripts/maps/Route113_GlassWorkshop.inc => maps/Route113_GlassWorkshop/scripts.inc} (100%) rename data/maps/{events/Route114.inc => Route114/events.inc} (100%) rename data/{scripts/maps/Route114.inc => maps/Route114/scripts.inc} (100%) rename data/maps/{events/Route114_FossilManiacsHouse.inc => Route114_FossilManiacsHouse/events.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsHouse.inc => maps/Route114_FossilManiacsHouse/scripts.inc} (100%) rename data/maps/{events/Route114_FossilManiacsTunnel.inc => Route114_FossilManiacsTunnel/events.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsTunnel.inc => maps/Route114_FossilManiacsTunnel/scripts.inc} (100%) rename data/maps/{events/Route114_LanettesHouse.inc => Route114_LanettesHouse/events.inc} (100%) rename data/{scripts/maps/Route114_LanettesHouse.inc => maps/Route114_LanettesHouse/scripts.inc} (100%) rename data/maps/{events/Route115.inc => Route115/events.inc} (100%) rename data/{scripts/maps/Route115.inc => maps/Route115/scripts.inc} (100%) rename data/maps/{events/Route116.inc => Route116/events.inc} (100%) rename data/{scripts/maps/Route116.inc => maps/Route116/scripts.inc} (100%) rename data/maps/{events/Route116_TunnelersRestHouse.inc => Route116_TunnelersRestHouse/events.inc} (100%) rename data/{scripts/maps/Route116_TunnelersRestHouse.inc => maps/Route116_TunnelersRestHouse/scripts.inc} (100%) rename data/maps/{events/Route117.inc => Route117/events.inc} (100%) rename data/{scripts/maps/Route117.inc => maps/Route117/scripts.inc} (100%) rename data/maps/{events/Route117_PokemonDayCare.inc => Route117_PokemonDayCare/events.inc} (100%) rename data/{scripts/maps/Route117_PokemonDayCare.inc => maps/Route117_PokemonDayCare/scripts.inc} (100%) rename data/maps/{events/Route118.inc => Route118/events.inc} (100%) rename data/{scripts/maps/Route118.inc => maps/Route118/scripts.inc} (100%) rename data/maps/{events/Route119.inc => Route119/events.inc} (100%) rename data/{scripts/maps/Route119.inc => maps/Route119/scripts.inc} (100%) rename data/maps/{events/Route119_House.inc => Route119_House/events.inc} (100%) rename data/{scripts/maps/Route119_House.inc => maps/Route119_House/scripts.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_1F.inc => Route119_WeatherInstitute_1F/events.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_1F.inc => maps/Route119_WeatherInstitute_1F/scripts.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_2F.inc => Route119_WeatherInstitute_2F/events.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_2F.inc => maps/Route119_WeatherInstitute_2F/scripts.inc} (100%) rename data/maps/{events/Route120.inc => Route120/events.inc} (100%) rename data/{scripts/maps/Route120.inc => maps/Route120/scripts.inc} (100%) rename data/maps/{events/Route121.inc => Route121/events.inc} (100%) rename data/{scripts/maps/Route121.inc => maps/Route121/scripts.inc} (100%) rename data/maps/{events/Route121_SafariZoneEntrance.inc => Route121_SafariZoneEntrance/events.inc} (100%) rename data/{scripts/maps/Route121_SafariZoneEntrance.inc => maps/Route121_SafariZoneEntrance/scripts.inc} (100%) rename data/maps/{events/Route122.inc => Route122/events.inc} (100%) rename data/{scripts/maps/Route122.inc => maps/Route122/scripts.inc} (100%) rename data/maps/{events/Route123.inc => Route123/events.inc} (100%) rename data/{scripts/maps/Route123.inc => maps/Route123/scripts.inc} (100%) rename data/maps/{events/Route123_BerryMastersHouse.inc => Route123_BerryMastersHouse/events.inc} (100%) rename data/{scripts/maps/Route123_BerryMastersHouse.inc => maps/Route123_BerryMastersHouse/scripts.inc} (100%) rename data/maps/{events/Route124.inc => Route124/events.inc} (100%) rename data/{scripts/maps/Route124.inc => maps/Route124/scripts.inc} (100%) rename data/maps/{events/Route124_DivingTreasureHuntersHouse.inc => Route124_DivingTreasureHuntersHouse/events.inc} (100%) rename data/{scripts/maps/Route124_DivingTreasureHuntersHouse.inc => maps/Route124_DivingTreasureHuntersHouse/scripts.inc} (100%) rename data/maps/{events/Route125.inc => Route125/events.inc} (100%) rename data/{scripts/maps/Route125.inc => maps/Route125/scripts.inc} (100%) rename data/maps/{events/Route126.inc => Route126/events.inc} (100%) rename data/{scripts/maps/Route126.inc => maps/Route126/scripts.inc} (100%) rename data/maps/{events/Route127.inc => Route127/events.inc} (100%) rename data/{scripts/maps/Route127.inc => maps/Route127/scripts.inc} (100%) rename data/maps/{events/Route128.inc => Route128/events.inc} (100%) rename data/{scripts/maps/Route128.inc => maps/Route128/scripts.inc} (100%) rename data/maps/{events/Route129.inc => Route129/events.inc} (100%) rename data/{scripts/maps/Route129.inc => maps/Route129/scripts.inc} (100%) rename data/maps/{events/Route130.inc => Route130/events.inc} (100%) rename data/{scripts/maps/Route130.inc => maps/Route130/scripts.inc} (100%) rename data/maps/{events/Route131.inc => Route131/events.inc} (100%) rename data/{scripts/maps/Route131.inc => maps/Route131/scripts.inc} (100%) rename data/maps/{events/Route132.inc => Route132/events.inc} (100%) rename data/{scripts/maps/Route132.inc => maps/Route132/scripts.inc} (100%) rename data/maps/{events/Route133.inc => Route133/events.inc} (100%) rename data/{scripts/maps/Route133.inc => maps/Route133/scripts.inc} (100%) rename data/maps/{events/Route134.inc => Route134/events.inc} (100%) rename data/{scripts/maps/Route134.inc => maps/Route134/scripts.inc} (100%) rename data/maps/{events/RustboroCity.inc => RustboroCity/events.inc} (100%) rename data/{scripts/maps/RustboroCity.inc => maps/RustboroCity/scripts.inc} (100%) rename data/maps/{events/RustboroCity_CuttersHouse.inc => RustboroCity_CuttersHouse/events.inc} (100%) rename data/{scripts/maps/RustboroCity_CuttersHouse.inc => maps/RustboroCity_CuttersHouse/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_1F.inc => RustboroCity_DevonCorp_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_1F.inc => maps/RustboroCity_DevonCorp_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_2F.inc => RustboroCity_DevonCorp_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_2F.inc => maps/RustboroCity_DevonCorp_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_3F.inc => RustboroCity_DevonCorp_3F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_3F.inc => maps/RustboroCity_DevonCorp_3F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_1F.inc => RustboroCity_Flat1_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_1F.inc => maps/RustboroCity_Flat1_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_2F.inc => RustboroCity_Flat1_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_2F.inc => maps/RustboroCity_Flat1_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_1F.inc => RustboroCity_Flat2_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_1F.inc => maps/RustboroCity_Flat2_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_2F.inc => RustboroCity_Flat2_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_2F.inc => maps/RustboroCity_Flat2_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_3F.inc => RustboroCity_Flat2_3F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_3F.inc => maps/RustboroCity_Flat2_3F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Gym.inc => RustboroCity_Gym/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Gym.inc => maps/RustboroCity_Gym/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House1.inc => RustboroCity_House1/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House1.inc => maps/RustboroCity_House1/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House2.inc => RustboroCity_House2/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House2.inc => maps/RustboroCity_House2/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House3.inc => RustboroCity_House3/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House3.inc => maps/RustboroCity_House3/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Mart.inc => RustboroCity_Mart/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Mart.inc => maps/RustboroCity_Mart/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_1F.inc => RustboroCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_1F.inc => maps/RustboroCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_2F.inc => RustboroCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_2F.inc => maps/RustboroCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonSchool.inc => RustboroCity_PokemonSchool/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonSchool.inc => maps/RustboroCity_PokemonSchool/scripts.inc} (100%) rename data/maps/{events/RusturfTunnel.inc => RusturfTunnel/events.inc} (100%) rename data/{scripts/maps/RusturfTunnel.inc => maps/RusturfTunnel/scripts.inc} (100%) rename data/maps/{events/SSTidalCorridor.inc => SSTidalCorridor/events.inc} (100%) rename data/{scripts/maps/SSTidalCorridor.inc => maps/SSTidalCorridor/scripts.inc} (100%) rename data/maps/{events/SSTidalLowerDeck.inc => SSTidalLowerDeck/events.inc} (100%) rename data/{scripts/maps/SSTidalLowerDeck.inc => maps/SSTidalLowerDeck/scripts.inc} (100%) rename data/maps/{events/SSTidalRooms.inc => SSTidalRooms/events.inc} (100%) rename data/{scripts/maps/SSTidalRooms.inc => maps/SSTidalRooms/scripts.inc} (100%) rename data/maps/{events/SafariZone_North.inc => SafariZone_North/events.inc} (100%) rename data/{scripts/maps/SafariZone_North.inc => maps/SafariZone_North/scripts.inc} (100%) rename data/maps/{events/SafariZone_Northeast.inc => SafariZone_Northeast/events.inc} (100%) rename data/{scripts/maps/SafariZone_Northeast.inc => maps/SafariZone_Northeast/scripts.inc} (100%) rename data/maps/{events/SafariZone_Northwest.inc => SafariZone_Northwest/events.inc} (100%) rename data/{scripts/maps/SafariZone_Northwest.inc => maps/SafariZone_Northwest/scripts.inc} (100%) rename data/maps/{events/SafariZone_RestHouse.inc => SafariZone_RestHouse/events.inc} (100%) rename data/{scripts/maps/SafariZone_RestHouse.inc => maps/SafariZone_RestHouse/scripts.inc} (100%) rename data/maps/{events/SafariZone_South.inc => SafariZone_South/events.inc} (100%) rename data/{scripts/maps/SafariZone_South.inc => maps/SafariZone_South/scripts.inc} (100%) rename data/maps/{events/SafariZone_Southeast.inc => SafariZone_Southeast/events.inc} (100%) rename data/{scripts/maps/SafariZone_Southeast.inc => maps/SafariZone_Southeast/scripts.inc} (100%) rename data/maps/{events/SafariZone_Southwest.inc => SafariZone_Southwest/events.inc} (100%) rename data/{scripts/maps/SafariZone_Southwest.inc => maps/SafariZone_Southwest/scripts.inc} (100%) rename data/maps/{events/ScorchedSlab.inc => ScorchedSlab/events.inc} (100%) rename data/{scripts/maps/ScorchedSlab.inc => maps/ScorchedSlab/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Entrance.inc => SeafloorCavern_Entrance/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Entrance.inc => maps/SeafloorCavern_Entrance/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room1.inc => SeafloorCavern_Room1/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room1.inc => maps/SeafloorCavern_Room1/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room2.inc => SeafloorCavern_Room2/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room2.inc => maps/SeafloorCavern_Room2/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room3.inc => SeafloorCavern_Room3/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room3.inc => maps/SeafloorCavern_Room3/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room4.inc => SeafloorCavern_Room4/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room4.inc => maps/SeafloorCavern_Room4/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room5.inc => SeafloorCavern_Room5/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room5.inc => maps/SeafloorCavern_Room5/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room6.inc => SeafloorCavern_Room6/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room6.inc => maps/SeafloorCavern_Room6/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room7.inc => SeafloorCavern_Room7/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room7.inc => maps/SeafloorCavern_Room7/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room8.inc => SeafloorCavern_Room8/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room8.inc => maps/SeafloorCavern_Room8/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room9.inc => SeafloorCavern_Room9/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room9.inc => maps/SeafloorCavern_Room9/scripts.inc} (100%) rename data/maps/{events/SealedChamber_InnerRoom.inc => SealedChamber_InnerRoom/events.inc} (100%) rename data/{scripts/maps/SealedChamber_InnerRoom.inc => maps/SealedChamber_InnerRoom/scripts.inc} (100%) rename data/maps/{events/SealedChamber_OuterRoom.inc => SealedChamber_OuterRoom/events.inc} (100%) rename data/{scripts/maps/SealedChamber_OuterRoom.inc => maps/SealedChamber_OuterRoom/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave1.inc => SecretBase_BlueCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave1.inc => maps/SecretBase_BlueCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave2.inc => SecretBase_BlueCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave2.inc => maps/SecretBase_BlueCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave3.inc => SecretBase_BlueCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave3.inc => maps/SecretBase_BlueCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave4.inc => SecretBase_BlueCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave4.inc => maps/SecretBase_BlueCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave1.inc => SecretBase_BrownCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave1.inc => maps/SecretBase_BrownCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave2.inc => SecretBase_BrownCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave2.inc => maps/SecretBase_BrownCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave3.inc => SecretBase_BrownCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave3.inc => maps/SecretBase_BrownCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave4.inc => SecretBase_BrownCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave4.inc => maps/SecretBase_BrownCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave1.inc => SecretBase_RedCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave1.inc => maps/SecretBase_RedCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave2.inc => SecretBase_RedCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave2.inc => maps/SecretBase_RedCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave3.inc => SecretBase_RedCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave3.inc => maps/SecretBase_RedCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave4.inc => SecretBase_RedCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave4.inc => maps/SecretBase_RedCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub1.inc => SecretBase_Shrub1/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub1.inc => maps/SecretBase_Shrub1/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub2.inc => SecretBase_Shrub2/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub2.inc => maps/SecretBase_Shrub2/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub3.inc => SecretBase_Shrub3/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub3.inc => maps/SecretBase_Shrub3/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub4.inc => SecretBase_Shrub4/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub4.inc => maps/SecretBase_Shrub4/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree1.inc => SecretBase_Tree1/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree1.inc => maps/SecretBase_Tree1/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree2.inc => SecretBase_Tree2/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree2.inc => maps/SecretBase_Tree2/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree3.inc => SecretBase_Tree3/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree3.inc => maps/SecretBase_Tree3/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree4.inc => SecretBase_Tree4/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree4.inc => maps/SecretBase_Tree4/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave1.inc => SecretBase_YellowCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave1.inc => maps/SecretBase_YellowCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave2.inc => SecretBase_YellowCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave2.inc => maps/SecretBase_YellowCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave3.inc => SecretBase_YellowCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave3.inc => maps/SecretBase_YellowCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave4.inc => SecretBase_YellowCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave4.inc => maps/SecretBase_YellowCave4/scripts.inc} (100%) rename data/maps/{events/ShoalCave_HighTideEntranceRoom.inc => ShoalCave_HighTideEntranceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideEntranceRoom.inc => maps/ShoalCave_HighTideEntranceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_HighTideInnerRoom.inc => ShoalCave_HighTideInnerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideInnerRoom.inc => maps/ShoalCave_HighTideInnerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideEntranceRoom.inc => ShoalCave_LowTideEntranceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideEntranceRoom.inc => maps/ShoalCave_LowTideEntranceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideIceRoom.inc => ShoalCave_LowTideIceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideIceRoom.inc => maps/ShoalCave_LowTideIceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideInnerRoom.inc => ShoalCave_LowTideInnerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideInnerRoom.inc => maps/ShoalCave_LowTideInnerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideLowerRoom.inc => ShoalCave_LowTideLowerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideLowerRoom.inc => maps/ShoalCave_LowTideLowerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideStairsRoom.inc => ShoalCave_LowTideStairsRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideStairsRoom.inc => maps/ShoalCave_LowTideStairsRoom/scripts.inc} (100%) rename data/maps/{events/SingleBattleColosseum.inc => SingleBattleColosseum/events.inc} (100%) rename data/{scripts/maps/SingleBattleColosseum.inc => maps/SingleBattleColosseum/scripts.inc} (100%) rename data/maps/{events/SkyPillar_1F.inc => SkyPillar_1F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_1F.inc => maps/SkyPillar_1F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_2F.inc => SkyPillar_2F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_2F.inc => maps/SkyPillar_2F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_3F.inc => SkyPillar_3F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_3F.inc => maps/SkyPillar_3F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_4F.inc => SkyPillar_4F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_4F.inc => maps/SkyPillar_4F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_5F.inc => SkyPillar_5F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_5F.inc => maps/SkyPillar_5F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Entrance.inc => SkyPillar_Entrance/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Entrance.inc => maps/SkyPillar_Entrance/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Outside.inc => SkyPillar_Outside/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Outside.inc => maps/SkyPillar_Outside/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Top.inc => SkyPillar_Top/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Top.inc => maps/SkyPillar_Top/scripts.inc} (100%) rename data/maps/{events/SlateportCity.inc => SlateportCity/events.inc} (100%) rename data/{scripts/maps/SlateportCity.inc => maps/SlateportCity/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentBattleRoom.inc => SlateportCity_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentBattleRoom.inc => maps/SlateportCity_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentCorridor.inc => SlateportCity_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentCorridor.inc => maps/SlateportCity_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentLobby.inc => SlateportCity_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentLobby.inc => maps/SlateportCity_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/SlateportCity_Harbor.inc => SlateportCity_Harbor/events.inc} (100%) rename data/{scripts/maps/SlateportCity_Harbor.inc => maps/SlateportCity_Harbor/scripts.inc} (100%) rename data/maps/{events/SlateportCity_House1.inc => SlateportCity_House1/events.inc} (100%) rename data/{scripts/maps/SlateportCity_House1.inc => maps/SlateportCity_House1/scripts.inc} (100%) rename data/maps/{events/SlateportCity_House2.inc => SlateportCity_House2/events.inc} (100%) rename data/{scripts/maps/SlateportCity_House2.inc => maps/SlateportCity_House2/scripts.inc} (100%) rename data/maps/{events/SlateportCity_Mart.inc => SlateportCity_Mart/events.inc} (100%) rename data/{scripts/maps/SlateportCity_Mart.inc => maps/SlateportCity_Mart/scripts.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_1F.inc => SlateportCity_OceanicMuseum_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_1F.inc => maps/SlateportCity_OceanicMuseum_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_2F.inc => SlateportCity_OceanicMuseum_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_2F.inc => maps/SlateportCity_OceanicMuseum_2F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_1F.inc => SlateportCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_1F.inc => maps/SlateportCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_2F.inc => SlateportCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_2F.inc => maps/SlateportCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonFanClub.inc => SlateportCity_PokemonFanClub/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonFanClub.inc => maps/SlateportCity_PokemonFanClub/scripts.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_1F.inc => SlateportCity_SternsShipyard_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_1F.inc => maps/SlateportCity_SternsShipyard_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_2F.inc => SlateportCity_SternsShipyard_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_2F.inc => maps/SlateportCity_SternsShipyard_2F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity.inc => SootopolisCity/events.inc} (100%) rename data/{scripts/maps/SootopolisCity.inc => maps/SootopolisCity/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_1F.inc => SootopolisCity_Gym_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_1F.inc => maps/SootopolisCity_Gym_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_B1F.inc => SootopolisCity_Gym_B1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_B1F.inc => maps/SootopolisCity_Gym_B1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House1.inc => SootopolisCity_House1/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House1.inc => maps/SootopolisCity_House1/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House2.inc => SootopolisCity_House2/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House2.inc => maps/SootopolisCity_House2/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House3.inc => SootopolisCity_House3/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House3.inc => maps/SootopolisCity_House3/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House4.inc => SootopolisCity_House4/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House4.inc => maps/SootopolisCity_House4/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House5.inc => SootopolisCity_House5/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House5.inc => maps/SootopolisCity_House5/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House6.inc => SootopolisCity_House6/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House6.inc => maps/SootopolisCity_House6/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House7.inc => SootopolisCity_House7/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House7.inc => maps/SootopolisCity_House7/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_LotadAndSeedotHouse.inc => SootopolisCity_LotadAndSeedotHouse/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc => maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Mart.inc => SootopolisCity_Mart/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Mart.inc => maps/SootopolisCity_Mart/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_MysteryEventsHouse_1F.inc => SootopolisCity_MysteryEventsHouse_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc => maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_MysteryEventsHouse_B1F.inc => SootopolisCity_MysteryEventsHouse_B1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc => maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_1F.inc => SootopolisCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_1F.inc => maps/SootopolisCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_2F.inc => SootopolisCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_2F.inc => maps/SootopolisCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/SouthernIsland_Exterior.inc => SouthernIsland_Exterior/events.inc} (100%) rename data/{scripts/maps/SouthernIsland_Exterior.inc => maps/SouthernIsland_Exterior/scripts.inc} (100%) rename data/maps/{events/SouthernIsland_Interior.inc => SouthernIsland_Interior/events.inc} (100%) rename data/{scripts/maps/SouthernIsland_Interior.inc => maps/SouthernIsland_Interior/scripts.inc} (100%) rename data/maps/{events/TerraCave_End.inc => TerraCave_End/events.inc} (100%) rename data/{scripts/maps/TerraCave_End.inc => maps/TerraCave_End/scripts.inc} (100%) rename data/maps/{events/TerraCave_Entrance.inc => TerraCave_Entrance/events.inc} (100%) rename data/{scripts/maps/TerraCave_Entrance.inc => maps/TerraCave_Entrance/scripts.inc} (100%) rename data/maps/{events/TradeCenter.inc => TradeCenter/events.inc} (100%) rename data/{scripts/maps/TradeCenter.inc => maps/TradeCenter/scripts.inc} (100%) rename data/maps/{events/TrainerHill_1F.inc => TrainerHill_1F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_1F.inc => maps/TrainerHill_1F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_2F.inc => TrainerHill_2F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_2F.inc => maps/TrainerHill_2F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_3F.inc => TrainerHill_3F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_3F.inc => maps/TrainerHill_3F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_4F.inc => TrainerHill_4F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_4F.inc => maps/TrainerHill_4F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Elevator.inc => TrainerHill_Elevator/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Elevator.inc => maps/TrainerHill_Elevator/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Entrance.inc => TrainerHill_Entrance/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Entrance.inc => maps/TrainerHill_Entrance/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Roof.inc => TrainerHill_Roof/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Roof.inc => maps/TrainerHill_Roof/scripts.inc} (100%) rename data/maps/{events/Underwater1.inc => Underwater1/events.inc} (100%) rename data/{scripts/maps/Underwater1.inc => maps/Underwater1/scripts.inc} (100%) rename data/maps/{events/Underwater2.inc => Underwater2/events.inc} (100%) rename data/{scripts/maps/Underwater2.inc => maps/Underwater2/scripts.inc} (100%) rename data/maps/{events/Underwater3.inc => Underwater3/events.inc} (100%) rename data/{scripts/maps/Underwater3.inc => maps/Underwater3/scripts.inc} (100%) rename data/maps/{events/Underwater4.inc => Underwater4/events.inc} (100%) rename data/{scripts/maps/Underwater4.inc => maps/Underwater4/scripts.inc} (100%) rename data/maps/{events/Underwater5.inc => Underwater5/events.inc} (100%) rename data/{scripts/maps/Underwater5.inc => maps/Underwater5/scripts.inc} (100%) rename data/maps/{events/Underwater6.inc => Underwater6/events.inc} (100%) rename data/{scripts/maps/Underwater6.inc => maps/Underwater6/scripts.inc} (100%) rename data/maps/{events/Underwater7.inc => Underwater7/events.inc} (100%) rename data/{scripts/maps/Underwater7.inc => maps/Underwater7/scripts.inc} (100%) rename data/maps/{events/Underwater_MarineCave.inc => Underwater_MarineCave/events.inc} (100%) rename data/{scripts/maps/Underwater_MarineCave.inc => maps/Underwater_MarineCave/scripts.inc} (100%) rename data/maps/{events/Underwater_Route134.inc => Underwater_Route134/events.inc} (100%) rename data/{scripts/maps/Underwater_Route134.inc => maps/Underwater_Route134/scripts.inc} (100%) rename data/maps/{events/Underwater_SeafloorCavern.inc => Underwater_SeafloorCavern/events.inc} (100%) rename data/{scripts/maps/Underwater_SeafloorCavern.inc => maps/Underwater_SeafloorCavern/scripts.inc} (100%) rename data/maps/{events/Underwater_SealedChamber.inc => Underwater_SealedChamber/events.inc} (100%) rename data/{scripts/maps/Underwater_SealedChamber.inc => maps/Underwater_SealedChamber/scripts.inc} (100%) rename data/maps/{events/Underwater_SootopolisCity.inc => Underwater_SootopolisCity/events.inc} (100%) rename data/{scripts/maps/Underwater_SootopolisCity.inc => maps/Underwater_SootopolisCity/scripts.inc} (100%) rename data/maps/{events/UnionRoom.inc => UnionRoom/events.inc} (100%) rename data/{scripts/maps/UnionRoom.inc => maps/UnionRoom/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_29.inc => UnknownMap_25_29/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_29.inc => maps/UnknownMap_25_29/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_30.inc => UnknownMap_25_30/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_30.inc => maps/UnknownMap_25_30/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_31.inc => UnknownMap_25_31/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_31.inc => maps/UnknownMap_25_31/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_32.inc => UnknownMap_25_32/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_32.inc => maps/UnknownMap_25_32/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_33.inc => UnknownMap_25_33/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_33.inc => maps/UnknownMap_25_33/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_34.inc => UnknownMap_25_34/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_34.inc => maps/UnknownMap_25_34/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown.inc => VerdanturfTown/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown.inc => maps/VerdanturfTown/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentBattleRoom.inc => VerdanturfTown_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc => maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentCorridor.inc => VerdanturfTown_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentCorridor.inc => maps/VerdanturfTown_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentLobby.inc => VerdanturfTown_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentLobby.inc => maps/VerdanturfTown_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_FriendshipRatersHouse.inc => VerdanturfTown_FriendshipRatersHouse/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc => maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_House.inc => VerdanturfTown_House/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_House.inc => maps/VerdanturfTown_House/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_Mart.inc => VerdanturfTown_Mart/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_Mart.inc => maps/VerdanturfTown_Mart/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_1F.inc => VerdanturfTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_1F.inc => maps/VerdanturfTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_2F.inc => VerdanturfTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_2F.inc => maps/VerdanturfTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_WandasHouse.inc => VerdanturfTown_WandasHouse/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_WandasHouse.inc => maps/VerdanturfTown_WandasHouse/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_1F.inc => VictoryRoad_1F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_1F.inc => maps/VictoryRoad_1F/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_B1F.inc => VictoryRoad_B1F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_B1F.inc => maps/VictoryRoad_B1F/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_B2F.inc => VictoryRoad_B2F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_B2F.inc => maps/VictoryRoad_B2F/scripts.inc} (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index e18dec8360..4ad0ad60dd 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -59,376 +59,376 @@ gStdScripts_End:: @ 81DC2CC map_script 2, PetalburgCity_MapScript2_1DC31C .byte 0 - .include "data/scripts/maps/PetalburgCity.inc" - .include "data/scripts/maps/SlateportCity.inc" - .include "data/scripts/maps/MauvilleCity.inc" - .include "data/scripts/maps/RustboroCity.inc" - .include "data/scripts/maps/FortreeCity.inc" - .include "data/scripts/maps/LilycoveCity.inc" - .include "data/scripts/maps/MossdeepCity.inc" - .include "data/scripts/maps/SootopolisCity.inc" - .include "data/scripts/maps/EverGrandeCity.inc" - .include "data/scripts/maps/LittlerootTown.inc" - .include "data/scripts/maps/OldaleTown.inc" - .include "data/scripts/maps/DewfordTown.inc" - .include "data/scripts/maps/LavaridgeTown.inc" - .include "data/scripts/maps/FallarborTown.inc" - .include "data/scripts/maps/VerdanturfTown.inc" - .include "data/scripts/maps/PacifidlogTown.inc" - .include "data/scripts/maps/Route101.inc" - .include "data/scripts/maps/Route102.inc" - .include "data/scripts/maps/Route103.inc" - .include "data/scripts/maps/Route104.inc" - .include "data/scripts/maps/Route105.inc" - .include "data/scripts/maps/Route106.inc" - .include "data/scripts/maps/Route107.inc" - .include "data/scripts/maps/Route108.inc" - .include "data/scripts/maps/Route109.inc" - .include "data/scripts/maps/Route110.inc" - .include "data/scripts/maps/Route111.inc" - .include "data/scripts/maps/Route112.inc" - .include "data/scripts/maps/Route113.inc" - .include "data/scripts/maps/Route114.inc" - .include "data/scripts/maps/Route115.inc" - .include "data/scripts/maps/Route116.inc" - .include "data/scripts/maps/Route117.inc" - .include "data/scripts/maps/Route118.inc" - .include "data/scripts/maps/Route119.inc" - .include "data/scripts/maps/Route120.inc" - .include "data/scripts/maps/Route121.inc" - .include "data/scripts/maps/Route122.inc" - .include "data/scripts/maps/Route123.inc" - .include "data/scripts/maps/Route124.inc" - .include "data/scripts/maps/Route125.inc" - .include "data/scripts/maps/Route126.inc" - .include "data/scripts/maps/Route127.inc" - .include "data/scripts/maps/Route128.inc" - .include "data/scripts/maps/Route129.inc" - .include "data/scripts/maps/Route130.inc" - .include "data/scripts/maps/Route131.inc" - .include "data/scripts/maps/Route132.inc" - .include "data/scripts/maps/Route133.inc" - .include "data/scripts/maps/Route134.inc" - .include "data/scripts/maps/Underwater1.inc" - .include "data/scripts/maps/Underwater2.inc" - .include "data/scripts/maps/Underwater3.inc" - .include "data/scripts/maps/Underwater4.inc" - .include "data/scripts/maps/Underwater5.inc" - .include "data/scripts/maps/Underwater6.inc" - .include "data/scripts/maps/Underwater7.inc" - .include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc" - .include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc" - .include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc" - .include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc" - .include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/scripts/maps/OldaleTown_House1.inc" - .include "data/scripts/maps/OldaleTown_House2.inc" - .include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/OldaleTown_Mart.inc" - .include "data/scripts/maps/DewfordTown_House1.inc" - .include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/DewfordTown_Gym.inc" - .include "data/scripts/maps/DewfordTown_Hall.inc" - .include "data/scripts/maps/DewfordTown_House2.inc" - .include "data/scripts/maps/LavaridgeTown_HerbShop.inc" - .include "data/scripts/maps/LavaridgeTown_Gym_1F.inc" - .include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc" - .include "data/scripts/maps/LavaridgeTown_House.inc" - .include "data/scripts/maps/LavaridgeTown_Mart.inc" - .include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/FallarborTown_Mart.inc" - .include "data/scripts/maps/FallarborTown_BattleTentLobby.inc" - .include "data/scripts/maps/FallarborTown_BattleTentCorridor.inc" - .include "data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc" - .include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/FallarborTown_House1.inc" - .include "data/scripts/maps/FallarborTown_House2.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentLobby.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc" - .include "data/scripts/maps/VerdanturfTown_Mart.inc" - .include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/VerdanturfTown_WandasHouse.inc" - .include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/scripts/maps/VerdanturfTown_House.inc" - .include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/PacifidlogTown_House1.inc" - .include "data/scripts/maps/PacifidlogTown_House2.inc" - .include "data/scripts/maps/PacifidlogTown_House3.inc" - .include "data/scripts/maps/PacifidlogTown_House4.inc" - .include "data/scripts/maps/PacifidlogTown_House5.inc" - .include "data/scripts/maps/PetalburgCity_WallysHouse.inc" - .include "data/scripts/maps/PetalburgCity_Gym.inc" - .include "data/scripts/maps/PetalburgCity_House1.inc" - .include "data/scripts/maps/PetalburgCity_House2.inc" - .include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/PetalburgCity_Mart.inc" - .include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc" - .include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc" - .include "data/scripts/maps/SlateportCity_BattleTentLobby.inc" - .include "data/scripts/maps/SlateportCity_BattleTentCorridor.inc" - .include "data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc" - .include "data/scripts/maps/SlateportCity_House1.inc" - .include "data/scripts/maps/SlateportCity_PokemonFanClub.inc" - .include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc" - .include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc" - .include "data/scripts/maps/SlateportCity_Harbor.inc" - .include "data/scripts/maps/SlateportCity_House2.inc" - .include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/SlateportCity_Mart.inc" - .include "data/scripts/maps/MauvilleCity_Gym.inc" - .include "data/scripts/maps/MauvilleCity_BikeShop.inc" - .include "data/scripts/maps/MauvilleCity_House1.inc" - .include "data/scripts/maps/MauvilleCity_GameCorner.inc" - .include "data/scripts/maps/MauvilleCity_House2.inc" - .include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/MauvilleCity_Mart.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc" - .include "data/scripts/maps/RustboroCity_Gym.inc" - .include "data/scripts/maps/RustboroCity_PokemonSchool.inc" - .include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/RustboroCity_Mart.inc" - .include "data/scripts/maps/RustboroCity_Flat1_1F.inc" - .include "data/scripts/maps/RustboroCity_Flat1_2F.inc" - .include "data/scripts/maps/RustboroCity_House1.inc" - .include "data/scripts/maps/RustboroCity_CuttersHouse.inc" - .include "data/scripts/maps/RustboroCity_House2.inc" - .include "data/scripts/maps/RustboroCity_Flat2_1F.inc" - .include "data/scripts/maps/RustboroCity_Flat2_2F.inc" - .include "data/scripts/maps/RustboroCity_Flat2_3F.inc" - .include "data/scripts/maps/RustboroCity_House3.inc" - .include "data/scripts/maps/FortreeCity_House1.inc" - .include "data/scripts/maps/FortreeCity_Gym.inc" - .include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/FortreeCity_Mart.inc" - .include "data/scripts/maps/FortreeCity_House2.inc" - .include "data/scripts/maps/FortreeCity_House3.inc" - .include "data/scripts/maps/FortreeCity_House4.inc" - .include "data/scripts/maps/FortreeCity_House5.inc" - .include "data/scripts/maps/FortreeCity_DecorationShop.inc" - .include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/scripts/maps/LilycoveCity_ContestLobby.inc" - .include "data/scripts/maps/LilycoveCity_ContestHall.inc" - .include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/LilycoveCity_UnusedMart.inc" - .include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/scripts/maps/LilycoveCity_Harbor.inc" - .include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc" - .include "data/scripts/maps/LilycoveCity_House1.inc" - .include "data/scripts/maps/LilycoveCity_House2.inc" - .include "data/scripts/maps/LilycoveCity_House3.inc" - .include "data/scripts/maps/LilycoveCity_House4.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/scripts/maps/MossdeepCity_Gym.inc" - .include "data/scripts/maps/MossdeepCity_House1.inc" - .include "data/scripts/maps/MossdeepCity_House2.inc" - .include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/MossdeepCity_Mart.inc" - .include "data/scripts/maps/MossdeepCity_House3.inc" - .include "data/scripts/maps/MossdeepCity_StevensHouse.inc" - .include "data/scripts/maps/MossdeepCity_House4.inc" - .include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc" - .include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc" - .include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc" - .include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc" - .include "data/scripts/maps/SootopolisCity_Gym_1F.inc" - .include "data/scripts/maps/SootopolisCity_Gym_B1F.inc" - .include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/SootopolisCity_Mart.inc" - .include "data/scripts/maps/SootopolisCity_House1.inc" - .include "data/scripts/maps/SootopolisCity_House2.inc" - .include "data/scripts/maps/SootopolisCity_House3.inc" - .include "data/scripts/maps/SootopolisCity_House4.inc" - .include "data/scripts/maps/SootopolisCity_House5.inc" - .include "data/scripts/maps/SootopolisCity_House6.inc" - .include "data/scripts/maps/SootopolisCity_House7.inc" - .include "data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc" - .include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc" - .include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc" - .include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc" - .include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc" - .include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc" - .include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc" - .include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc" - .include "data/scripts/maps/EverGrandeCity_Hall1.inc" - .include "data/scripts/maps/EverGrandeCity_Hall2.inc" - .include "data/scripts/maps/EverGrandeCity_Hall3.inc" - .include "data/scripts/maps/EverGrandeCity_Hall4.inc" - .include "data/scripts/maps/EverGrandeCity_Hall5.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc" - .include "data/scripts/maps/EverGrandeCity_HallOfFame.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc" - .include "data/scripts/maps/Route104_MrBrineysHouse.inc" - .include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc" - .include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc" - .include "data/scripts/maps/Route111_OldLadysRestStop.inc" - .include "data/scripts/maps/Route112_CableCarStation.inc" - .include "data/scripts/maps/MtChimney_CableCarStation.inc" - .include "data/scripts/maps/Route114_FossilManiacsHouse.inc" - .include "data/scripts/maps/Route114_FossilManiacsTunnel.inc" - .include "data/scripts/maps/Route114_LanettesHouse.inc" - .include "data/scripts/maps/Route116_TunnelersRestHouse.inc" - .include "data/scripts/maps/Route117_PokemonDayCare.inc" - .include "data/scripts/maps/Route121_SafariZoneEntrance.inc" - .include "data/scripts/maps/MeteorFalls_1F_1R.inc" - .include "data/scripts/maps/MeteorFalls_1F_2R.inc" - .include "data/scripts/maps/MeteorFalls_B1F_1R.inc" - .include "data/scripts/maps/MeteorFalls_B1F_2R.inc" - .include "data/scripts/maps/RusturfTunnel.inc" - .include "data/scripts/maps/Underwater_SootopolisCity.inc" - .include "data/scripts/maps/DesertRuins.inc" - .include "data/scripts/maps/GraniteCave_1F.inc" - .include "data/scripts/maps/GraniteCave_B1F.inc" - .include "data/scripts/maps/GraniteCave_B2F.inc" - .include "data/scripts/maps/GraniteCave_StevensRoom.inc" - .include "data/scripts/maps/PetalburgWoods.inc" - .include "data/scripts/maps/MtChimney.inc" - .include "data/scripts/maps/JaggedPass.inc" - .include "data/scripts/maps/FieryPath.inc" - .include "data/scripts/maps/MtPyre_1F.inc" - .include "data/scripts/maps/MtPyre_2F.inc" - .include "data/scripts/maps/MtPyre_3F.inc" - .include "data/scripts/maps/MtPyre_4F.inc" - .include "data/scripts/maps/MtPyre_5F.inc" - .include "data/scripts/maps/MtPyre_6F.inc" - .include "data/scripts/maps/MtPyre_Exterior.inc" - .include "data/scripts/maps/MtPyre_Summit.inc" - .include "data/scripts/maps/AquaHideout_1F.inc" - .include "data/scripts/maps/AquaHideout_B1F.inc" - .include "data/scripts/maps/AquaHideout_B2F.inc" - .include "data/scripts/maps/Underwater_SeafloorCavern.inc" - .include "data/scripts/maps/SeafloorCavern_Entrance.inc" - .include "data/scripts/maps/SeafloorCavern_Room1.inc" - .include "data/scripts/maps/SeafloorCavern_Room2.inc" - .include "data/scripts/maps/SeafloorCavern_Room3.inc" - .include "data/scripts/maps/SeafloorCavern_Room4.inc" - .include "data/scripts/maps/SeafloorCavern_Room5.inc" - .include "data/scripts/maps/SeafloorCavern_Room6.inc" - .include "data/scripts/maps/SeafloorCavern_Room7.inc" - .include "data/scripts/maps/SeafloorCavern_Room8.inc" - .include "data/scripts/maps/SeafloorCavern_Room9.inc" - .include "data/scripts/maps/CaveOfOrigin_Entrance.inc" - .include "data/scripts/maps/CaveOfOrigin_1F.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc" - .include "data/scripts/maps/CaveOfOrigin_B1F.inc" - .include "data/scripts/maps/VictoryRoad_1F.inc" - .include "data/scripts/maps/VictoryRoad_B1F.inc" - .include "data/scripts/maps/VictoryRoad_B2F.inc" - .include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc" - .include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc" - .include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc" - .include "data/scripts/maps/NewMauville_Entrance.inc" - .include "data/scripts/maps/NewMauville_Inside.inc" - .include "data/scripts/maps/AbandonedShip_Deck.inc" - .include "data/scripts/maps/AbandonedShip_Corridors_1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms_1F.inc" - .include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Underwater1.inc" - .include "data/scripts/maps/AbandonedShip_Room_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc" - .include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc" - .include "data/scripts/maps/AbandonedShip_Underwater2.inc" - .include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc" - .include "data/scripts/maps/IslandCave.inc" - .include "data/scripts/maps/AncientTomb.inc" - .include "data/scripts/maps/Underwater_Route134.inc" - .include "data/scripts/maps/Underwater_SealedChamber.inc" - .include "data/scripts/maps/SealedChamber_OuterRoom.inc" - .include "data/scripts/maps/SealedChamber_InnerRoom.inc" - .include "data/scripts/maps/ScorchedSlab.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap1.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap2.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap3.inc" - .include "data/scripts/maps/SkyPillar_Entrance.inc" - .include "data/scripts/maps/SkyPillar_Outside.inc" - .include "data/scripts/maps/SkyPillar_1F.inc" - .include "data/scripts/maps/SkyPillar_2F.inc" - .include "data/scripts/maps/SkyPillar_3F.inc" - .include "data/scripts/maps/SkyPillar_4F.inc" - .include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc" - .include "data/scripts/maps/SkyPillar_5F.inc" - .include "data/scripts/maps/SkyPillar_Top.inc" - .include "data/scripts/maps/MagmaHideout_1F.inc" - .include "data/scripts/maps/MagmaHideout_2F_1R.inc" - .include "data/scripts/maps/MagmaHideout_2F_2R.inc" - .include "data/scripts/maps/MagmaHideout_3F_1R.inc" - .include "data/scripts/maps/MagmaHideout_3F_2R.inc" - .include "data/scripts/maps/MagmaHideout_4F.inc" - .include "data/scripts/maps/MagmaHideout_3F_3R.inc" - .include "data/scripts/maps/MagmaHideout_2F_3R.inc" - .include "data/scripts/maps/MirageTower_1F.inc" - .include "data/scripts/maps/MirageTower_2F.inc" - .include "data/scripts/maps/MirageTower_3F.inc" - .include "data/scripts/maps/MirageTower_4F.inc" - .include "data/scripts/maps/DesertUnderpass.inc" - .include "data/scripts/maps/ArtisanCave_B1F.inc" - .include "data/scripts/maps/ArtisanCave_1F.inc" - .include "data/scripts/maps/Underwater_MarineCave.inc" - .include "data/scripts/maps/MarineCave_Entrance.inc" - .include "data/scripts/maps/MarineCave_End.inc" - .include "data/scripts/maps/TerraCave_Entrance.inc" - .include "data/scripts/maps/TerraCave_End.inc" - .include "data/scripts/maps/AlteringCave.inc" - .include "data/scripts/maps/MeteorFalls_StevensCave.inc" - .include "data/scripts/maps/SecretBase_BlueCave1.inc" - .include "data/scripts/maps/SecretBase_BlueCave2.inc" - .include "data/scripts/maps/SecretBase_BlueCave3.inc" - .include "data/scripts/maps/SecretBase_BlueCave4.inc" - .include "data/scripts/maps/SecretBase_BrownCave1.inc" - .include "data/scripts/maps/SecretBase_BrownCave2.inc" - .include "data/scripts/maps/SecretBase_BrownCave3.inc" - .include "data/scripts/maps/SecretBase_BrownCave4.inc" - .include "data/scripts/maps/SecretBase_RedCave1.inc" - .include "data/scripts/maps/SecretBase_RedCave2.inc" - .include "data/scripts/maps/SecretBase_RedCave3.inc" - .include "data/scripts/maps/SecretBase_RedCave4.inc" - .include "data/scripts/maps/SecretBase_Shrub1.inc" - .include "data/scripts/maps/SecretBase_Shrub2.inc" - .include "data/scripts/maps/SecretBase_Shrub3.inc" - .include "data/scripts/maps/SecretBase_Shrub4.inc" - .include "data/scripts/maps/SecretBase_Tree1.inc" - .include "data/scripts/maps/SecretBase_Tree2.inc" - .include "data/scripts/maps/SecretBase_Tree3.inc" - .include "data/scripts/maps/SecretBase_Tree4.inc" - .include "data/scripts/maps/SecretBase_YellowCave1.inc" - .include "data/scripts/maps/SecretBase_YellowCave2.inc" - .include "data/scripts/maps/SecretBase_YellowCave3.inc" - .include "data/scripts/maps/SecretBase_YellowCave4.inc" + .include "data/maps/PetalburgCity/scripts.inc" + .include "data/maps/SlateportCity/scripts.inc" + .include "data/maps/MauvilleCity/scripts.inc" + .include "data/maps/RustboroCity/scripts.inc" + .include "data/maps/FortreeCity/scripts.inc" + .include "data/maps/LilycoveCity/scripts.inc" + .include "data/maps/MossdeepCity/scripts.inc" + .include "data/maps/SootopolisCity/scripts.inc" + .include "data/maps/EverGrandeCity/scripts.inc" + .include "data/maps/LittlerootTown/scripts.inc" + .include "data/maps/OldaleTown/scripts.inc" + .include "data/maps/DewfordTown/scripts.inc" + .include "data/maps/LavaridgeTown/scripts.inc" + .include "data/maps/FallarborTown/scripts.inc" + .include "data/maps/VerdanturfTown/scripts.inc" + .include "data/maps/PacifidlogTown/scripts.inc" + .include "data/maps/Route101/scripts.inc" + .include "data/maps/Route102/scripts.inc" + .include "data/maps/Route103/scripts.inc" + .include "data/maps/Route104/scripts.inc" + .include "data/maps/Route105/scripts.inc" + .include "data/maps/Route106/scripts.inc" + .include "data/maps/Route107/scripts.inc" + .include "data/maps/Route108/scripts.inc" + .include "data/maps/Route109/scripts.inc" + .include "data/maps/Route110/scripts.inc" + .include "data/maps/Route111/scripts.inc" + .include "data/maps/Route112/scripts.inc" + .include "data/maps/Route113/scripts.inc" + .include "data/maps/Route114/scripts.inc" + .include "data/maps/Route115/scripts.inc" + .include "data/maps/Route116/scripts.inc" + .include "data/maps/Route117/scripts.inc" + .include "data/maps/Route118/scripts.inc" + .include "data/maps/Route119/scripts.inc" + .include "data/maps/Route120/scripts.inc" + .include "data/maps/Route121/scripts.inc" + .include "data/maps/Route122/scripts.inc" + .include "data/maps/Route123/scripts.inc" + .include "data/maps/Route124/scripts.inc" + .include "data/maps/Route125/scripts.inc" + .include "data/maps/Route126/scripts.inc" + .include "data/maps/Route127/scripts.inc" + .include "data/maps/Route128/scripts.inc" + .include "data/maps/Route129/scripts.inc" + .include "data/maps/Route130/scripts.inc" + .include "data/maps/Route131/scripts.inc" + .include "data/maps/Route132/scripts.inc" + .include "data/maps/Route133/scripts.inc" + .include "data/maps/Route134/scripts.inc" + .include "data/maps/Underwater1/scripts.inc" + .include "data/maps/Underwater2/scripts.inc" + .include "data/maps/Underwater3/scripts.inc" + .include "data/maps/Underwater4/scripts.inc" + .include "data/maps/Underwater5/scripts.inc" + .include "data/maps/Underwater6/scripts.inc" + .include "data/maps/Underwater7/scripts.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc" + .include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc" + .include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc" + .include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc" + .include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc" + .include "data/maps/OldaleTown_House1/scripts.inc" + .include "data/maps/OldaleTown_House2/scripts.inc" + .include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/OldaleTown_Mart/scripts.inc" + .include "data/maps/DewfordTown_House1/scripts.inc" + .include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/DewfordTown_Gym/scripts.inc" + .include "data/maps/DewfordTown_Hall/scripts.inc" + .include "data/maps/DewfordTown_House2/scripts.inc" + .include "data/maps/LavaridgeTown_HerbShop/scripts.inc" + .include "data/maps/LavaridgeTown_Gym_1F/scripts.inc" + .include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc" + .include "data/maps/LavaridgeTown_House/scripts.inc" + .include "data/maps/LavaridgeTown_Mart/scripts.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/FallarborTown_Mart/scripts.inc" + .include "data/maps/FallarborTown_BattleTentLobby/scripts.inc" + .include "data/maps/FallarborTown_BattleTentCorridor/scripts.inc" + .include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc" + .include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/FallarborTown_House1/scripts.inc" + .include "data/maps/FallarborTown_House2/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc" + .include "data/maps/VerdanturfTown_Mart/scripts.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/VerdanturfTown_WandasHouse/scripts.inc" + .include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc" + .include "data/maps/VerdanturfTown_House/scripts.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/PacifidlogTown_House1/scripts.inc" + .include "data/maps/PacifidlogTown_House2/scripts.inc" + .include "data/maps/PacifidlogTown_House3/scripts.inc" + .include "data/maps/PacifidlogTown_House4/scripts.inc" + .include "data/maps/PacifidlogTown_House5/scripts.inc" + .include "data/maps/PetalburgCity_WallysHouse/scripts.inc" + .include "data/maps/PetalburgCity_Gym/scripts.inc" + .include "data/maps/PetalburgCity_House1/scripts.inc" + .include "data/maps/PetalburgCity_House2/scripts.inc" + .include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/PetalburgCity_Mart/scripts.inc" + .include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc" + .include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc" + .include "data/maps/SlateportCity_BattleTentLobby/scripts.inc" + .include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc" + .include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc" + .include "data/maps/SlateportCity_House1/scripts.inc" + .include "data/maps/SlateportCity_PokemonFanClub/scripts.inc" + .include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc" + .include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc" + .include "data/maps/SlateportCity_Harbor/scripts.inc" + .include "data/maps/SlateportCity_House2/scripts.inc" + .include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/SlateportCity_Mart/scripts.inc" + .include "data/maps/MauvilleCity_Gym/scripts.inc" + .include "data/maps/MauvilleCity_BikeShop/scripts.inc" + .include "data/maps/MauvilleCity_House1/scripts.inc" + .include "data/maps/MauvilleCity_GameCorner/scripts.inc" + .include "data/maps/MauvilleCity_House2/scripts.inc" + .include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/MauvilleCity_Mart/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc" + .include "data/maps/RustboroCity_Gym/scripts.inc" + .include "data/maps/RustboroCity_PokemonSchool/scripts.inc" + .include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/RustboroCity_Mart/scripts.inc" + .include "data/maps/RustboroCity_Flat1_1F/scripts.inc" + .include "data/maps/RustboroCity_Flat1_2F/scripts.inc" + .include "data/maps/RustboroCity_House1/scripts.inc" + .include "data/maps/RustboroCity_CuttersHouse/scripts.inc" + .include "data/maps/RustboroCity_House2/scripts.inc" + .include "data/maps/RustboroCity_Flat2_1F/scripts.inc" + .include "data/maps/RustboroCity_Flat2_2F/scripts.inc" + .include "data/maps/RustboroCity_Flat2_3F/scripts.inc" + .include "data/maps/RustboroCity_House3/scripts.inc" + .include "data/maps/FortreeCity_House1/scripts.inc" + .include "data/maps/FortreeCity_Gym/scripts.inc" + .include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/FortreeCity_Mart/scripts.inc" + .include "data/maps/FortreeCity_House2/scripts.inc" + .include "data/maps/FortreeCity_House3/scripts.inc" + .include "data/maps/FortreeCity_House4/scripts.inc" + .include "data/maps/FortreeCity_House5/scripts.inc" + .include "data/maps/FortreeCity_DecorationShop/scripts.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc" + .include "data/maps/LilycoveCity_ContestLobby/scripts.inc" + .include "data/maps/LilycoveCity_ContestHall/scripts.inc" + .include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/LilycoveCity_UnusedMart/scripts.inc" + .include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc" + .include "data/maps/LilycoveCity_Harbor/scripts.inc" + .include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc" + .include "data/maps/LilycoveCity_House1/scripts.inc" + .include "data/maps/LilycoveCity_House2/scripts.inc" + .include "data/maps/LilycoveCity_House3/scripts.inc" + .include "data/maps/LilycoveCity_House4/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc" + .include "data/maps/MossdeepCity_Gym/scripts.inc" + .include "data/maps/MossdeepCity_House1/scripts.inc" + .include "data/maps/MossdeepCity_House2/scripts.inc" + .include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/MossdeepCity_Mart/scripts.inc" + .include "data/maps/MossdeepCity_House3/scripts.inc" + .include "data/maps/MossdeepCity_StevensHouse/scripts.inc" + .include "data/maps/MossdeepCity_House4/scripts.inc" + .include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc" + .include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc" + .include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc" + .include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc" + .include "data/maps/SootopolisCity_Gym_1F/scripts.inc" + .include "data/maps/SootopolisCity_Gym_B1F/scripts.inc" + .include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/SootopolisCity_Mart/scripts.inc" + .include "data/maps/SootopolisCity_House1/scripts.inc" + .include "data/maps/SootopolisCity_House2/scripts.inc" + .include "data/maps/SootopolisCity_House3/scripts.inc" + .include "data/maps/SootopolisCity_House4/scripts.inc" + .include "data/maps/SootopolisCity_House5/scripts.inc" + .include "data/maps/SootopolisCity_House6/scripts.inc" + .include "data/maps/SootopolisCity_House7/scripts.inc" + .include "data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc" + .include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc" + .include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc" + .include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc" + .include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc" + .include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc" + .include "data/maps/EverGrandeCity_Hall1/scripts.inc" + .include "data/maps/EverGrandeCity_Hall2/scripts.inc" + .include "data/maps/EverGrandeCity_Hall3/scripts.inc" + .include "data/maps/EverGrandeCity_Hall4/scripts.inc" + .include "data/maps/EverGrandeCity_Hall5/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc" + .include "data/maps/EverGrandeCity_HallOfFame/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc" + .include "data/maps/Route104_MrBrineysHouse/scripts.inc" + .include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc" + .include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc" + .include "data/maps/Route111_OldLadysRestStop/scripts.inc" + .include "data/maps/Route112_CableCarStation/scripts.inc" + .include "data/maps/MtChimney_CableCarStation/scripts.inc" + .include "data/maps/Route114_FossilManiacsHouse/scripts.inc" + .include "data/maps/Route114_FossilManiacsTunnel/scripts.inc" + .include "data/maps/Route114_LanettesHouse/scripts.inc" + .include "data/maps/Route116_TunnelersRestHouse/scripts.inc" + .include "data/maps/Route117_PokemonDayCare/scripts.inc" + .include "data/maps/Route121_SafariZoneEntrance/scripts.inc" + .include "data/maps/MeteorFalls_1F_1R/scripts.inc" + .include "data/maps/MeteorFalls_1F_2R/scripts.inc" + .include "data/maps/MeteorFalls_B1F_1R/scripts.inc" + .include "data/maps/MeteorFalls_B1F_2R/scripts.inc" + .include "data/maps/RusturfTunnel/scripts.inc" + .include "data/maps/Underwater_SootopolisCity/scripts.inc" + .include "data/maps/DesertRuins/scripts.inc" + .include "data/maps/GraniteCave_1F/scripts.inc" + .include "data/maps/GraniteCave_B1F/scripts.inc" + .include "data/maps/GraniteCave_B2F/scripts.inc" + .include "data/maps/GraniteCave_StevensRoom/scripts.inc" + .include "data/maps/PetalburgWoods/scripts.inc" + .include "data/maps/MtChimney/scripts.inc" + .include "data/maps/JaggedPass/scripts.inc" + .include "data/maps/FieryPath/scripts.inc" + .include "data/maps/MtPyre_1F/scripts.inc" + .include "data/maps/MtPyre_2F/scripts.inc" + .include "data/maps/MtPyre_3F/scripts.inc" + .include "data/maps/MtPyre_4F/scripts.inc" + .include "data/maps/MtPyre_5F/scripts.inc" + .include "data/maps/MtPyre_6F/scripts.inc" + .include "data/maps/MtPyre_Exterior/scripts.inc" + .include "data/maps/MtPyre_Summit/scripts.inc" + .include "data/maps/AquaHideout_1F/scripts.inc" + .include "data/maps/AquaHideout_B1F/scripts.inc" + .include "data/maps/AquaHideout_B2F/scripts.inc" + .include "data/maps/Underwater_SeafloorCavern/scripts.inc" + .include "data/maps/SeafloorCavern_Entrance/scripts.inc" + .include "data/maps/SeafloorCavern_Room1/scripts.inc" + .include "data/maps/SeafloorCavern_Room2/scripts.inc" + .include "data/maps/SeafloorCavern_Room3/scripts.inc" + .include "data/maps/SeafloorCavern_Room4/scripts.inc" + .include "data/maps/SeafloorCavern_Room5/scripts.inc" + .include "data/maps/SeafloorCavern_Room6/scripts.inc" + .include "data/maps/SeafloorCavern_Room7/scripts.inc" + .include "data/maps/SeafloorCavern_Room8/scripts.inc" + .include "data/maps/SeafloorCavern_Room9/scripts.inc" + .include "data/maps/CaveOfOrigin_Entrance/scripts.inc" + .include "data/maps/CaveOfOrigin_1F/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc" + .include "data/maps/CaveOfOrigin_B1F/scripts.inc" + .include "data/maps/VictoryRoad_1F/scripts.inc" + .include "data/maps/VictoryRoad_B1F/scripts.inc" + .include "data/maps/VictoryRoad_B2F/scripts.inc" + .include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc" + .include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc" + .include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc" + .include "data/maps/NewMauville_Entrance/scripts.inc" + .include "data/maps/NewMauville_Inside/scripts.inc" + .include "data/maps/AbandonedShip_Deck/scripts.inc" + .include "data/maps/AbandonedShip_Corridors_1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms_1F/scripts.inc" + .include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Underwater1/scripts.inc" + .include "data/maps/AbandonedShip_Room_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc" + .include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc" + .include "data/maps/AbandonedShip_Underwater2/scripts.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc" + .include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc" + .include "data/maps/IslandCave/scripts.inc" + .include "data/maps/AncientTomb/scripts.inc" + .include "data/maps/Underwater_Route134/scripts.inc" + .include "data/maps/Underwater_SealedChamber/scripts.inc" + .include "data/maps/SealedChamber_OuterRoom/scripts.inc" + .include "data/maps/SealedChamber_InnerRoom/scripts.inc" + .include "data/maps/ScorchedSlab/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap1/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap2/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap3/scripts.inc" + .include "data/maps/SkyPillar_Entrance/scripts.inc" + .include "data/maps/SkyPillar_Outside/scripts.inc" + .include "data/maps/SkyPillar_1F/scripts.inc" + .include "data/maps/SkyPillar_2F/scripts.inc" + .include "data/maps/SkyPillar_3F/scripts.inc" + .include "data/maps/SkyPillar_4F/scripts.inc" + .include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc" + .include "data/maps/SkyPillar_5F/scripts.inc" + .include "data/maps/SkyPillar_Top/scripts.inc" + .include "data/maps/MagmaHideout_1F/scripts.inc" + .include "data/maps/MagmaHideout_2F_1R/scripts.inc" + .include "data/maps/MagmaHideout_2F_2R/scripts.inc" + .include "data/maps/MagmaHideout_3F_1R/scripts.inc" + .include "data/maps/MagmaHideout_3F_2R/scripts.inc" + .include "data/maps/MagmaHideout_4F/scripts.inc" + .include "data/maps/MagmaHideout_3F_3R/scripts.inc" + .include "data/maps/MagmaHideout_2F_3R/scripts.inc" + .include "data/maps/MirageTower_1F/scripts.inc" + .include "data/maps/MirageTower_2F/scripts.inc" + .include "data/maps/MirageTower_3F/scripts.inc" + .include "data/maps/MirageTower_4F/scripts.inc" + .include "data/maps/DesertUnderpass/scripts.inc" + .include "data/maps/ArtisanCave_B1F/scripts.inc" + .include "data/maps/ArtisanCave_1F/scripts.inc" + .include "data/maps/Underwater_MarineCave/scripts.inc" + .include "data/maps/MarineCave_Entrance/scripts.inc" + .include "data/maps/MarineCave_End/scripts.inc" + .include "data/maps/TerraCave_Entrance/scripts.inc" + .include "data/maps/TerraCave_End/scripts.inc" + .include "data/maps/AlteringCave/scripts.inc" + .include "data/maps/MeteorFalls_StevensCave/scripts.inc" + .include "data/maps/SecretBase_BlueCave1/scripts.inc" + .include "data/maps/SecretBase_BlueCave2/scripts.inc" + .include "data/maps/SecretBase_BlueCave3/scripts.inc" + .include "data/maps/SecretBase_BlueCave4/scripts.inc" + .include "data/maps/SecretBase_BrownCave1/scripts.inc" + .include "data/maps/SecretBase_BrownCave2/scripts.inc" + .include "data/maps/SecretBase_BrownCave3/scripts.inc" + .include "data/maps/SecretBase_BrownCave4/scripts.inc" + .include "data/maps/SecretBase_RedCave1/scripts.inc" + .include "data/maps/SecretBase_RedCave2/scripts.inc" + .include "data/maps/SecretBase_RedCave3/scripts.inc" + .include "data/maps/SecretBase_RedCave4/scripts.inc" + .include "data/maps/SecretBase_Shrub1/scripts.inc" + .include "data/maps/SecretBase_Shrub2/scripts.inc" + .include "data/maps/SecretBase_Shrub3/scripts.inc" + .include "data/maps/SecretBase_Shrub4/scripts.inc" + .include "data/maps/SecretBase_Tree1/scripts.inc" + .include "data/maps/SecretBase_Tree2/scripts.inc" + .include "data/maps/SecretBase_Tree3/scripts.inc" + .include "data/maps/SecretBase_Tree4/scripts.inc" + .include "data/maps/SecretBase_YellowCave1/scripts.inc" + .include "data/maps/SecretBase_YellowCave2/scripts.inc" + .include "data/maps/SecretBase_YellowCave3/scripts.inc" + .include "data/maps/SecretBase_YellowCave4/scripts.inc" gUnknown_0823B4BB:: @ 823B4BB lockall @@ -627,154 +627,154 @@ gText_23B73E:: @ 823B73E SecretBase_RedCave1_Text_23B759: @ 823B759 .string "Want to make your SECRET BASE here?$" - .include "data/scripts/maps/SingleBattleColosseum.inc" - .include "data/scripts/maps/TradeCenter.inc" - .include "data/scripts/maps/RecordCorner.inc" - .include "data/scripts/maps/DoubleBattleColosseum.inc" - .include "data/scripts/maps/LinkContestRoom1.inc" - .include "data/scripts/maps/LinkContestRoom2.inc" - .include "data/scripts/maps/LinkContestRoom3.inc" - .include "data/scripts/maps/LinkContestRoom4.inc" - .include "data/scripts/maps/LinkContestRoom5.inc" - .include "data/scripts/maps/LinkContestRoom6.inc" - .include "data/scripts/maps/UnknownMap_25_29.inc" - .include "data/scripts/maps/UnknownMap_25_30.inc" - .include "data/scripts/maps/UnknownMap_25_31.inc" - .include "data/scripts/maps/UnknownMap_25_32.inc" - .include "data/scripts/maps/UnknownMap_25_33.inc" - .include "data/scripts/maps/UnknownMap_25_34.inc" - .include "data/scripts/maps/InsideOfTruck.inc" - .include "data/scripts/maps/SSTidalCorridor.inc" - .include "data/scripts/maps/SSTidalLowerDeck.inc" - .include "data/scripts/maps/SSTidalRooms.inc" - .include "data/scripts/maps/BattlePyramidSquare01.inc" - .include "data/scripts/maps/BattlePyramidSquare02.inc" - .include "data/scripts/maps/BattlePyramidSquare03.inc" - .include "data/scripts/maps/BattlePyramidSquare04.inc" - .include "data/scripts/maps/BattlePyramidSquare05.inc" - .include "data/scripts/maps/BattlePyramidSquare06.inc" - .include "data/scripts/maps/BattlePyramidSquare07.inc" - .include "data/scripts/maps/BattlePyramidSquare08.inc" - .include "data/scripts/maps/BattlePyramidSquare09.inc" - .include "data/scripts/maps/BattlePyramidSquare10.inc" - .include "data/scripts/maps/BattlePyramidSquare11.inc" - .include "data/scripts/maps/BattlePyramidSquare12.inc" - .include "data/scripts/maps/BattlePyramidSquare13.inc" - .include "data/scripts/maps/BattlePyramidSquare14.inc" - .include "data/scripts/maps/BattlePyramidSquare15.inc" - .include "data/scripts/maps/BattlePyramidSquare16.inc" - .include "data/scripts/maps/UnionRoom.inc" - .include "data/scripts/maps/SafariZone_Northwest.inc" - .include "data/scripts/maps/SafariZone_North.inc" - .include "data/scripts/maps/SafariZone_Southwest.inc" - .include "data/scripts/maps/SafariZone_South.inc" - .include "data/scripts/maps/BattleFrontier_OutsideWest.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerElevator.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc" - .include "data/scripts/maps/SouthernIsland_Exterior.inc" - .include "data/scripts/maps/SouthernIsland_Interior.inc" - .include "data/scripts/maps/SafariZone_RestHouse.inc" - .include "data/scripts/maps/SafariZone_Northeast.inc" - .include "data/scripts/maps/SafariZone_Southeast.inc" - .include "data/scripts/maps/BattleFrontier_OutsideEast.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidTop.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc" - .include "data/scripts/maps/BattleFrontier_RankingHall.inc" - .include "data/scripts/maps/BattleFrontier_Lounge1.inc" - .include "data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc" - .include "data/scripts/maps/BattleFrontier_Lounge2.inc" - .include "data/scripts/maps/BattleFrontier_Lounge3.inc" - .include "data/scripts/maps/BattleFrontier_Lounge4.inc" - .include "data/scripts/maps/BattleFrontier_ScottsHouse.inc" - .include "data/scripts/maps/BattleFrontier_Lounge5.inc" - .include "data/scripts/maps/BattleFrontier_Lounge6.inc" - .include "data/scripts/maps/BattleFrontier_Lounge7.inc" - .include "data/scripts/maps/BattleFrontier_ReceptionGate.inc" - .include "data/scripts/maps/BattleFrontier_Lounge8.inc" - .include "data/scripts/maps/BattleFrontier_Lounge9.inc" - .include "data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc" - .include "data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc" - .include "data/scripts/maps/BattleFrontier_Mart.inc" - .include "data/scripts/maps/FarawayIsland_Entrance.inc" - .include "data/scripts/maps/FarawayIsland_Interior.inc" - .include "data/scripts/maps/BirthIsland_Exterior.inc" - .include "data/scripts/maps/BirthIsland_Harbor.inc" - .include "data/scripts/maps/TrainerHill_Entrance.inc" - .include "data/scripts/maps/TrainerHill_1F.inc" - .include "data/scripts/maps/TrainerHill_2F.inc" - .include "data/scripts/maps/TrainerHill_3F.inc" - .include "data/scripts/maps/TrainerHill_4F.inc" - .include "data/scripts/maps/TrainerHill_Roof.inc" - .include "data/scripts/maps/NavelRock_Exterior.inc" - .include "data/scripts/maps/NavelRock_Harbor.inc" - .include "data/scripts/maps/NavelRock_Entrance.inc" - .include "data/scripts/maps/NavelRock_B1F.inc" - .include "data/scripts/maps/NavelRock_Fork.inc" - .include "data/scripts/maps/NavelRock_Up1.inc" - .include "data/scripts/maps/NavelRock_Up2.inc" - .include "data/scripts/maps/NavelRock_Up3.inc" - .include "data/scripts/maps/NavelRock_Up4.inc" - .include "data/scripts/maps/NavelRock_Top.inc" - .include "data/scripts/maps/NavelRock_Down01.inc" - .include "data/scripts/maps/NavelRock_Down02.inc" - .include "data/scripts/maps/NavelRock_Down03.inc" - .include "data/scripts/maps/NavelRock_Down04.inc" - .include "data/scripts/maps/NavelRock_Down05.inc" - .include "data/scripts/maps/NavelRock_Down06.inc" - .include "data/scripts/maps/NavelRock_Down07.inc" - .include "data/scripts/maps/NavelRock_Down08.inc" - .include "data/scripts/maps/NavelRock_Down09.inc" - .include "data/scripts/maps/NavelRock_Down10.inc" - .include "data/scripts/maps/NavelRock_Down11.inc" - .include "data/scripts/maps/NavelRock_Bottom.inc" - .include "data/scripts/maps/TrainerHill_Elevator.inc" - .include "data/scripts/maps/Route104_Prototype.inc" - .include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/scripts/maps/Route109_SeashoreHouse.inc" - .include "data/scripts/maps/Route110_TrickHouseEntrance.inc" - .include "data/scripts/maps/Route110_TrickHouseEnd.inc" - .include "data/scripts/maps/Route110_TrickHouseCorridor.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle1.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle2.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle3.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle4.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle5.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle6.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle7.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle8.inc" - .include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc" - .include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc" - .include "data/scripts/maps/Route113_GlassWorkshop.inc" - .include "data/scripts/maps/Route123_BerryMastersHouse.inc" - .include "data/scripts/maps/Route119_WeatherInstitute_1F.inc" - .include "data/scripts/maps/Route119_WeatherInstitute_2F.inc" - .include "data/scripts/maps/Route119_House.inc" - .include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc" + .include "data/maps/SingleBattleColosseum/scripts.inc" + .include "data/maps/TradeCenter/scripts.inc" + .include "data/maps/RecordCorner/scripts.inc" + .include "data/maps/DoubleBattleColosseum/scripts.inc" + .include "data/maps/LinkContestRoom1/scripts.inc" + .include "data/maps/LinkContestRoom2/scripts.inc" + .include "data/maps/LinkContestRoom3/scripts.inc" + .include "data/maps/LinkContestRoom4/scripts.inc" + .include "data/maps/LinkContestRoom5/scripts.inc" + .include "data/maps/LinkContestRoom6/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/InsideOfTruck/scripts.inc" + .include "data/maps/SSTidalCorridor/scripts.inc" + .include "data/maps/SSTidalLowerDeck/scripts.inc" + .include "data/maps/SSTidalRooms/scripts.inc" + .include "data/maps/BattlePyramidSquare01/scripts.inc" + .include "data/maps/BattlePyramidSquare02/scripts.inc" + .include "data/maps/BattlePyramidSquare03/scripts.inc" + .include "data/maps/BattlePyramidSquare04/scripts.inc" + .include "data/maps/BattlePyramidSquare05/scripts.inc" + .include "data/maps/BattlePyramidSquare06/scripts.inc" + .include "data/maps/BattlePyramidSquare07/scripts.inc" + .include "data/maps/BattlePyramidSquare08/scripts.inc" + .include "data/maps/BattlePyramidSquare09/scripts.inc" + .include "data/maps/BattlePyramidSquare10/scripts.inc" + .include "data/maps/BattlePyramidSquare11/scripts.inc" + .include "data/maps/BattlePyramidSquare12/scripts.inc" + .include "data/maps/BattlePyramidSquare13/scripts.inc" + .include "data/maps/BattlePyramidSquare14/scripts.inc" + .include "data/maps/BattlePyramidSquare15/scripts.inc" + .include "data/maps/BattlePyramidSquare16/scripts.inc" + .include "data/maps/UnionRoom/scripts.inc" + .include "data/maps/SafariZone_Northwest/scripts.inc" + .include "data/maps/SafariZone_North/scripts.inc" + .include "data/maps/SafariZone_Southwest/scripts.inc" + .include "data/maps/SafariZone_South/scripts.inc" + .include "data/maps/BattleFrontier_OutsideWest/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerElevator/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc" + .include "data/maps/SouthernIsland_Exterior/scripts.inc" + .include "data/maps/SouthernIsland_Interior/scripts.inc" + .include "data/maps/SafariZone_RestHouse/scripts.inc" + .include "data/maps/SafariZone_Northeast/scripts.inc" + .include "data/maps/SafariZone_Southeast/scripts.inc" + .include "data/maps/BattleFrontier_OutsideEast/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc" + .include "data/maps/BattleFrontier_RankingHall/scripts.inc" + .include "data/maps/BattleFrontier_Lounge1/scripts.inc" + .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc" + .include "data/maps/BattleFrontier_Lounge2/scripts.inc" + .include "data/maps/BattleFrontier_Lounge3/scripts.inc" + .include "data/maps/BattleFrontier_Lounge4/scripts.inc" + .include "data/maps/BattleFrontier_ScottsHouse/scripts.inc" + .include "data/maps/BattleFrontier_Lounge5/scripts.inc" + .include "data/maps/BattleFrontier_Lounge6/scripts.inc" + .include "data/maps/BattleFrontier_Lounge7/scripts.inc" + .include "data/maps/BattleFrontier_ReceptionGate/scripts.inc" + .include "data/maps/BattleFrontier_Lounge8/scripts.inc" + .include "data/maps/BattleFrontier_Lounge9/scripts.inc" + .include "data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc" + .include "data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc" + .include "data/maps/BattleFrontier_Mart/scripts.inc" + .include "data/maps/FarawayIsland_Entrance/scripts.inc" + .include "data/maps/FarawayIsland_Interior/scripts.inc" + .include "data/maps/BirthIsland_Exterior/scripts.inc" + .include "data/maps/BirthIsland_Harbor/scripts.inc" + .include "data/maps/TrainerHill_Entrance/scripts.inc" + .include "data/maps/TrainerHill_1F/scripts.inc" + .include "data/maps/TrainerHill_2F/scripts.inc" + .include "data/maps/TrainerHill_3F/scripts.inc" + .include "data/maps/TrainerHill_4F/scripts.inc" + .include "data/maps/TrainerHill_Roof/scripts.inc" + .include "data/maps/NavelRock_Exterior/scripts.inc" + .include "data/maps/NavelRock_Harbor/scripts.inc" + .include "data/maps/NavelRock_Entrance/scripts.inc" + .include "data/maps/NavelRock_B1F/scripts.inc" + .include "data/maps/NavelRock_Fork/scripts.inc" + .include "data/maps/NavelRock_Up1/scripts.inc" + .include "data/maps/NavelRock_Up2/scripts.inc" + .include "data/maps/NavelRock_Up3/scripts.inc" + .include "data/maps/NavelRock_Up4/scripts.inc" + .include "data/maps/NavelRock_Top/scripts.inc" + .include "data/maps/NavelRock_Down01/scripts.inc" + .include "data/maps/NavelRock_Down02/scripts.inc" + .include "data/maps/NavelRock_Down03/scripts.inc" + .include "data/maps/NavelRock_Down04/scripts.inc" + .include "data/maps/NavelRock_Down05/scripts.inc" + .include "data/maps/NavelRock_Down06/scripts.inc" + .include "data/maps/NavelRock_Down07/scripts.inc" + .include "data/maps/NavelRock_Down08/scripts.inc" + .include "data/maps/NavelRock_Down09/scripts.inc" + .include "data/maps/NavelRock_Down10/scripts.inc" + .include "data/maps/NavelRock_Down11/scripts.inc" + .include "data/maps/NavelRock_Bottom/scripts.inc" + .include "data/maps/TrainerHill_Elevator/scripts.inc" + .include "data/maps/Route104_Prototype/scripts.inc" + .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc" + .include "data/maps/Route109_SeashoreHouse/scripts.inc" + .include "data/maps/Route110_TrickHouseEntrance/scripts.inc" + .include "data/maps/Route110_TrickHouseEnd/scripts.inc" + .include "data/maps/Route110_TrickHouseCorridor/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle1/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle2/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle3/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle4/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle5/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle6/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle7/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle8/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc" + .include "data/maps/Route113_GlassWorkshop/scripts.inc" + .include "data/maps/Route123_BerryMastersHouse/scripts.inc" + .include "data/maps/Route119_WeatherInstitute_1F/scripts.inc" + .include "data/maps/Route119_WeatherInstitute_2F/scripts.inc" + .include "data/maps/Route119_House/scripts.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc" Std_2: @ 8271315 lock diff --git a/data/map_events.s b/data/map_events.s index 31b4b00d23..aca9978e48 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -8,522 +8,522 @@ .section .rodata - .include "data/maps/events/PetalburgCity.inc" - .include "data/maps/events/SlateportCity.inc" - .include "data/maps/events/MauvilleCity.inc" - .include "data/maps/events/RustboroCity.inc" - .include "data/maps/events/FortreeCity.inc" - .include "data/maps/events/LilycoveCity.inc" - .include "data/maps/events/MossdeepCity.inc" - .include "data/maps/events/SootopolisCity.inc" - .include "data/maps/events/EverGrandeCity.inc" - .include "data/maps/events/LittlerootTown.inc" - .include "data/maps/events/OldaleTown.inc" - .include "data/maps/events/DewfordTown.inc" - .include "data/maps/events/LavaridgeTown.inc" - .include "data/maps/events/FallarborTown.inc" - .include "data/maps/events/VerdanturfTown.inc" - .include "data/maps/events/PacifidlogTown.inc" - .include "data/maps/events/Route101.inc" - .include "data/maps/events/Route102.inc" - .include "data/maps/events/Route103.inc" - .include "data/maps/events/Route104.inc" - .include "data/maps/events/Route105.inc" - .include "data/maps/events/Route106.inc" - .include "data/maps/events/Route107.inc" - .include "data/maps/events/Route108.inc" - .include "data/maps/events/Route109.inc" - .include "data/maps/events/Route110.inc" - .include "data/maps/events/Route111.inc" - .include "data/maps/events/Route112.inc" - .include "data/maps/events/Route113.inc" - .include "data/maps/events/Route114.inc" - .include "data/maps/events/Route115.inc" - .include "data/maps/events/Route116.inc" - .include "data/maps/events/Route117.inc" - .include "data/maps/events/Route118.inc" - .include "data/maps/events/Route119.inc" - .include "data/maps/events/Route120.inc" - .include "data/maps/events/Route121.inc" - .include "data/maps/events/Route122.inc" - .include "data/maps/events/Route123.inc" - .include "data/maps/events/Route124.inc" - .include "data/maps/events/Route125.inc" - .include "data/maps/events/Route126.inc" - .include "data/maps/events/Route127.inc" - .include "data/maps/events/Route128.inc" - .include "data/maps/events/Route129.inc" - .include "data/maps/events/Route130.inc" - .include "data/maps/events/Route131.inc" - .include "data/maps/events/Route132.inc" - .include "data/maps/events/Route133.inc" - .include "data/maps/events/Route134.inc" - .include "data/maps/events/Underwater1.inc" - .include "data/maps/events/Underwater2.inc" - .include "data/maps/events/Underwater3.inc" - .include "data/maps/events/Underwater4.inc" - .include "data/maps/events/Underwater5.inc" - .include "data/maps/events/Underwater6.inc" - .include "data/maps/events/Underwater7.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_1F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_2F.inc" - .include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/maps/events/OldaleTown_House1.inc" - .include "data/maps/events/OldaleTown_House2.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_1F.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_2F.inc" - .include "data/maps/events/OldaleTown_Mart.inc" - .include "data/maps/events/DewfordTown_House1.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_1F.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_2F.inc" - .include "data/maps/events/DewfordTown_Gym.inc" - .include "data/maps/events/DewfordTown_Hall.inc" - .include "data/maps/events/DewfordTown_House2.inc" - .include "data/maps/events/LavaridgeTown_HerbShop.inc" - .include "data/maps/events/LavaridgeTown_Gym_1F.inc" - .include "data/maps/events/LavaridgeTown_Gym_B1F.inc" - .include "data/maps/events/LavaridgeTown_House.inc" - .include "data/maps/events/LavaridgeTown_Mart.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_Mart.inc" - .include "data/maps/events/FallarborTown_BattleTentLobby.inc" - .include "data/maps/events/FallarborTown_BattleTentCorridor.inc" - .include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_1F.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_House1.inc" - .include "data/maps/events/FallarborTown_House2.inc" - .include "data/maps/events/VerdanturfTown_BattleTentLobby.inc" - .include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc" - .include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc" - .include "data/maps/events/VerdanturfTown_Mart.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/maps/events/VerdanturfTown_WandasHouse.inc" - .include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/maps/events/VerdanturfTown_House.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/maps/events/PacifidlogTown_House1.inc" - .include "data/maps/events/PacifidlogTown_House2.inc" - .include "data/maps/events/PacifidlogTown_House3.inc" - .include "data/maps/events/PacifidlogTown_House4.inc" - .include "data/maps/events/PacifidlogTown_House5.inc" - .include "data/maps/events/PetalburgCity_WallysHouse.inc" - .include "data/maps/events/PetalburgCity_Gym.inc" - .include "data/maps/events/PetalburgCity_House1.inc" - .include "data/maps/events/PetalburgCity_House2.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc" - .include "data/maps/events/PetalburgCity_Mart.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_1F.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_2F.inc" - .include "data/maps/events/SlateportCity_BattleTentLobby.inc" - .include "data/maps/events/SlateportCity_BattleTentCorridor.inc" - .include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc" - .include "data/maps/events/SlateportCity_House1.inc" - .include "data/maps/events/SlateportCity_PokemonFanClub.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc" - .include "data/maps/events/SlateportCity_Harbor.inc" - .include "data/maps/events/SlateportCity_House2.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_1F.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_2F.inc" - .include "data/maps/events/SlateportCity_Mart.inc" - .include "data/maps/events/MauvilleCity_Gym.inc" - .include "data/maps/events/MauvilleCity_BikeShop.inc" - .include "data/maps/events/MauvilleCity_House1.inc" - .include "data/maps/events/MauvilleCity_GameCorner.inc" - .include "data/maps/events/MauvilleCity_House2.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc" - .include "data/maps/events/MauvilleCity_Mart.inc" - .include "data/maps/events/RustboroCity_DevonCorp_1F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_2F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_3F.inc" - .include "data/maps/events/RustboroCity_Gym.inc" - .include "data/maps/events/RustboroCity_PokemonSchool.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_1F.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_2F.inc" - .include "data/maps/events/RustboroCity_Mart.inc" - .include "data/maps/events/RustboroCity_Flat1_1F.inc" - .include "data/maps/events/RustboroCity_Flat1_2F.inc" - .include "data/maps/events/RustboroCity_House1.inc" - .include "data/maps/events/RustboroCity_CuttersHouse.inc" - .include "data/maps/events/RustboroCity_House2.inc" - .include "data/maps/events/RustboroCity_Flat2_1F.inc" - .include "data/maps/events/RustboroCity_Flat2_2F.inc" - .include "data/maps/events/RustboroCity_Flat2_3F.inc" - .include "data/maps/events/RustboroCity_House3.inc" - .include "data/maps/events/FortreeCity_House1.inc" - .include "data/maps/events/FortreeCity_Gym.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_1F.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_2F.inc" - .include "data/maps/events/FortreeCity_Mart.inc" - .include "data/maps/events/FortreeCity_House2.inc" - .include "data/maps/events/FortreeCity_House3.inc" - .include "data/maps/events/FortreeCity_House4.inc" - .include "data/maps/events/FortreeCity_House5.inc" - .include "data/maps/events/FortreeCity_DecorationShop.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/maps/events/LilycoveCity_ContestLobby.inc" - .include "data/maps/events/LilycoveCity_ContestHall.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc" - .include "data/maps/events/LilycoveCity_UnusedMart.inc" - .include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/maps/events/LilycoveCity_Harbor.inc" - .include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc" - .include "data/maps/events/LilycoveCity_House1.inc" - .include "data/maps/events/LilycoveCity_House2.inc" - .include "data/maps/events/LilycoveCity_House3.inc" - .include "data/maps/events/LilycoveCity_House4.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/maps/events/MossdeepCity_Gym.inc" - .include "data/maps/events/MossdeepCity_House1.inc" - .include "data/maps/events/MossdeepCity_House2.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc" - .include "data/maps/events/MossdeepCity_Mart.inc" - .include "data/maps/events/MossdeepCity_House3.inc" - .include "data/maps/events/MossdeepCity_StevensHouse.inc" - .include "data/maps/events/MossdeepCity_House4.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_1F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_B1F.inc" - .include "data/maps/events/SootopolisCity_Gym_1F.inc" - .include "data/maps/events/SootopolisCity_Gym_B1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc" - .include "data/maps/events/SootopolisCity_Mart.inc" - .include "data/maps/events/SootopolisCity_House1.inc" - .include "data/maps/events/SootopolisCity_House2.inc" - .include "data/maps/events/SootopolisCity_House3.inc" - .include "data/maps/events/SootopolisCity_House4.inc" - .include "data/maps/events/SootopolisCity_House5.inc" - .include "data/maps/events/SootopolisCity_House6.inc" - .include "data/maps/events/SootopolisCity_House7.inc" - .include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc" - .include "data/maps/events/EverGrandeCity_SidneysRoom.inc" - .include "data/maps/events/EverGrandeCity_PhoebesRoom.inc" - .include "data/maps/events/EverGrandeCity_GlaciasRoom.inc" - .include "data/maps/events/EverGrandeCity_DrakesRoom.inc" - .include "data/maps/events/EverGrandeCity_ChampionsRoom.inc" - .include "data/maps/events/EverGrandeCity_Hall1.inc" - .include "data/maps/events/EverGrandeCity_Hall2.inc" - .include "data/maps/events/EverGrandeCity_Hall3.inc" - .include "data/maps/events/EverGrandeCity_Hall4.inc" - .include "data/maps/events/EverGrandeCity_Hall5.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc" - .include "data/maps/events/EverGrandeCity_HallOfFame.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc" - .include "data/maps/events/Route104_MrBrineysHouse.inc" - .include "data/maps/events/Route104_PrettyPetalFlowerShop.inc" - .include "data/maps/events/Route111_WinstrateFamilysHouse.inc" - .include "data/maps/events/Route111_OldLadysRestStop.inc" - .include "data/maps/events/Route112_CableCarStation.inc" - .include "data/maps/events/MtChimney_CableCarStation.inc" - .include "data/maps/events/Route114_FossilManiacsHouse.inc" - .include "data/maps/events/Route114_FossilManiacsTunnel.inc" - .include "data/maps/events/Route114_LanettesHouse.inc" - .include "data/maps/events/Route116_TunnelersRestHouse.inc" - .include "data/maps/events/Route117_PokemonDayCare.inc" - .include "data/maps/events/Route121_SafariZoneEntrance.inc" - .include "data/maps/events/MeteorFalls_1F_1R.inc" - .include "data/maps/events/MeteorFalls_1F_2R.inc" - .include "data/maps/events/MeteorFalls_B1F_1R.inc" - .include "data/maps/events/MeteorFalls_B1F_2R.inc" - .include "data/maps/events/RusturfTunnel.inc" - .include "data/maps/events/Underwater_SootopolisCity.inc" - .include "data/maps/events/DesertRuins.inc" - .include "data/maps/events/GraniteCave_1F.inc" - .include "data/maps/events/GraniteCave_B1F.inc" - .include "data/maps/events/GraniteCave_B2F.inc" - .include "data/maps/events/GraniteCave_StevensRoom.inc" - .include "data/maps/events/PetalburgWoods.inc" - .include "data/maps/events/MtChimney.inc" - .include "data/maps/events/JaggedPass.inc" - .include "data/maps/events/FieryPath.inc" - .include "data/maps/events/MtPyre_1F.inc" - .include "data/maps/events/MtPyre_2F.inc" - .include "data/maps/events/MtPyre_3F.inc" - .include "data/maps/events/MtPyre_4F.inc" - .include "data/maps/events/MtPyre_5F.inc" - .include "data/maps/events/MtPyre_6F.inc" - .include "data/maps/events/MtPyre_Exterior.inc" - .include "data/maps/events/MtPyre_Summit.inc" - .include "data/maps/events/AquaHideout_1F.inc" - .include "data/maps/events/AquaHideout_B1F.inc" - .include "data/maps/events/AquaHideout_B2F.inc" - .include "data/maps/events/Underwater_SeafloorCavern.inc" - .include "data/maps/events/SeafloorCavern_Entrance.inc" - .include "data/maps/events/SeafloorCavern_Room1.inc" - .include "data/maps/events/SeafloorCavern_Room2.inc" - .include "data/maps/events/SeafloorCavern_Room3.inc" - .include "data/maps/events/SeafloorCavern_Room4.inc" - .include "data/maps/events/SeafloorCavern_Room5.inc" - .include "data/maps/events/SeafloorCavern_Room6.inc" - .include "data/maps/events/SeafloorCavern_Room7.inc" - .include "data/maps/events/SeafloorCavern_Room8.inc" - .include "data/maps/events/SeafloorCavern_Room9.inc" - .include "data/maps/events/CaveOfOrigin_Entrance.inc" - .include "data/maps/events/CaveOfOrigin_1F.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc" - .include "data/maps/events/CaveOfOrigin_B1F.inc" - .include "data/maps/events/VictoryRoad_1F.inc" - .include "data/maps/events/VictoryRoad_B1F.inc" - .include "data/maps/events/VictoryRoad_B2F.inc" - .include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_LowTideInnerRoom.inc" - .include "data/maps/events/ShoalCave_LowTideStairsRoom.inc" - .include "data/maps/events/ShoalCave_LowTideLowerRoom.inc" - .include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_HighTideInnerRoom.inc" - .include "data/maps/events/NewMauville_Entrance.inc" - .include "data/maps/events/NewMauville_Inside.inc" - .include "data/maps/events/AbandonedShip_Deck.inc" - .include "data/maps/events/AbandonedShip_Corridors_1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_1F.inc" - .include "data/maps/events/AbandonedShip_Corridors_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_B1F.inc" - .include "data/maps/events/AbandonedShip_Underwater1.inc" - .include "data/maps/events/AbandonedShip_Room_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_1F.inc" - .include "data/maps/events/AbandonedShip_CaptainsOffice.inc" - .include "data/maps/events/AbandonedShip_Underwater2.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc" - .include "data/maps/events/IslandCave.inc" - .include "data/maps/events/AncientTomb.inc" - .include "data/maps/events/Underwater_Route134.inc" - .include "data/maps/events/Underwater_SealedChamber.inc" - .include "data/maps/events/SealedChamber_OuterRoom.inc" - .include "data/maps/events/SealedChamber_InnerRoom.inc" - .include "data/maps/events/ScorchedSlab.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap1.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap2.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap3.inc" - .include "data/maps/events/SkyPillar_Entrance.inc" - .include "data/maps/events/SkyPillar_Outside.inc" - .include "data/maps/events/SkyPillar_1F.inc" - .include "data/maps/events/SkyPillar_2F.inc" - .include "data/maps/events/SkyPillar_3F.inc" - .include "data/maps/events/SkyPillar_4F.inc" - .include "data/maps/events/ShoalCave_LowTideIceRoom.inc" - .include "data/maps/events/SkyPillar_5F.inc" - .include "data/maps/events/SkyPillar_Top.inc" - .include "data/maps/events/MagmaHideout_1F.inc" - .include "data/maps/events/MagmaHideout_2F_1R.inc" - .include "data/maps/events/MagmaHideout_2F_2R.inc" - .include "data/maps/events/MagmaHideout_3F_1R.inc" - .include "data/maps/events/MagmaHideout_3F_2R.inc" - .include "data/maps/events/MagmaHideout_4F.inc" - .include "data/maps/events/MagmaHideout_3F_3R.inc" - .include "data/maps/events/MagmaHideout_2F_3R.inc" - .include "data/maps/events/MirageTower_1F.inc" - .include "data/maps/events/MirageTower_2F.inc" - .include "data/maps/events/MirageTower_3F.inc" - .include "data/maps/events/MirageTower_4F.inc" - .include "data/maps/events/DesertUnderpass.inc" - .include "data/maps/events/ArtisanCave_B1F.inc" - .include "data/maps/events/ArtisanCave_1F.inc" - .include "data/maps/events/Underwater_MarineCave.inc" - .include "data/maps/events/MarineCave_Entrance.inc" - .include "data/maps/events/MarineCave_End.inc" - .include "data/maps/events/TerraCave_Entrance.inc" - .include "data/maps/events/TerraCave_End.inc" - .include "data/maps/events/AlteringCave.inc" - .include "data/maps/events/MeteorFalls_StevensCave.inc" - .include "data/maps/events/SecretBase_RedCave1.inc" - .include "data/maps/events/SecretBase_BrownCave1.inc" - .include "data/maps/events/SecretBase_BlueCave1.inc" - .include "data/maps/events/SecretBase_YellowCave1.inc" - .include "data/maps/events/SecretBase_Tree1.inc" - .include "data/maps/events/SecretBase_Shrub1.inc" - .include "data/maps/events/SecretBase_RedCave2.inc" - .include "data/maps/events/SecretBase_BrownCave2.inc" - .include "data/maps/events/SecretBase_BlueCave2.inc" - .include "data/maps/events/SecretBase_YellowCave2.inc" - .include "data/maps/events/SecretBase_Tree2.inc" - .include "data/maps/events/SecretBase_Shrub2.inc" - .include "data/maps/events/SecretBase_RedCave3.inc" - .include "data/maps/events/SecretBase_BrownCave3.inc" - .include "data/maps/events/SecretBase_BlueCave3.inc" - .include "data/maps/events/SecretBase_YellowCave3.inc" - .include "data/maps/events/SecretBase_Tree3.inc" - .include "data/maps/events/SecretBase_Shrub3.inc" - .include "data/maps/events/SecretBase_RedCave4.inc" - .include "data/maps/events/SecretBase_BrownCave4.inc" - .include "data/maps/events/SecretBase_BlueCave4.inc" - .include "data/maps/events/SecretBase_YellowCave4.inc" - .include "data/maps/events/SecretBase_Tree4.inc" - .include "data/maps/events/SecretBase_Shrub4.inc" - .include "data/maps/events/SingleBattleColosseum.inc" - .include "data/maps/events/TradeCenter.inc" - .include "data/maps/events/RecordCorner.inc" - .include "data/maps/events/DoubleBattleColosseum.inc" - .include "data/maps/events/LinkContestRoom1.inc" - .include "data/maps/events/LinkContestRoom2.inc" - .include "data/maps/events/LinkContestRoom3.inc" - .include "data/maps/events/LinkContestRoom4.inc" - .include "data/maps/events/LinkContestRoom5.inc" - .include "data/maps/events/LinkContestRoom6.inc" - .include "data/maps/events/UnknownMap_25_29.inc" - .include "data/maps/events/UnknownMap_25_30.inc" - .include "data/maps/events/UnknownMap_25_31.inc" - .include "data/maps/events/UnknownMap_25_32.inc" - .include "data/maps/events/UnknownMap_25_33.inc" - .include "data/maps/events/UnknownMap_25_34.inc" - .include "data/maps/events/InsideOfTruck.inc" - .include "data/maps/events/SSTidalCorridor.inc" - .include "data/maps/events/SSTidalLowerDeck.inc" - .include "data/maps/events/SSTidalRooms.inc" - .include "data/maps/events/BattlePyramidSquare01.inc" - .include "data/maps/events/BattlePyramidSquare02.inc" - .include "data/maps/events/BattlePyramidSquare03.inc" - .include "data/maps/events/BattlePyramidSquare04.inc" - .include "data/maps/events/BattlePyramidSquare05.inc" - .include "data/maps/events/BattlePyramidSquare06.inc" - .include "data/maps/events/BattlePyramidSquare07.inc" - .include "data/maps/events/BattlePyramidSquare08.inc" - .include "data/maps/events/BattlePyramidSquare09.inc" - .include "data/maps/events/BattlePyramidSquare10.inc" - .include "data/maps/events/BattlePyramidSquare11.inc" - .include "data/maps/events/BattlePyramidSquare12.inc" - .include "data/maps/events/BattlePyramidSquare13.inc" - .include "data/maps/events/BattlePyramidSquare14.inc" - .include "data/maps/events/BattlePyramidSquare15.inc" - .include "data/maps/events/BattlePyramidSquare16.inc" - .include "data/maps/events/UnionRoom.inc" - .include "data/maps/events/SafariZone_Northwest.inc" - .include "data/maps/events/SafariZone_North.inc" - .include "data/maps/events/SafariZone_Southwest.inc" - .include "data/maps/events/SafariZone_South.inc" - .include "data/maps/events/BattleFrontier_OutsideWest.inc" - .include "data/maps/events/BattleFrontier_BattleTowerLobby.inc" - .include "data/maps/events/BattleFrontier_BattleTowerElevator.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc" - .include "data/maps/events/SouthernIsland_Exterior.inc" - .include "data/maps/events/SouthernIsland_Interior.inc" - .include "data/maps/events/SafariZone_RestHouse.inc" - .include "data/maps/events/SafariZone_Northeast.inc" - .include "data/maps/events/SafariZone_Southeast.inc" - .include "data/maps/events/BattleFrontier_OutsideEast.inc" - .include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc" - .include "data/maps/events/BattleFrontier_BattleDomeLobby.inc" - .include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidTop.inc" - .include "data/maps/events/BattleFrontier_BattleArenaLobby.inc" - .include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc" - .include "data/maps/events/BattleFrontier_RankingHall.inc" - .include "data/maps/events/BattleFrontier_Lounge1.inc" - .include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc" - .include "data/maps/events/BattleFrontier_Lounge2.inc" - .include "data/maps/events/BattleFrontier_Lounge3.inc" - .include "data/maps/events/BattleFrontier_Lounge4.inc" - .include "data/maps/events/BattleFrontier_ScottsHouse.inc" - .include "data/maps/events/BattleFrontier_Lounge5.inc" - .include "data/maps/events/BattleFrontier_Lounge6.inc" - .include "data/maps/events/BattleFrontier_Lounge7.inc" - .include "data/maps/events/BattleFrontier_ReceptionGate.inc" - .include "data/maps/events/BattleFrontier_Lounge8.inc" - .include "data/maps/events/BattleFrontier_Lounge9.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc" - .include "data/maps/events/BattleFrontier_Mart.inc" - .include "data/maps/events/FarawayIsland_Entrance.inc" - .include "data/maps/events/FarawayIsland_Interior.inc" - .include "data/maps/events/BirthIsland_Exterior.inc" - .include "data/maps/events/BirthIsland_Harbor.inc" - .include "data/maps/events/TrainerHill_Entrance.inc" - .include "data/maps/events/TrainerHill_1F.inc" - .include "data/maps/events/TrainerHill_2F.inc" - .include "data/maps/events/TrainerHill_3F.inc" - .include "data/maps/events/TrainerHill_4F.inc" - .include "data/maps/events/TrainerHill_Roof.inc" - .include "data/maps/events/NavelRock_Exterior.inc" - .include "data/maps/events/NavelRock_Harbor.inc" - .include "data/maps/events/NavelRock_Entrance.inc" - .include "data/maps/events/NavelRock_B1F.inc" - .include "data/maps/events/NavelRock_Fork.inc" - .include "data/maps/events/NavelRock_Up1.inc" - .include "data/maps/events/NavelRock_Up2.inc" - .include "data/maps/events/NavelRock_Up3.inc" - .include "data/maps/events/NavelRock_Up4.inc" - .include "data/maps/events/NavelRock_Top.inc" - .include "data/maps/events/NavelRock_Down01.inc" - .include "data/maps/events/NavelRock_Down02.inc" - .include "data/maps/events/NavelRock_Down03.inc" - .include "data/maps/events/NavelRock_Down04.inc" - .include "data/maps/events/NavelRock_Down05.inc" - .include "data/maps/events/NavelRock_Down06.inc" - .include "data/maps/events/NavelRock_Down07.inc" - .include "data/maps/events/NavelRock_Down08.inc" - .include "data/maps/events/NavelRock_Down09.inc" - .include "data/maps/events/NavelRock_Down10.inc" - .include "data/maps/events/NavelRock_Down11.inc" - .include "data/maps/events/NavelRock_Bottom.inc" - .include "data/maps/events/TrainerHill_Elevator.inc" - .include "data/maps/events/Route104_Prototype.inc" - .include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/maps/events/Route109_SeashoreHouse.inc" - .include "data/maps/events/Route110_TrickHouseEntrance.inc" - .include "data/maps/events/Route110_TrickHouseEnd.inc" - .include "data/maps/events/Route110_TrickHouseCorridor.inc" - .include "data/maps/events/Route110_TrickHousePuzzle1.inc" - .include "data/maps/events/Route110_TrickHousePuzzle2.inc" - .include "data/maps/events/Route110_TrickHousePuzzle3.inc" - .include "data/maps/events/Route110_TrickHousePuzzle4.inc" - .include "data/maps/events/Route110_TrickHousePuzzle5.inc" - .include "data/maps/events/Route110_TrickHousePuzzle6.inc" - .include "data/maps/events/Route110_TrickHousePuzzle7.inc" - .include "data/maps/events/Route110_TrickHousePuzzle8.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc" - .include "data/maps/events/Route113_GlassWorkshop.inc" - .include "data/maps/events/Route123_BerryMastersHouse.inc" - .include "data/maps/events/Route119_WeatherInstitute_1F.inc" - .include "data/maps/events/Route119_WeatherInstitute_2F.inc" - .include "data/maps/events/Route119_House.inc" - .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" + .include "data/maps/PetalburgCity/events.inc" + .include "data/maps/SlateportCity/events.inc" + .include "data/maps/MauvilleCity/events.inc" + .include "data/maps/RustboroCity/events.inc" + .include "data/maps/FortreeCity/events.inc" + .include "data/maps/LilycoveCity/events.inc" + .include "data/maps/MossdeepCity/events.inc" + .include "data/maps/SootopolisCity/events.inc" + .include "data/maps/EverGrandeCity/events.inc" + .include "data/maps/LittlerootTown/events.inc" + .include "data/maps/OldaleTown/events.inc" + .include "data/maps/DewfordTown/events.inc" + .include "data/maps/LavaridgeTown/events.inc" + .include "data/maps/FallarborTown/events.inc" + .include "data/maps/VerdanturfTown/events.inc" + .include "data/maps/PacifidlogTown/events.inc" + .include "data/maps/Route101/events.inc" + .include "data/maps/Route102/events.inc" + .include "data/maps/Route103/events.inc" + .include "data/maps/Route104/events.inc" + .include "data/maps/Route105/events.inc" + .include "data/maps/Route106/events.inc" + .include "data/maps/Route107/events.inc" + .include "data/maps/Route108/events.inc" + .include "data/maps/Route109/events.inc" + .include "data/maps/Route110/events.inc" + .include "data/maps/Route111/events.inc" + .include "data/maps/Route112/events.inc" + .include "data/maps/Route113/events.inc" + .include "data/maps/Route114/events.inc" + .include "data/maps/Route115/events.inc" + .include "data/maps/Route116/events.inc" + .include "data/maps/Route117/events.inc" + .include "data/maps/Route118/events.inc" + .include "data/maps/Route119/events.inc" + .include "data/maps/Route120/events.inc" + .include "data/maps/Route121/events.inc" + .include "data/maps/Route122/events.inc" + .include "data/maps/Route123/events.inc" + .include "data/maps/Route124/events.inc" + .include "data/maps/Route125/events.inc" + .include "data/maps/Route126/events.inc" + .include "data/maps/Route127/events.inc" + .include "data/maps/Route128/events.inc" + .include "data/maps/Route129/events.inc" + .include "data/maps/Route130/events.inc" + .include "data/maps/Route131/events.inc" + .include "data/maps/Route132/events.inc" + .include "data/maps/Route133/events.inc" + .include "data/maps/Route134/events.inc" + .include "data/maps/Underwater1/events.inc" + .include "data/maps/Underwater2/events.inc" + .include "data/maps/Underwater3/events.inc" + .include "data/maps/Underwater4/events.inc" + .include "data/maps/Underwater5/events.inc" + .include "data/maps/Underwater6/events.inc" + .include "data/maps/Underwater7/events.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc" + .include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc" + .include "data/maps/LittlerootTown_MaysHouse_1F/events.inc" + .include "data/maps/LittlerootTown_MaysHouse_2F/events.inc" + .include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc" + .include "data/maps/OldaleTown_House1/events.inc" + .include "data/maps/OldaleTown_House2/events.inc" + .include "data/maps/OldaleTown_PokemonCenter_1F/events.inc" + .include "data/maps/OldaleTown_PokemonCenter_2F/events.inc" + .include "data/maps/OldaleTown_Mart/events.inc" + .include "data/maps/DewfordTown_House1/events.inc" + .include "data/maps/DewfordTown_PokemonCenter_1F/events.inc" + .include "data/maps/DewfordTown_PokemonCenter_2F/events.inc" + .include "data/maps/DewfordTown_Gym/events.inc" + .include "data/maps/DewfordTown_Hall/events.inc" + .include "data/maps/DewfordTown_House2/events.inc" + .include "data/maps/LavaridgeTown_HerbShop/events.inc" + .include "data/maps/LavaridgeTown_Gym_1F/events.inc" + .include "data/maps/LavaridgeTown_Gym_B1F/events.inc" + .include "data/maps/LavaridgeTown_House/events.inc" + .include "data/maps/LavaridgeTown_Mart/events.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc" + .include "data/maps/FallarborTown_Mart/events.inc" + .include "data/maps/FallarborTown_BattleTentLobby/events.inc" + .include "data/maps/FallarborTown_BattleTentCorridor/events.inc" + .include "data/maps/FallarborTown_BattleTentBattleRoom/events.inc" + .include "data/maps/FallarborTown_PokemonCenter_1F/events.inc" + .include "data/maps/FallarborTown_PokemonCenter_2F/events.inc" + .include "data/maps/FallarborTown_House1/events.inc" + .include "data/maps/FallarborTown_House2/events.inc" + .include "data/maps/VerdanturfTown_BattleTentLobby/events.inc" + .include "data/maps/VerdanturfTown_BattleTentCorridor/events.inc" + .include "data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc" + .include "data/maps/VerdanturfTown_Mart/events.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc" + .include "data/maps/VerdanturfTown_WandasHouse/events.inc" + .include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc" + .include "data/maps/VerdanturfTown_House/events.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc" + .include "data/maps/PacifidlogTown_House1/events.inc" + .include "data/maps/PacifidlogTown_House2/events.inc" + .include "data/maps/PacifidlogTown_House3/events.inc" + .include "data/maps/PacifidlogTown_House4/events.inc" + .include "data/maps/PacifidlogTown_House5/events.inc" + .include "data/maps/PetalburgCity_WallysHouse/events.inc" + .include "data/maps/PetalburgCity_Gym/events.inc" + .include "data/maps/PetalburgCity_House1/events.inc" + .include "data/maps/PetalburgCity_House2/events.inc" + .include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc" + .include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc" + .include "data/maps/PetalburgCity_Mart/events.inc" + .include "data/maps/SlateportCity_SternsShipyard_1F/events.inc" + .include "data/maps/SlateportCity_SternsShipyard_2F/events.inc" + .include "data/maps/SlateportCity_BattleTentLobby/events.inc" + .include "data/maps/SlateportCity_BattleTentCorridor/events.inc" + .include "data/maps/SlateportCity_BattleTentBattleRoom/events.inc" + .include "data/maps/SlateportCity_House1/events.inc" + .include "data/maps/SlateportCity_PokemonFanClub/events.inc" + .include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc" + .include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc" + .include "data/maps/SlateportCity_Harbor/events.inc" + .include "data/maps/SlateportCity_House2/events.inc" + .include "data/maps/SlateportCity_PokemonCenter_1F/events.inc" + .include "data/maps/SlateportCity_PokemonCenter_2F/events.inc" + .include "data/maps/SlateportCity_Mart/events.inc" + .include "data/maps/MauvilleCity_Gym/events.inc" + .include "data/maps/MauvilleCity_BikeShop/events.inc" + .include "data/maps/MauvilleCity_House1/events.inc" + .include "data/maps/MauvilleCity_GameCorner/events.inc" + .include "data/maps/MauvilleCity_House2/events.inc" + .include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc" + .include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc" + .include "data/maps/MauvilleCity_Mart/events.inc" + .include "data/maps/RustboroCity_DevonCorp_1F/events.inc" + .include "data/maps/RustboroCity_DevonCorp_2F/events.inc" + .include "data/maps/RustboroCity_DevonCorp_3F/events.inc" + .include "data/maps/RustboroCity_Gym/events.inc" + .include "data/maps/RustboroCity_PokemonSchool/events.inc" + .include "data/maps/RustboroCity_PokemonCenter_1F/events.inc" + .include "data/maps/RustboroCity_PokemonCenter_2F/events.inc" + .include "data/maps/RustboroCity_Mart/events.inc" + .include "data/maps/RustboroCity_Flat1_1F/events.inc" + .include "data/maps/RustboroCity_Flat1_2F/events.inc" + .include "data/maps/RustboroCity_House1/events.inc" + .include "data/maps/RustboroCity_CuttersHouse/events.inc" + .include "data/maps/RustboroCity_House2/events.inc" + .include "data/maps/RustboroCity_Flat2_1F/events.inc" + .include "data/maps/RustboroCity_Flat2_2F/events.inc" + .include "data/maps/RustboroCity_Flat2_3F/events.inc" + .include "data/maps/RustboroCity_House3/events.inc" + .include "data/maps/FortreeCity_House1/events.inc" + .include "data/maps/FortreeCity_Gym/events.inc" + .include "data/maps/FortreeCity_PokemonCenter_1F/events.inc" + .include "data/maps/FortreeCity_PokemonCenter_2F/events.inc" + .include "data/maps/FortreeCity_Mart/events.inc" + .include "data/maps/FortreeCity_House2/events.inc" + .include "data/maps/FortreeCity_House3/events.inc" + .include "data/maps/FortreeCity_House4/events.inc" + .include "data/maps/FortreeCity_House5/events.inc" + .include "data/maps/FortreeCity_DecorationShop/events.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc" + .include "data/maps/LilycoveCity_ContestLobby/events.inc" + .include "data/maps/LilycoveCity_ContestHall/events.inc" + .include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc" + .include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc" + .include "data/maps/LilycoveCity_UnusedMart/events.inc" + .include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc" + .include "data/maps/LilycoveCity_Harbor/events.inc" + .include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc" + .include "data/maps/LilycoveCity_House1/events.inc" + .include "data/maps/LilycoveCity_House2/events.inc" + .include "data/maps/LilycoveCity_House3/events.inc" + .include "data/maps/LilycoveCity_House4/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc" + .include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc" + .include "data/maps/MossdeepCity_Gym/events.inc" + .include "data/maps/MossdeepCity_House1/events.inc" + .include "data/maps/MossdeepCity_House2/events.inc" + .include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc" + .include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc" + .include "data/maps/MossdeepCity_Mart/events.inc" + .include "data/maps/MossdeepCity_House3/events.inc" + .include "data/maps/MossdeepCity_StevensHouse/events.inc" + .include "data/maps/MossdeepCity_House4/events.inc" + .include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc" + .include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc" + .include "data/maps/MossdeepCity_GameCorner_1F/events.inc" + .include "data/maps/MossdeepCity_GameCorner_B1F/events.inc" + .include "data/maps/SootopolisCity_Gym_1F/events.inc" + .include "data/maps/SootopolisCity_Gym_B1F/events.inc" + .include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc" + .include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc" + .include "data/maps/SootopolisCity_Mart/events.inc" + .include "data/maps/SootopolisCity_House1/events.inc" + .include "data/maps/SootopolisCity_House2/events.inc" + .include "data/maps/SootopolisCity_House3/events.inc" + .include "data/maps/SootopolisCity_House4/events.inc" + .include "data/maps/SootopolisCity_House5/events.inc" + .include "data/maps/SootopolisCity_House6/events.inc" + .include "data/maps/SootopolisCity_House7/events.inc" + .include "data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc" + .include "data/maps/EverGrandeCity_SidneysRoom/events.inc" + .include "data/maps/EverGrandeCity_PhoebesRoom/events.inc" + .include "data/maps/EverGrandeCity_GlaciasRoom/events.inc" + .include "data/maps/EverGrandeCity_DrakesRoom/events.inc" + .include "data/maps/EverGrandeCity_ChampionsRoom/events.inc" + .include "data/maps/EverGrandeCity_Hall1/events.inc" + .include "data/maps/EverGrandeCity_Hall2/events.inc" + .include "data/maps/EverGrandeCity_Hall3/events.inc" + .include "data/maps/EverGrandeCity_Hall4/events.inc" + .include "data/maps/EverGrandeCity_Hall5/events.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_1F/events.inc" + .include "data/maps/EverGrandeCity_HallOfFame/events.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_2F/events.inc" + .include "data/maps/Route104_MrBrineysHouse/events.inc" + .include "data/maps/Route104_PrettyPetalFlowerShop/events.inc" + .include "data/maps/Route111_WinstrateFamilysHouse/events.inc" + .include "data/maps/Route111_OldLadysRestStop/events.inc" + .include "data/maps/Route112_CableCarStation/events.inc" + .include "data/maps/MtChimney_CableCarStation/events.inc" + .include "data/maps/Route114_FossilManiacsHouse/events.inc" + .include "data/maps/Route114_FossilManiacsTunnel/events.inc" + .include "data/maps/Route114_LanettesHouse/events.inc" + .include "data/maps/Route116_TunnelersRestHouse/events.inc" + .include "data/maps/Route117_PokemonDayCare/events.inc" + .include "data/maps/Route121_SafariZoneEntrance/events.inc" + .include "data/maps/MeteorFalls_1F_1R/events.inc" + .include "data/maps/MeteorFalls_1F_2R/events.inc" + .include "data/maps/MeteorFalls_B1F_1R/events.inc" + .include "data/maps/MeteorFalls_B1F_2R/events.inc" + .include "data/maps/RusturfTunnel/events.inc" + .include "data/maps/Underwater_SootopolisCity/events.inc" + .include "data/maps/DesertRuins/events.inc" + .include "data/maps/GraniteCave_1F/events.inc" + .include "data/maps/GraniteCave_B1F/events.inc" + .include "data/maps/GraniteCave_B2F/events.inc" + .include "data/maps/GraniteCave_StevensRoom/events.inc" + .include "data/maps/PetalburgWoods/events.inc" + .include "data/maps/MtChimney/events.inc" + .include "data/maps/JaggedPass/events.inc" + .include "data/maps/FieryPath/events.inc" + .include "data/maps/MtPyre_1F/events.inc" + .include "data/maps/MtPyre_2F/events.inc" + .include "data/maps/MtPyre_3F/events.inc" + .include "data/maps/MtPyre_4F/events.inc" + .include "data/maps/MtPyre_5F/events.inc" + .include "data/maps/MtPyre_6F/events.inc" + .include "data/maps/MtPyre_Exterior/events.inc" + .include "data/maps/MtPyre_Summit/events.inc" + .include "data/maps/AquaHideout_1F/events.inc" + .include "data/maps/AquaHideout_B1F/events.inc" + .include "data/maps/AquaHideout_B2F/events.inc" + .include "data/maps/Underwater_SeafloorCavern/events.inc" + .include "data/maps/SeafloorCavern_Entrance/events.inc" + .include "data/maps/SeafloorCavern_Room1/events.inc" + .include "data/maps/SeafloorCavern_Room2/events.inc" + .include "data/maps/SeafloorCavern_Room3/events.inc" + .include "data/maps/SeafloorCavern_Room4/events.inc" + .include "data/maps/SeafloorCavern_Room5/events.inc" + .include "data/maps/SeafloorCavern_Room6/events.inc" + .include "data/maps/SeafloorCavern_Room7/events.inc" + .include "data/maps/SeafloorCavern_Room8/events.inc" + .include "data/maps/SeafloorCavern_Room9/events.inc" + .include "data/maps/CaveOfOrigin_Entrance/events.inc" + .include "data/maps/CaveOfOrigin_1F/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc" + .include "data/maps/CaveOfOrigin_B1F/events.inc" + .include "data/maps/VictoryRoad_1F/events.inc" + .include "data/maps/VictoryRoad_B1F/events.inc" + .include "data/maps/VictoryRoad_B2F/events.inc" + .include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc" + .include "data/maps/ShoalCave_LowTideInnerRoom/events.inc" + .include "data/maps/ShoalCave_LowTideStairsRoom/events.inc" + .include "data/maps/ShoalCave_LowTideLowerRoom/events.inc" + .include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc" + .include "data/maps/ShoalCave_HighTideInnerRoom/events.inc" + .include "data/maps/NewMauville_Entrance/events.inc" + .include "data/maps/NewMauville_Inside/events.inc" + .include "data/maps/AbandonedShip_Deck/events.inc" + .include "data/maps/AbandonedShip_Corridors_1F/events.inc" + .include "data/maps/AbandonedShip_Rooms_1F/events.inc" + .include "data/maps/AbandonedShip_Corridors_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms2_B1F/events.inc" + .include "data/maps/AbandonedShip_Underwater1/events.inc" + .include "data/maps/AbandonedShip_Room_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms2_1F/events.inc" + .include "data/maps/AbandonedShip_CaptainsOffice/events.inc" + .include "data/maps/AbandonedShip_Underwater2/events.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc" + .include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc" + .include "data/maps/IslandCave/events.inc" + .include "data/maps/AncientTomb/events.inc" + .include "data/maps/Underwater_Route134/events.inc" + .include "data/maps/Underwater_SealedChamber/events.inc" + .include "data/maps/SealedChamber_OuterRoom/events.inc" + .include "data/maps/SealedChamber_InnerRoom/events.inc" + .include "data/maps/ScorchedSlab/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap1/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap2/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap3/events.inc" + .include "data/maps/SkyPillar_Entrance/events.inc" + .include "data/maps/SkyPillar_Outside/events.inc" + .include "data/maps/SkyPillar_1F/events.inc" + .include "data/maps/SkyPillar_2F/events.inc" + .include "data/maps/SkyPillar_3F/events.inc" + .include "data/maps/SkyPillar_4F/events.inc" + .include "data/maps/ShoalCave_LowTideIceRoom/events.inc" + .include "data/maps/SkyPillar_5F/events.inc" + .include "data/maps/SkyPillar_Top/events.inc" + .include "data/maps/MagmaHideout_1F/events.inc" + .include "data/maps/MagmaHideout_2F_1R/events.inc" + .include "data/maps/MagmaHideout_2F_2R/events.inc" + .include "data/maps/MagmaHideout_3F_1R/events.inc" + .include "data/maps/MagmaHideout_3F_2R/events.inc" + .include "data/maps/MagmaHideout_4F/events.inc" + .include "data/maps/MagmaHideout_3F_3R/events.inc" + .include "data/maps/MagmaHideout_2F_3R/events.inc" + .include "data/maps/MirageTower_1F/events.inc" + .include "data/maps/MirageTower_2F/events.inc" + .include "data/maps/MirageTower_3F/events.inc" + .include "data/maps/MirageTower_4F/events.inc" + .include "data/maps/DesertUnderpass/events.inc" + .include "data/maps/ArtisanCave_B1F/events.inc" + .include "data/maps/ArtisanCave_1F/events.inc" + .include "data/maps/Underwater_MarineCave/events.inc" + .include "data/maps/MarineCave_Entrance/events.inc" + .include "data/maps/MarineCave_End/events.inc" + .include "data/maps/TerraCave_Entrance/events.inc" + .include "data/maps/TerraCave_End/events.inc" + .include "data/maps/AlteringCave/events.inc" + .include "data/maps/MeteorFalls_StevensCave/events.inc" + .include "data/maps/SecretBase_RedCave1/events.inc" + .include "data/maps/SecretBase_BrownCave1/events.inc" + .include "data/maps/SecretBase_BlueCave1/events.inc" + .include "data/maps/SecretBase_YellowCave1/events.inc" + .include "data/maps/SecretBase_Tree1/events.inc" + .include "data/maps/SecretBase_Shrub1/events.inc" + .include "data/maps/SecretBase_RedCave2/events.inc" + .include "data/maps/SecretBase_BrownCave2/events.inc" + .include "data/maps/SecretBase_BlueCave2/events.inc" + .include "data/maps/SecretBase_YellowCave2/events.inc" + .include "data/maps/SecretBase_Tree2/events.inc" + .include "data/maps/SecretBase_Shrub2/events.inc" + .include "data/maps/SecretBase_RedCave3/events.inc" + .include "data/maps/SecretBase_BrownCave3/events.inc" + .include "data/maps/SecretBase_BlueCave3/events.inc" + .include "data/maps/SecretBase_YellowCave3/events.inc" + .include "data/maps/SecretBase_Tree3/events.inc" + .include "data/maps/SecretBase_Shrub3/events.inc" + .include "data/maps/SecretBase_RedCave4/events.inc" + .include "data/maps/SecretBase_BrownCave4/events.inc" + .include "data/maps/SecretBase_BlueCave4/events.inc" + .include "data/maps/SecretBase_YellowCave4/events.inc" + .include "data/maps/SecretBase_Tree4/events.inc" + .include "data/maps/SecretBase_Shrub4/events.inc" + .include "data/maps/SingleBattleColosseum/events.inc" + .include "data/maps/TradeCenter/events.inc" + .include "data/maps/RecordCorner/events.inc" + .include "data/maps/DoubleBattleColosseum/events.inc" + .include "data/maps/LinkContestRoom1/events.inc" + .include "data/maps/LinkContestRoom2/events.inc" + .include "data/maps/LinkContestRoom3/events.inc" + .include "data/maps/LinkContestRoom4/events.inc" + .include "data/maps/LinkContestRoom5/events.inc" + .include "data/maps/LinkContestRoom6/events.inc" + .include "data/maps/UnknownMap_25_29/events.inc" + .include "data/maps/UnknownMap_25_30/events.inc" + .include "data/maps/UnknownMap_25_31/events.inc" + .include "data/maps/UnknownMap_25_32/events.inc" + .include "data/maps/UnknownMap_25_33/events.inc" + .include "data/maps/UnknownMap_25_34/events.inc" + .include "data/maps/InsideOfTruck/events.inc" + .include "data/maps/SSTidalCorridor/events.inc" + .include "data/maps/SSTidalLowerDeck/events.inc" + .include "data/maps/SSTidalRooms/events.inc" + .include "data/maps/BattlePyramidSquare01/events.inc" + .include "data/maps/BattlePyramidSquare02/events.inc" + .include "data/maps/BattlePyramidSquare03/events.inc" + .include "data/maps/BattlePyramidSquare04/events.inc" + .include "data/maps/BattlePyramidSquare05/events.inc" + .include "data/maps/BattlePyramidSquare06/events.inc" + .include "data/maps/BattlePyramidSquare07/events.inc" + .include "data/maps/BattlePyramidSquare08/events.inc" + .include "data/maps/BattlePyramidSquare09/events.inc" + .include "data/maps/BattlePyramidSquare10/events.inc" + .include "data/maps/BattlePyramidSquare11/events.inc" + .include "data/maps/BattlePyramidSquare12/events.inc" + .include "data/maps/BattlePyramidSquare13/events.inc" + .include "data/maps/BattlePyramidSquare14/events.inc" + .include "data/maps/BattlePyramidSquare15/events.inc" + .include "data/maps/BattlePyramidSquare16/events.inc" + .include "data/maps/UnionRoom/events.inc" + .include "data/maps/SafariZone_Northwest/events.inc" + .include "data/maps/SafariZone_North/events.inc" + .include "data/maps/SafariZone_Southwest/events.inc" + .include "data/maps/SafariZone_South/events.inc" + .include "data/maps/BattleFrontier_OutsideWest/events.inc" + .include "data/maps/BattleFrontier_BattleTowerLobby/events.inc" + .include "data/maps/BattleFrontier_BattleTowerElevator/events.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc" + .include "data/maps/SouthernIsland_Exterior/events.inc" + .include "data/maps/SouthernIsland_Interior/events.inc" + .include "data/maps/SafariZone_RestHouse/events.inc" + .include "data/maps/SafariZone_Northeast/events.inc" + .include "data/maps/SafariZone_Southeast/events.inc" + .include "data/maps/BattleFrontier_OutsideEast/events.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor2/events.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc" + .include "data/maps/BattleFrontier_BattleDomeLobby/events.inc" + .include "data/maps/BattleFrontier_BattleDomeCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceCorridor/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidTop/events.inc" + .include "data/maps/BattleFrontier_BattleArenaLobby/events.inc" + .include "data/maps/BattleFrontier_BattleArenaCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryLobby/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePikeLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePikeCorridor/events.inc" + .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc" + .include "data/maps/BattleFrontier_RankingHall/events.inc" + .include "data/maps/BattleFrontier_Lounge1/events.inc" + .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc" + .include "data/maps/BattleFrontier_Lounge2/events.inc" + .include "data/maps/BattleFrontier_Lounge3/events.inc" + .include "data/maps/BattleFrontier_Lounge4/events.inc" + .include "data/maps/BattleFrontier_ScottsHouse/events.inc" + .include "data/maps/BattleFrontier_Lounge5/events.inc" + .include "data/maps/BattleFrontier_Lounge6/events.inc" + .include "data/maps/BattleFrontier_Lounge7/events.inc" + .include "data/maps/BattleFrontier_ReceptionGate/events.inc" + .include "data/maps/BattleFrontier_Lounge8/events.inc" + .include "data/maps/BattleFrontier_Lounge9/events.inc" + .include "data/maps/BattleFrontier_PokemonCenter_1F/events.inc" + .include "data/maps/BattleFrontier_PokemonCenter_2F/events.inc" + .include "data/maps/BattleFrontier_Mart/events.inc" + .include "data/maps/FarawayIsland_Entrance/events.inc" + .include "data/maps/FarawayIsland_Interior/events.inc" + .include "data/maps/BirthIsland_Exterior/events.inc" + .include "data/maps/BirthIsland_Harbor/events.inc" + .include "data/maps/TrainerHill_Entrance/events.inc" + .include "data/maps/TrainerHill_1F/events.inc" + .include "data/maps/TrainerHill_2F/events.inc" + .include "data/maps/TrainerHill_3F/events.inc" + .include "data/maps/TrainerHill_4F/events.inc" + .include "data/maps/TrainerHill_Roof/events.inc" + .include "data/maps/NavelRock_Exterior/events.inc" + .include "data/maps/NavelRock_Harbor/events.inc" + .include "data/maps/NavelRock_Entrance/events.inc" + .include "data/maps/NavelRock_B1F/events.inc" + .include "data/maps/NavelRock_Fork/events.inc" + .include "data/maps/NavelRock_Up1/events.inc" + .include "data/maps/NavelRock_Up2/events.inc" + .include "data/maps/NavelRock_Up3/events.inc" + .include "data/maps/NavelRock_Up4/events.inc" + .include "data/maps/NavelRock_Top/events.inc" + .include "data/maps/NavelRock_Down01/events.inc" + .include "data/maps/NavelRock_Down02/events.inc" + .include "data/maps/NavelRock_Down03/events.inc" + .include "data/maps/NavelRock_Down04/events.inc" + .include "data/maps/NavelRock_Down05/events.inc" + .include "data/maps/NavelRock_Down06/events.inc" + .include "data/maps/NavelRock_Down07/events.inc" + .include "data/maps/NavelRock_Down08/events.inc" + .include "data/maps/NavelRock_Down09/events.inc" + .include "data/maps/NavelRock_Down10/events.inc" + .include "data/maps/NavelRock_Down11/events.inc" + .include "data/maps/NavelRock_Bottom/events.inc" + .include "data/maps/TrainerHill_Elevator/events.inc" + .include "data/maps/Route104_Prototype/events.inc" + .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc" + .include "data/maps/Route109_SeashoreHouse/events.inc" + .include "data/maps/Route110_TrickHouseEntrance/events.inc" + .include "data/maps/Route110_TrickHouseEnd/events.inc" + .include "data/maps/Route110_TrickHouseCorridor/events.inc" + .include "data/maps/Route110_TrickHousePuzzle1/events.inc" + .include "data/maps/Route110_TrickHousePuzzle2/events.inc" + .include "data/maps/Route110_TrickHousePuzzle3/events.inc" + .include "data/maps/Route110_TrickHousePuzzle4/events.inc" + .include "data/maps/Route110_TrickHousePuzzle5/events.inc" + .include "data/maps/Route110_TrickHousePuzzle6/events.inc" + .include "data/maps/Route110_TrickHousePuzzle7/events.inc" + .include "data/maps/Route110_TrickHousePuzzle8/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc" + .include "data/maps/Route113_GlassWorkshop/events.inc" + .include "data/maps/Route123_BerryMastersHouse/events.inc" + .include "data/maps/Route119_WeatherInstitute_1F/events.inc" + .include "data/maps/Route119_WeatherInstitute_2F/events.inc" + .include "data/maps/Route119_House/events.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc" diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/events.inc diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/scripts.inc diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/events.inc diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/scripts.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/events.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/events.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/events.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/scripts.inc diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/events.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/scripts.inc diff --git a/data/maps/events/AlteringCave.inc b/data/maps/AlteringCave/events.inc similarity index 100% rename from data/maps/events/AlteringCave.inc rename to data/maps/AlteringCave/events.inc diff --git a/data/scripts/maps/AlteringCave.inc b/data/maps/AlteringCave/scripts.inc similarity index 100% rename from data/scripts/maps/AlteringCave.inc rename to data/maps/AlteringCave/scripts.inc diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc similarity index 100% rename from data/maps/events/AncientTomb.inc rename to data/maps/AncientTomb/events.inc diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc similarity index 100% rename from data/scripts/maps/AncientTomb.inc rename to data/maps/AncientTomb/scripts.inc diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/events.inc diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/scripts.inc diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/events.inc diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/scripts.inc diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/events.inc diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap1.inc rename to data/maps/AquaHideout_UnusedRubyMap1/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap1.inc rename to data/maps/AquaHideout_UnusedRubyMap1/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap2.inc rename to data/maps/AquaHideout_UnusedRubyMap2/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap2.inc rename to data/maps/AquaHideout_UnusedRubyMap2/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap3.inc rename to data/maps/AquaHideout_UnusedRubyMap3/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap3.inc rename to data/maps/AquaHideout_UnusedRubyMap3/scripts.inc diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/events.inc similarity index 100% rename from data/maps/events/ArtisanCave_1F.inc rename to data/maps/ArtisanCave_1F/events.inc diff --git a/data/scripts/maps/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/scripts.inc similarity index 100% rename from data/scripts/maps/ArtisanCave_1F.inc rename to data/maps/ArtisanCave_1F/scripts.inc diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/events.inc similarity index 100% rename from data/maps/events/ArtisanCave_B1F.inc rename to data/maps/ArtisanCave_B1F/events.inc diff --git a/data/scripts/maps/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/ArtisanCave_B1F.inc rename to data/maps/ArtisanCave_B1F/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc rename to data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc rename to data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaCorridor.inc rename to data/maps/BattleFrontier_BattleArenaCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc rename to data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaLobby.inc rename to data/maps/BattleFrontier_BattleArenaLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaLobby.inc rename to data/maps/BattleFrontier_BattleArenaLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeCorridor.inc rename to data/maps/BattleFrontier_BattleDomeCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc rename to data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeLobby.inc rename to data/maps/BattleFrontier_BattleDomeLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeLobby.inc rename to data/maps/BattleFrontier_BattleDomeLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryLobby.inc rename to data/maps/BattleFrontier_BattleFactoryLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc rename to data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc rename to data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc rename to data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceCorridor.inc rename to data/maps/BattleFrontier_BattlePalaceCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc rename to data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceLobby.inc rename to data/maps/BattleFrontier_BattlePalaceLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc rename to data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeCorridor.inc rename to data/maps/BattleFrontier_BattlePikeCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc rename to data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeLobby.inc rename to data/maps/BattleFrontier_BattlePikeLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeLobby.inc rename to data/maps/BattleFrontier_BattlePikeLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc rename to data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc rename to data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc rename to data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc rename to data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc rename to data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc rename to data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidLobby.inc rename to data/maps/BattleFrontier_BattlePyramidLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc rename to data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidTop.inc rename to data/maps/BattleFrontier_BattlePyramidTop/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidTop.inc rename to data/maps/BattleFrontier_BattlePyramidTop/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerCorridor.inc rename to data/maps/BattleFrontier_BattleTowerCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc rename to data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerCorridor2.inc rename to data/maps/BattleFrontier_BattleTowerCorridor2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc rename to data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerElevator.inc rename to data/maps/BattleFrontier_BattleTowerElevator/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerElevator.inc rename to data/maps/BattleFrontier_BattleTowerElevator/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerLobby.inc rename to data/maps/BattleFrontier_BattleTowerLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerLobby.inc rename to data/maps/BattleFrontier_BattleTowerLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge1.inc rename to data/maps/BattleFrontier_Lounge1/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge1.inc rename to data/maps/BattleFrontier_Lounge1/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge2.inc rename to data/maps/BattleFrontier_Lounge2/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge2.inc rename to data/maps/BattleFrontier_Lounge2/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge3.inc rename to data/maps/BattleFrontier_Lounge3/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge3.inc rename to data/maps/BattleFrontier_Lounge3/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge4.inc rename to data/maps/BattleFrontier_Lounge4/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge4.inc rename to data/maps/BattleFrontier_Lounge4/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge5.inc rename to data/maps/BattleFrontier_Lounge5/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge5.inc rename to data/maps/BattleFrontier_Lounge5/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge6.inc rename to data/maps/BattleFrontier_Lounge6/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge6.inc rename to data/maps/BattleFrontier_Lounge6/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge7.inc rename to data/maps/BattleFrontier_Lounge7/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge7.inc rename to data/maps/BattleFrontier_Lounge7/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge8.inc rename to data/maps/BattleFrontier_Lounge8/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge8.inc rename to data/maps/BattleFrontier_Lounge8/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge9.inc rename to data/maps/BattleFrontier_Lounge9/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge9.inc rename to data/maps/BattleFrontier_Lounge9/scripts.inc diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Mart.inc rename to data/maps/BattleFrontier_Mart/events.inc diff --git a/data/scripts/maps/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Mart.inc rename to data/maps/BattleFrontier_Mart/scripts.inc diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_OutsideEast.inc rename to data/maps/BattleFrontier_OutsideEast/events.inc diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_OutsideEast.inc rename to data/maps/BattleFrontier_OutsideEast/scripts.inc diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_OutsideWest.inc rename to data/maps/BattleFrontier_OutsideWest/events.inc diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_OutsideWest.inc rename to data/maps/BattleFrontier_OutsideWest/scripts.inc diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_PokemonCenter_1F.inc rename to data/maps/BattleFrontier_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc rename to data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_PokemonCenter_2F.inc rename to data/maps/BattleFrontier_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc rename to data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_RankingHall.inc rename to data/maps/BattleFrontier_RankingHall/events.inc diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_RankingHall.inc rename to data/maps/BattleFrontier_RankingHall/scripts.inc diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_ReceptionGate.inc rename to data/maps/BattleFrontier_ReceptionGate/events.inc diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_ReceptionGate.inc rename to data/maps/BattleFrontier_ReceptionGate/scripts.inc diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_ScottsHouse.inc rename to data/maps/BattleFrontier_ScottsHouse/events.inc diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_ScottsHouse.inc rename to data/maps/BattleFrontier_ScottsHouse/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare01.inc rename to data/maps/BattlePyramidSquare01/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare01.inc rename to data/maps/BattlePyramidSquare01/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare02.inc rename to data/maps/BattlePyramidSquare02/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare02.inc rename to data/maps/BattlePyramidSquare02/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare03.inc rename to data/maps/BattlePyramidSquare03/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare03.inc rename to data/maps/BattlePyramidSquare03/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare04.inc rename to data/maps/BattlePyramidSquare04/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare04.inc rename to data/maps/BattlePyramidSquare04/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare05.inc rename to data/maps/BattlePyramidSquare05/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare05.inc rename to data/maps/BattlePyramidSquare05/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare06.inc rename to data/maps/BattlePyramidSquare06/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare06.inc rename to data/maps/BattlePyramidSquare06/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare07.inc rename to data/maps/BattlePyramidSquare07/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare07.inc rename to data/maps/BattlePyramidSquare07/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare08.inc rename to data/maps/BattlePyramidSquare08/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare08.inc rename to data/maps/BattlePyramidSquare08/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare09.inc rename to data/maps/BattlePyramidSquare09/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare09.inc rename to data/maps/BattlePyramidSquare09/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare10.inc rename to data/maps/BattlePyramidSquare10/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare10.inc rename to data/maps/BattlePyramidSquare10/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare11.inc rename to data/maps/BattlePyramidSquare11/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare11.inc rename to data/maps/BattlePyramidSquare11/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare12.inc rename to data/maps/BattlePyramidSquare12/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare12.inc rename to data/maps/BattlePyramidSquare12/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare13.inc rename to data/maps/BattlePyramidSquare13/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare13.inc rename to data/maps/BattlePyramidSquare13/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare14.inc rename to data/maps/BattlePyramidSquare14/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare14.inc rename to data/maps/BattlePyramidSquare14/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare15.inc rename to data/maps/BattlePyramidSquare15/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare15.inc rename to data/maps/BattlePyramidSquare15/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare16.inc rename to data/maps/BattlePyramidSquare16/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare16.inc rename to data/maps/BattlePyramidSquare16/scripts.inc diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/events.inc similarity index 100% rename from data/maps/events/BirthIsland_Exterior.inc rename to data/maps/BirthIsland_Exterior/events.inc diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/BirthIsland_Exterior.inc rename to data/maps/BirthIsland_Exterior/scripts.inc diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/events.inc similarity index 100% rename from data/maps/events/BirthIsland_Harbor.inc rename to data/maps/BirthIsland_Harbor/events.inc diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/BirthIsland_Harbor.inc rename to data/maps/BirthIsland_Harbor/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc similarity index 100% rename from data/maps/events/DesertRuins.inc rename to data/maps/DesertRuins/events.inc diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc similarity index 100% rename from data/scripts/maps/DesertRuins.inc rename to data/maps/DesertRuins/scripts.inc diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/DesertUnderpass/events.inc similarity index 100% rename from data/maps/events/DesertUnderpass.inc rename to data/maps/DesertUnderpass/events.inc diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/maps/DesertUnderpass/scripts.inc similarity index 100% rename from data/scripts/maps/DesertUnderpass.inc rename to data/maps/DesertUnderpass/scripts.inc diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc similarity index 100% rename from data/maps/events/DewfordTown.inc rename to data/maps/DewfordTown/events.inc diff --git a/data/scripts/maps/DewfordTown.inc b/data/maps/DewfordTown/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown.inc rename to data/maps/DewfordTown/scripts.inc diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/events.inc diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/scripts.inc diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/events.inc diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/scripts.inc diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/events.inc diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/scripts.inc diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/events.inc diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/scripts.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/events.inc diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/scripts.inc diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity.inc rename to data/maps/EverGrandeCity/events.inc diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity.inc rename to data/maps/EverGrandeCity/scripts.inc diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall1.inc rename to data/maps/EverGrandeCity_Hall1/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall1.inc rename to data/maps/EverGrandeCity_Hall1/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall2.inc rename to data/maps/EverGrandeCity_Hall2/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall2.inc rename to data/maps/EverGrandeCity_Hall2/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall3.inc rename to data/maps/EverGrandeCity_Hall3/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall3.inc rename to data/maps/EverGrandeCity_Hall3/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall4.inc rename to data/maps/EverGrandeCity_Hall4/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall4.inc rename to data/maps/EverGrandeCity_Hall4/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall5.inc rename to data/maps/EverGrandeCity_Hall5/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall5.inc rename to data/maps/EverGrandeCity_Hall5/scripts.inc diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/events.inc diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonLeague_1F.inc rename to data/maps/EverGrandeCity_PokemonLeague_1F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc rename to data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonLeague_2F.inc rename to data/maps/EverGrandeCity_PokemonLeague_2F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc rename to data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/scripts.inc diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc similarity index 100% rename from data/maps/events/FallarborTown.inc rename to data/maps/FallarborTown/events.inc diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown.inc rename to data/maps/FallarborTown/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentBattleRoom.inc rename to data/maps/FallarborTown_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc rename to data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentCorridor.inc rename to data/maps/FallarborTown_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentCorridor.inc rename to data/maps/FallarborTown_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentLobby.inc rename to data/maps/FallarborTown_BattleTentLobby/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentLobby.inc rename to data/maps/FallarborTown_BattleTentLobby/scripts.inc diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/events.inc diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/scripts.inc diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/events.inc diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/scripts.inc diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc similarity index 100% rename from data/maps/events/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/events.inc diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/scripts.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/events.inc similarity index 100% rename from data/maps/events/FarawayIsland_Entrance.inc rename to data/maps/FarawayIsland_Entrance/events.inc diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/FarawayIsland_Entrance.inc rename to data/maps/FarawayIsland_Entrance/scripts.inc diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/events.inc similarity index 100% rename from data/maps/events/FarawayIsland_Interior.inc rename to data/maps/FarawayIsland_Interior/events.inc diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/scripts.inc similarity index 100% rename from data/scripts/maps/FarawayIsland_Interior.inc rename to data/maps/FarawayIsland_Interior/scripts.inc diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc similarity index 100% rename from data/maps/events/FieryPath.inc rename to data/maps/FieryPath/events.inc diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc similarity index 100% rename from data/scripts/maps/FieryPath.inc rename to data/maps/FieryPath/scripts.inc diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc similarity index 100% rename from data/maps/events/FortreeCity.inc rename to data/maps/FortreeCity/events.inc diff --git a/data/scripts/maps/FortreeCity.inc b/data/maps/FortreeCity/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity.inc rename to data/maps/FortreeCity/scripts.inc diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc similarity index 100% rename from data/maps/events/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/events.inc diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/scripts.inc diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/events.inc diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/scripts.inc diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/events.inc diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/scripts.inc diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/events.inc diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/scripts.inc diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/events.inc diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/scripts.inc diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/events.inc diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/scripts.inc diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/events.inc diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/scripts.inc diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/events.inc diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/scripts.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/events.inc diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/scripts.inc diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/events.inc diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/scripts.inc diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/events.inc diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/scripts.inc diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc similarity index 100% rename from data/maps/events/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/events.inc diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/scripts.inc diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc similarity index 100% rename from data/maps/events/InsideOfTruck.inc rename to data/maps/InsideOfTruck/events.inc diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/scripts.inc similarity index 100% rename from data/scripts/maps/InsideOfTruck.inc rename to data/maps/InsideOfTruck/scripts.inc diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc similarity index 100% rename from data/maps/events/IslandCave.inc rename to data/maps/IslandCave/events.inc diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc similarity index 100% rename from data/scripts/maps/IslandCave.inc rename to data/maps/IslandCave/scripts.inc diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc similarity index 100% rename from data/maps/events/JaggedPass.inc rename to data/maps/JaggedPass/events.inc diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc similarity index 100% rename from data/scripts/maps/JaggedPass.inc rename to data/maps/JaggedPass/scripts.inc diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown.inc rename to data/maps/LavaridgeTown/events.inc diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown.inc rename to data/maps/LavaridgeTown/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/events.inc diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/scripts.inc diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/events.inc diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/scripts.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc similarity index 100% rename from data/maps/events/LilycoveCity.inc rename to data/maps/LilycoveCity/events.inc diff --git a/data/scripts/maps/LilycoveCity.inc b/data/maps/LilycoveCity/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity.inc rename to data/maps/LilycoveCity/scripts.inc diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/events.inc diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/scripts.inc diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/events.inc diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/scripts.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/events.inc diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/scripts.inc diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/events.inc diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/scripts.inc diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/events.inc diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/scripts.inc diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/events.inc diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/scripts.inc diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/events.inc diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/scripts.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/events.inc diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/events.inc diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/scripts.inc diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/events.inc diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/scripts.inc diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/events.inc diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/scripts.inc diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/events.inc diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/scripts.inc diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/events.inc diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/scripts.inc diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/events.inc diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/scripts.inc diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/events.inc diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/scripts.inc diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc similarity index 100% rename from data/maps/events/LittlerootTown.inc rename to data/maps/LittlerootTown/events.inc diff --git a/data/scripts/maps/LittlerootTown.inc b/data/maps/LittlerootTown/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown.inc rename to data/maps/LittlerootTown/scripts.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/events.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/events.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/events.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/scripts.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/events.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/scripts.inc diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/events.inc diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/events.inc diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_1R.inc rename to data/maps/MagmaHideout_2F_1R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_1R.inc rename to data/maps/MagmaHideout_2F_1R/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_2R.inc rename to data/maps/MagmaHideout_2F_2R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_2R.inc rename to data/maps/MagmaHideout_2F_2R/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_3R.inc rename to data/maps/MagmaHideout_2F_3R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_3R.inc rename to data/maps/MagmaHideout_2F_3R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_1R.inc rename to data/maps/MagmaHideout_3F_1R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_1R.inc rename to data/maps/MagmaHideout_3F_1R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_2R.inc rename to data/maps/MagmaHideout_3F_2R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_2R.inc rename to data/maps/MagmaHideout_3F_2R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_3R.inc rename to data/maps/MagmaHideout_3F_3R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_3R.inc rename to data/maps/MagmaHideout_3F_3R/scripts.inc diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_4F.inc rename to data/maps/MagmaHideout_4F/events.inc diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_4F.inc rename to data/maps/MagmaHideout_4F/scripts.inc diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/MarineCave_End/events.inc similarity index 100% rename from data/maps/events/MarineCave_End.inc rename to data/maps/MarineCave_End/events.inc diff --git a/data/scripts/maps/MarineCave_End.inc b/data/maps/MarineCave_End/scripts.inc similarity index 100% rename from data/scripts/maps/MarineCave_End.inc rename to data/maps/MarineCave_End/scripts.inc diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/events.inc similarity index 100% rename from data/maps/events/MarineCave_Entrance.inc rename to data/maps/MarineCave_Entrance/events.inc diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/MarineCave_Entrance.inc rename to data/maps/MarineCave_Entrance/scripts.inc diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc similarity index 100% rename from data/maps/events/MauvilleCity.inc rename to data/maps/MauvilleCity/events.inc diff --git a/data/scripts/maps/MauvilleCity.inc b/data/maps/MauvilleCity/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity.inc rename to data/maps/MauvilleCity/scripts.inc diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/events.inc diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/scripts.inc diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/events.inc diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/scripts.inc diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/events.inc diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/scripts.inc diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/events.inc diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/scripts.inc diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/events.inc diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/scripts.inc diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/events.inc diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/scripts.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/events.inc diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/scripts.inc diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/events.inc diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/scripts.inc diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/events.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/scripts.inc diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/events.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/scripts.inc diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_StevensCave.inc rename to data/maps/MeteorFalls_StevensCave/events.inc diff --git a/data/scripts/maps/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_StevensCave.inc rename to data/maps/MeteorFalls_StevensCave/scripts.inc diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/MirageTower_1F/events.inc similarity index 100% rename from data/maps/events/MirageTower_1F.inc rename to data/maps/MirageTower_1F/events.inc diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/maps/MirageTower_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_1F.inc rename to data/maps/MirageTower_1F/scripts.inc diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/MirageTower_2F/events.inc similarity index 100% rename from data/maps/events/MirageTower_2F.inc rename to data/maps/MirageTower_2F/events.inc diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/maps/MirageTower_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_2F.inc rename to data/maps/MirageTower_2F/scripts.inc diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/MirageTower_3F/events.inc similarity index 100% rename from data/maps/events/MirageTower_3F.inc rename to data/maps/MirageTower_3F/events.inc diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/maps/MirageTower_3F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_3F.inc rename to data/maps/MirageTower_3F/scripts.inc diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/MirageTower_4F/events.inc similarity index 100% rename from data/maps/events/MirageTower_4F.inc rename to data/maps/MirageTower_4F/events.inc diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/maps/MirageTower_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_4F.inc rename to data/maps/MirageTower_4F/scripts.inc diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc similarity index 100% rename from data/maps/events/MossdeepCity.inc rename to data/maps/MossdeepCity/events.inc diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity.inc rename to data/maps/MossdeepCity/scripts.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/events.inc diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/scripts.inc diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/events.inc diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/scripts.inc diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/events.inc diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/scripts.inc diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/events.inc diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/scripts.inc diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/events.inc diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/scripts.inc diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/events.inc diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/scripts.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/events.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/events.inc diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/scripts.inc diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc similarity index 100% rename from data/maps/events/MtChimney.inc rename to data/maps/MtChimney/events.inc diff --git a/data/scripts/maps/MtChimney.inc b/data/maps/MtChimney/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney.inc rename to data/maps/MtChimney/scripts.inc diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc similarity index 100% rename from data/maps/events/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/events.inc diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/scripts.inc diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc similarity index 100% rename from data/maps/events/MtPyre_1F.inc rename to data/maps/MtPyre_1F/events.inc diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_1F.inc rename to data/maps/MtPyre_1F/scripts.inc diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc similarity index 100% rename from data/maps/events/MtPyre_2F.inc rename to data/maps/MtPyre_2F/events.inc diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_2F.inc rename to data/maps/MtPyre_2F/scripts.inc diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc similarity index 100% rename from data/maps/events/MtPyre_3F.inc rename to data/maps/MtPyre_3F/events.inc diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_3F.inc rename to data/maps/MtPyre_3F/scripts.inc diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc similarity index 100% rename from data/maps/events/MtPyre_4F.inc rename to data/maps/MtPyre_4F/events.inc diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_4F.inc rename to data/maps/MtPyre_4F/scripts.inc diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc similarity index 100% rename from data/maps/events/MtPyre_5F.inc rename to data/maps/MtPyre_5F/events.inc diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_5F.inc rename to data/maps/MtPyre_5F/scripts.inc diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc similarity index 100% rename from data/maps/events/MtPyre_6F.inc rename to data/maps/MtPyre_6F/events.inc diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_6F.inc rename to data/maps/MtPyre_6F/scripts.inc diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc similarity index 100% rename from data/maps/events/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/events.inc diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/scripts.inc diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc similarity index 100% rename from data/maps/events/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/events.inc diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/scripts.inc diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/events.inc similarity index 100% rename from data/maps/events/NavelRock_B1F.inc rename to data/maps/NavelRock_B1F/events.inc diff --git a/data/scripts/maps/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_B1F.inc rename to data/maps/NavelRock_B1F/scripts.inc diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/events.inc similarity index 100% rename from data/maps/events/NavelRock_Bottom.inc rename to data/maps/NavelRock_Bottom/events.inc diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Bottom.inc rename to data/maps/NavelRock_Bottom/scripts.inc diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down01.inc rename to data/maps/NavelRock_Down01/events.inc diff --git a/data/scripts/maps/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down01.inc rename to data/maps/NavelRock_Down01/scripts.inc diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down02.inc rename to data/maps/NavelRock_Down02/events.inc diff --git a/data/scripts/maps/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down02.inc rename to data/maps/NavelRock_Down02/scripts.inc diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down03.inc rename to data/maps/NavelRock_Down03/events.inc diff --git a/data/scripts/maps/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down03.inc rename to data/maps/NavelRock_Down03/scripts.inc diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down04.inc rename to data/maps/NavelRock_Down04/events.inc diff --git a/data/scripts/maps/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down04.inc rename to data/maps/NavelRock_Down04/scripts.inc diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down05.inc rename to data/maps/NavelRock_Down05/events.inc diff --git a/data/scripts/maps/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down05.inc rename to data/maps/NavelRock_Down05/scripts.inc diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down06.inc rename to data/maps/NavelRock_Down06/events.inc diff --git a/data/scripts/maps/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down06.inc rename to data/maps/NavelRock_Down06/scripts.inc diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down07.inc rename to data/maps/NavelRock_Down07/events.inc diff --git a/data/scripts/maps/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down07.inc rename to data/maps/NavelRock_Down07/scripts.inc diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down08.inc rename to data/maps/NavelRock_Down08/events.inc diff --git a/data/scripts/maps/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down08.inc rename to data/maps/NavelRock_Down08/scripts.inc diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down09.inc rename to data/maps/NavelRock_Down09/events.inc diff --git a/data/scripts/maps/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down09.inc rename to data/maps/NavelRock_Down09/scripts.inc diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down10.inc rename to data/maps/NavelRock_Down10/events.inc diff --git a/data/scripts/maps/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down10.inc rename to data/maps/NavelRock_Down10/scripts.inc diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down11.inc rename to data/maps/NavelRock_Down11/events.inc diff --git a/data/scripts/maps/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down11.inc rename to data/maps/NavelRock_Down11/scripts.inc diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/events.inc similarity index 100% rename from data/maps/events/NavelRock_Entrance.inc rename to data/maps/NavelRock_Entrance/events.inc diff --git a/data/scripts/maps/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Entrance.inc rename to data/maps/NavelRock_Entrance/scripts.inc diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/events.inc similarity index 100% rename from data/maps/events/NavelRock_Exterior.inc rename to data/maps/NavelRock_Exterior/events.inc diff --git a/data/scripts/maps/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Exterior.inc rename to data/maps/NavelRock_Exterior/scripts.inc diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/events.inc similarity index 100% rename from data/maps/events/NavelRock_Fork.inc rename to data/maps/NavelRock_Fork/events.inc diff --git a/data/scripts/maps/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Fork.inc rename to data/maps/NavelRock_Fork/scripts.inc diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/events.inc similarity index 100% rename from data/maps/events/NavelRock_Harbor.inc rename to data/maps/NavelRock_Harbor/events.inc diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Harbor.inc rename to data/maps/NavelRock_Harbor/scripts.inc diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/NavelRock_Top/events.inc similarity index 100% rename from data/maps/events/NavelRock_Top.inc rename to data/maps/NavelRock_Top/events.inc diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/maps/NavelRock_Top/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Top.inc rename to data/maps/NavelRock_Top/scripts.inc diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up1.inc rename to data/maps/NavelRock_Up1/events.inc diff --git a/data/scripts/maps/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up1.inc rename to data/maps/NavelRock_Up1/scripts.inc diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up2.inc rename to data/maps/NavelRock_Up2/events.inc diff --git a/data/scripts/maps/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up2.inc rename to data/maps/NavelRock_Up2/scripts.inc diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up3.inc rename to data/maps/NavelRock_Up3/events.inc diff --git a/data/scripts/maps/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up3.inc rename to data/maps/NavelRock_Up3/scripts.inc diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up4.inc rename to data/maps/NavelRock_Up4/events.inc diff --git a/data/scripts/maps/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up4.inc rename to data/maps/NavelRock_Up4/scripts.inc diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc similarity index 100% rename from data/maps/events/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/events.inc diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/scripts.inc diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc similarity index 100% rename from data/maps/events/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/events.inc diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/scripts.inc diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc similarity index 100% rename from data/maps/events/OldaleTown.inc rename to data/maps/OldaleTown/events.inc diff --git a/data/scripts/maps/OldaleTown.inc b/data/maps/OldaleTown/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown.inc rename to data/maps/OldaleTown/scripts.inc diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/events.inc diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/scripts.inc diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/events.inc diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/scripts.inc diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc similarity index 100% rename from data/maps/events/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/events.inc diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/scripts.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown.inc rename to data/maps/PacifidlogTown/events.inc diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown.inc rename to data/maps/PacifidlogTown/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/scripts.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc similarity index 100% rename from data/maps/events/PetalburgCity.inc rename to data/maps/PetalburgCity/events.inc diff --git a/data/scripts/maps/PetalburgCity.inc b/data/maps/PetalburgCity/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity.inc rename to data/maps/PetalburgCity/scripts.inc diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/events.inc diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/scripts.inc diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/events.inc diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/scripts.inc diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/events.inc diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/scripts.inc diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/events.inc diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/scripts.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/events.inc diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/scripts.inc diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc similarity index 100% rename from data/maps/events/PetalburgWoods.inc rename to data/maps/PetalburgWoods/events.inc diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgWoods.inc rename to data/maps/PetalburgWoods/scripts.inc diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc similarity index 100% rename from data/maps/events/RecordCorner.inc rename to data/maps/RecordCorner/events.inc diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc similarity index 100% rename from data/scripts/maps/RecordCorner.inc rename to data/maps/RecordCorner/scripts.inc diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc similarity index 100% rename from data/maps/events/Route101.inc rename to data/maps/Route101/events.inc diff --git a/data/scripts/maps/Route101.inc b/data/maps/Route101/scripts.inc similarity index 100% rename from data/scripts/maps/Route101.inc rename to data/maps/Route101/scripts.inc diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc similarity index 100% rename from data/maps/events/Route102.inc rename to data/maps/Route102/events.inc diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc similarity index 100% rename from data/scripts/maps/Route102.inc rename to data/maps/Route102/scripts.inc diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc similarity index 100% rename from data/maps/events/Route103.inc rename to data/maps/Route103/events.inc diff --git a/data/scripts/maps/Route103.inc b/data/maps/Route103/scripts.inc similarity index 100% rename from data/scripts/maps/Route103.inc rename to data/maps/Route103/scripts.inc diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc similarity index 100% rename from data/maps/events/Route104.inc rename to data/maps/Route104/events.inc diff --git a/data/scripts/maps/Route104.inc b/data/maps/Route104/scripts.inc similarity index 100% rename from data/scripts/maps/Route104.inc rename to data/maps/Route104/scripts.inc diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc similarity index 100% rename from data/maps/events/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/events.inc diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/scripts.inc diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/events.inc diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/scripts.inc diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc similarity index 100% rename from data/maps/events/Route104_Prototype.inc rename to data/maps/Route104_Prototype/events.inc diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_Prototype.inc rename to data/maps/Route104_Prototype/scripts.inc diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc similarity index 100% rename from data/maps/events/Route105.inc rename to data/maps/Route105/events.inc diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc similarity index 100% rename from data/scripts/maps/Route105.inc rename to data/maps/Route105/scripts.inc diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc similarity index 100% rename from data/maps/events/Route106.inc rename to data/maps/Route106/events.inc diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc similarity index 100% rename from data/scripts/maps/Route106.inc rename to data/maps/Route106/scripts.inc diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc similarity index 100% rename from data/maps/events/Route107.inc rename to data/maps/Route107/events.inc diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc similarity index 100% rename from data/scripts/maps/Route107.inc rename to data/maps/Route107/scripts.inc diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc similarity index 100% rename from data/maps/events/Route108.inc rename to data/maps/Route108/events.inc diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc similarity index 100% rename from data/scripts/maps/Route108.inc rename to data/maps/Route108/scripts.inc diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc similarity index 100% rename from data/maps/events/Route109.inc rename to data/maps/Route109/events.inc diff --git a/data/scripts/maps/Route109.inc b/data/maps/Route109/scripts.inc similarity index 100% rename from data/scripts/maps/Route109.inc rename to data/maps/Route109/scripts.inc diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc similarity index 100% rename from data/maps/events/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/events.inc diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/scripts.inc diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc similarity index 100% rename from data/maps/events/Route110.inc rename to data/maps/Route110/events.inc diff --git a/data/scripts/maps/Route110.inc b/data/maps/Route110/scripts.inc similarity index 100% rename from data/scripts/maps/Route110.inc rename to data/maps/Route110/scripts.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/scripts.inc diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc similarity index 100% rename from data/maps/events/Route111.inc rename to data/maps/Route111/events.inc diff --git a/data/scripts/maps/Route111.inc b/data/maps/Route111/scripts.inc similarity index 100% rename from data/scripts/maps/Route111.inc rename to data/maps/Route111/scripts.inc diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc similarity index 100% rename from data/maps/events/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/events.inc diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/scripts.inc diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc similarity index 100% rename from data/maps/events/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/events.inc diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/scripts.inc diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc similarity index 100% rename from data/maps/events/Route112.inc rename to data/maps/Route112/events.inc diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc similarity index 100% rename from data/scripts/maps/Route112.inc rename to data/maps/Route112/scripts.inc diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc similarity index 100% rename from data/maps/events/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/events.inc diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/scripts.inc diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc similarity index 100% rename from data/maps/events/Route113.inc rename to data/maps/Route113/events.inc diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc similarity index 100% rename from data/scripts/maps/Route113.inc rename to data/maps/Route113/scripts.inc diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc similarity index 100% rename from data/maps/events/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/events.inc diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc similarity index 100% rename from data/scripts/maps/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/scripts.inc diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc similarity index 100% rename from data/maps/events/Route114.inc rename to data/maps/Route114/events.inc diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc similarity index 100% rename from data/scripts/maps/Route114.inc rename to data/maps/Route114/scripts.inc diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/events.inc diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/scripts.inc diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/events.inc diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/scripts.inc diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc similarity index 100% rename from data/maps/events/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/events.inc diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/scripts.inc diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc similarity index 100% rename from data/maps/events/Route115.inc rename to data/maps/Route115/events.inc diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc similarity index 100% rename from data/scripts/maps/Route115.inc rename to data/maps/Route115/scripts.inc diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc similarity index 100% rename from data/maps/events/Route116.inc rename to data/maps/Route116/events.inc diff --git a/data/scripts/maps/Route116.inc b/data/maps/Route116/scripts.inc similarity index 100% rename from data/scripts/maps/Route116.inc rename to data/maps/Route116/scripts.inc diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc similarity index 100% rename from data/maps/events/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/events.inc diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/scripts.inc diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc similarity index 100% rename from data/maps/events/Route117.inc rename to data/maps/Route117/events.inc diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc similarity index 100% rename from data/scripts/maps/Route117.inc rename to data/maps/Route117/scripts.inc diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc similarity index 100% rename from data/maps/events/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/events.inc diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc similarity index 100% rename from data/scripts/maps/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/scripts.inc diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc similarity index 100% rename from data/maps/events/Route118.inc rename to data/maps/Route118/events.inc diff --git a/data/scripts/maps/Route118.inc b/data/maps/Route118/scripts.inc similarity index 100% rename from data/scripts/maps/Route118.inc rename to data/maps/Route118/scripts.inc diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc similarity index 100% rename from data/maps/events/Route119.inc rename to data/maps/Route119/events.inc diff --git a/data/scripts/maps/Route119.inc b/data/maps/Route119/scripts.inc similarity index 100% rename from data/scripts/maps/Route119.inc rename to data/maps/Route119/scripts.inc diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc similarity index 100% rename from data/maps/events/Route119_House.inc rename to data/maps/Route119_House/events.inc diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_House.inc rename to data/maps/Route119_House/scripts.inc diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/events.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/scripts.inc diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/events.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/scripts.inc diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc similarity index 100% rename from data/maps/events/Route120.inc rename to data/maps/Route120/events.inc diff --git a/data/scripts/maps/Route120.inc b/data/maps/Route120/scripts.inc similarity index 100% rename from data/scripts/maps/Route120.inc rename to data/maps/Route120/scripts.inc diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc similarity index 100% rename from data/maps/events/Route121.inc rename to data/maps/Route121/events.inc diff --git a/data/scripts/maps/Route121.inc b/data/maps/Route121/scripts.inc similarity index 100% rename from data/scripts/maps/Route121.inc rename to data/maps/Route121/scripts.inc diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc similarity index 100% rename from data/maps/events/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/events.inc diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/scripts.inc diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc similarity index 100% rename from data/maps/events/Route122.inc rename to data/maps/Route122/events.inc diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc similarity index 100% rename from data/scripts/maps/Route122.inc rename to data/maps/Route122/scripts.inc diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc similarity index 100% rename from data/maps/events/Route123.inc rename to data/maps/Route123/events.inc diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc similarity index 100% rename from data/scripts/maps/Route123.inc rename to data/maps/Route123/scripts.inc diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc similarity index 100% rename from data/maps/events/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/events.inc diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/scripts.inc diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc similarity index 100% rename from data/maps/events/Route124.inc rename to data/maps/Route124/events.inc diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc similarity index 100% rename from data/scripts/maps/Route124.inc rename to data/maps/Route124/scripts.inc diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc similarity index 100% rename from data/maps/events/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/events.inc diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc similarity index 100% rename from data/maps/events/Route125.inc rename to data/maps/Route125/events.inc diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc similarity index 100% rename from data/scripts/maps/Route125.inc rename to data/maps/Route125/scripts.inc diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc similarity index 100% rename from data/maps/events/Route126.inc rename to data/maps/Route126/events.inc diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc similarity index 100% rename from data/scripts/maps/Route126.inc rename to data/maps/Route126/scripts.inc diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc similarity index 100% rename from data/maps/events/Route127.inc rename to data/maps/Route127/events.inc diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc similarity index 100% rename from data/scripts/maps/Route127.inc rename to data/maps/Route127/scripts.inc diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc similarity index 100% rename from data/maps/events/Route128.inc rename to data/maps/Route128/events.inc diff --git a/data/scripts/maps/Route128.inc b/data/maps/Route128/scripts.inc similarity index 100% rename from data/scripts/maps/Route128.inc rename to data/maps/Route128/scripts.inc diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc similarity index 100% rename from data/maps/events/Route129.inc rename to data/maps/Route129/events.inc diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc similarity index 100% rename from data/scripts/maps/Route129.inc rename to data/maps/Route129/scripts.inc diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc similarity index 100% rename from data/maps/events/Route130.inc rename to data/maps/Route130/events.inc diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc similarity index 100% rename from data/scripts/maps/Route130.inc rename to data/maps/Route130/scripts.inc diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc similarity index 100% rename from data/maps/events/Route131.inc rename to data/maps/Route131/events.inc diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc similarity index 100% rename from data/scripts/maps/Route131.inc rename to data/maps/Route131/scripts.inc diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc similarity index 100% rename from data/maps/events/Route132.inc rename to data/maps/Route132/events.inc diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc similarity index 100% rename from data/scripts/maps/Route132.inc rename to data/maps/Route132/scripts.inc diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc similarity index 100% rename from data/maps/events/Route133.inc rename to data/maps/Route133/events.inc diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc similarity index 100% rename from data/scripts/maps/Route133.inc rename to data/maps/Route133/scripts.inc diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc similarity index 100% rename from data/maps/events/Route134.inc rename to data/maps/Route134/events.inc diff --git a/data/scripts/maps/Route134.inc b/data/maps/Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Route134.inc rename to data/maps/Route134/scripts.inc diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc similarity index 100% rename from data/maps/events/RustboroCity.inc rename to data/maps/RustboroCity/events.inc diff --git a/data/scripts/maps/RustboroCity.inc b/data/maps/RustboroCity/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity.inc rename to data/maps/RustboroCity/scripts.inc diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc similarity index 100% rename from data/maps/events/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/events.inc diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/scripts.inc diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/events.inc diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/scripts.inc diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/events.inc diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/scripts.inc diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/events.inc diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/scripts.inc diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/events.inc diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/scripts.inc diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/events.inc diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/scripts.inc diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc similarity index 100% rename from data/maps/events/RusturfTunnel.inc rename to data/maps/RusturfTunnel/events.inc diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/RusturfTunnel.inc rename to data/maps/RusturfTunnel/scripts.inc diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc similarity index 100% rename from data/maps/events/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/events.inc diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/scripts.inc diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc similarity index 100% rename from data/maps/events/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/events.inc diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/scripts.inc diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc similarity index 100% rename from data/maps/events/SSTidalRooms.inc rename to data/maps/SSTidalRooms/events.inc diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalRooms.inc rename to data/maps/SSTidalRooms/scripts.inc diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/SafariZone_North/events.inc similarity index 100% rename from data/maps/events/SafariZone_North.inc rename to data/maps/SafariZone_North/events.inc diff --git a/data/scripts/maps/SafariZone_North.inc b/data/maps/SafariZone_North/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_North.inc rename to data/maps/SafariZone_North/scripts.inc diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/events.inc diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/scripts.inc diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/events.inc diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/scripts.inc diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc similarity index 100% rename from data/maps/events/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/events.inc diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/scripts.inc diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/SafariZone_South/events.inc similarity index 100% rename from data/maps/events/SafariZone_South.inc rename to data/maps/SafariZone_South/events.inc diff --git a/data/scripts/maps/SafariZone_South.inc b/data/maps/SafariZone_South/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_South.inc rename to data/maps/SafariZone_South/scripts.inc diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/events.inc diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/scripts.inc diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/events.inc diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/scripts.inc diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc similarity index 100% rename from data/maps/events/ScorchedSlab.inc rename to data/maps/ScorchedSlab/events.inc diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc similarity index 100% rename from data/scripts/maps/ScorchedSlab.inc rename to data/maps/ScorchedSlab/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/scripts.inc diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/events.inc diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/scripts.inc diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/events.inc diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/scripts.inc diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/events.inc diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/scripts.inc diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/events.inc diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/scripts.inc diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/events.inc diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/scripts.inc diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/events.inc diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/scripts.inc diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/scripts.inc diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/events.inc diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/scripts.inc diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/events.inc diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/scripts.inc diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/events.inc diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/scripts.inc diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/events.inc diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/scripts.inc diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/events.inc diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/scripts.inc diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/events.inc diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/scripts.inc diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/events.inc diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/scripts.inc diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/events.inc diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/scripts.inc diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/events.inc diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/scripts.inc diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc similarity index 100% rename from data/maps/events/SlateportCity.inc rename to data/maps/SlateportCity/events.inc diff --git a/data/scripts/maps/SlateportCity.inc b/data/maps/SlateportCity/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity.inc rename to data/maps/SlateportCity/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentBattleRoom.inc rename to data/maps/SlateportCity_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc rename to data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentCorridor.inc rename to data/maps/SlateportCity_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentCorridor.inc rename to data/maps/SlateportCity_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentLobby.inc rename to data/maps/SlateportCity_BattleTentLobby/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentLobby.inc rename to data/maps/SlateportCity_BattleTentLobby/scripts.inc diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/events.inc diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/scripts.inc diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/events.inc diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/scripts.inc diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/events.inc diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/scripts.inc diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/events.inc diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/scripts.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/scripts.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/scripts.inc diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc similarity index 100% rename from data/maps/events/SootopolisCity.inc rename to data/maps/SootopolisCity/events.inc diff --git a/data/scripts/maps/SootopolisCity.inc b/data/maps/SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity.inc rename to data/maps/SootopolisCity/scripts.inc diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/events.inc diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/scripts.inc diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/events.inc diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/scripts.inc diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/events.inc diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/scripts.inc diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/events.inc diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/scripts.inc diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/events.inc diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/scripts.inc diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/events.inc diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/scripts.inc diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/events.inc diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/scripts.inc diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc rename to data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc rename to data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/events.inc diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/scripts.inc diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/events.inc diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/scripts.inc diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/events.inc diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/scripts.inc diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/TerraCave_End/events.inc similarity index 100% rename from data/maps/events/TerraCave_End.inc rename to data/maps/TerraCave_End/events.inc diff --git a/data/scripts/maps/TerraCave_End.inc b/data/maps/TerraCave_End/scripts.inc similarity index 100% rename from data/scripts/maps/TerraCave_End.inc rename to data/maps/TerraCave_End/scripts.inc diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/events.inc similarity index 100% rename from data/maps/events/TerraCave_Entrance.inc rename to data/maps/TerraCave_Entrance/events.inc diff --git a/data/scripts/maps/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/TerraCave_Entrance.inc rename to data/maps/TerraCave_Entrance/scripts.inc diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc similarity index 100% rename from data/maps/events/TradeCenter.inc rename to data/maps/TradeCenter/events.inc diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc similarity index 100% rename from data/scripts/maps/TradeCenter.inc rename to data/maps/TradeCenter/scripts.inc diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_1F.inc rename to data/maps/TrainerHill_1F/events.inc diff --git a/data/scripts/maps/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_1F.inc rename to data/maps/TrainerHill_1F/scripts.inc diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_2F.inc rename to data/maps/TrainerHill_2F/events.inc diff --git a/data/scripts/maps/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_2F.inc rename to data/maps/TrainerHill_2F/scripts.inc diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_3F.inc rename to data/maps/TrainerHill_3F/events.inc diff --git a/data/scripts/maps/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_3F.inc rename to data/maps/TrainerHill_3F/scripts.inc diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_4F.inc rename to data/maps/TrainerHill_4F/events.inc diff --git a/data/scripts/maps/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_4F.inc rename to data/maps/TrainerHill_4F/scripts.inc diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Elevator.inc rename to data/maps/TrainerHill_Elevator/events.inc diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Elevator.inc rename to data/maps/TrainerHill_Elevator/scripts.inc diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Entrance.inc rename to data/maps/TrainerHill_Entrance/events.inc diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Entrance.inc rename to data/maps/TrainerHill_Entrance/scripts.inc diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Roof.inc rename to data/maps/TrainerHill_Roof/events.inc diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Roof.inc rename to data/maps/TrainerHill_Roof/scripts.inc diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc similarity index 100% rename from data/maps/events/Underwater1.inc rename to data/maps/Underwater1/events.inc diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater1.inc rename to data/maps/Underwater1/scripts.inc diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc similarity index 100% rename from data/maps/events/Underwater2.inc rename to data/maps/Underwater2/events.inc diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater2.inc rename to data/maps/Underwater2/scripts.inc diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc similarity index 100% rename from data/maps/events/Underwater3.inc rename to data/maps/Underwater3/events.inc diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater3.inc rename to data/maps/Underwater3/scripts.inc diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc similarity index 100% rename from data/maps/events/Underwater4.inc rename to data/maps/Underwater4/events.inc diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater4.inc rename to data/maps/Underwater4/scripts.inc diff --git a/data/maps/events/Underwater5.inc b/data/maps/Underwater5/events.inc similarity index 100% rename from data/maps/events/Underwater5.inc rename to data/maps/Underwater5/events.inc diff --git a/data/scripts/maps/Underwater5.inc b/data/maps/Underwater5/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater5.inc rename to data/maps/Underwater5/scripts.inc diff --git a/data/maps/events/Underwater6.inc b/data/maps/Underwater6/events.inc similarity index 100% rename from data/maps/events/Underwater6.inc rename to data/maps/Underwater6/events.inc diff --git a/data/scripts/maps/Underwater6.inc b/data/maps/Underwater6/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater6.inc rename to data/maps/Underwater6/scripts.inc diff --git a/data/maps/events/Underwater7.inc b/data/maps/Underwater7/events.inc similarity index 100% rename from data/maps/events/Underwater7.inc rename to data/maps/Underwater7/events.inc diff --git a/data/scripts/maps/Underwater7.inc b/data/maps/Underwater7/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater7.inc rename to data/maps/Underwater7/scripts.inc diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/events.inc similarity index 100% rename from data/maps/events/Underwater_MarineCave.inc rename to data/maps/Underwater_MarineCave/events.inc diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_MarineCave.inc rename to data/maps/Underwater_MarineCave/scripts.inc diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc similarity index 100% rename from data/maps/events/Underwater_Route134.inc rename to data/maps/Underwater_Route134/events.inc diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/maps/Underwater_Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_Route134.inc rename to data/maps/Underwater_Route134/scripts.inc diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc similarity index 100% rename from data/maps/events/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/events.inc diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/scripts.inc diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc similarity index 100% rename from data/maps/events/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/events.inc diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/scripts.inc diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc similarity index 100% rename from data/maps/events/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/events.inc diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/scripts.inc diff --git a/data/maps/events/UnionRoom.inc b/data/maps/UnionRoom/events.inc similarity index 100% rename from data/maps/events/UnionRoom.inc rename to data/maps/UnionRoom/events.inc diff --git a/data/scripts/maps/UnionRoom.inc b/data/maps/UnionRoom/scripts.inc similarity index 100% rename from data/scripts/maps/UnionRoom.inc rename to data/maps/UnionRoom/scripts.inc diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/events.inc diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/scripts.inc diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/events.inc diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/scripts.inc diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/events.inc diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/scripts.inc diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/events.inc diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/scripts.inc diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/events.inc diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/scripts.inc diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/events.inc diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/scripts.inc diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown.inc rename to data/maps/VerdanturfTown/events.inc diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown.inc rename to data/maps/VerdanturfTown/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc rename to data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc rename to data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentCorridor.inc rename to data/maps/VerdanturfTown_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc rename to data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentLobby.inc rename to data/maps/VerdanturfTown_BattleTentLobby/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentLobby.inc rename to data/maps/VerdanturfTown_BattleTentLobby/scripts.inc diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/events.inc diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/scripts.inc diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/events.inc diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/scripts.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/events.inc diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/scripts.inc diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/events.inc diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/scripts.inc diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/events.inc diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/scripts.inc diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/events.inc diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/scripts.inc From ed8b006e67cdf5427177108b32c009a217b12b37 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:51 -0500 Subject: [PATCH 5/9] Rename map-layout-related things --- asm/battle_frontier_2.s | 2 +- data/layouts_table.inc | 2 +- include/fieldmap.h | 2 +- include/global.fieldmap.h | 8 +-- include/global.h | 2 +- include/global.tv.h | 4 +- include/overworld.h | 4 +- src/decoration.c | 6 +- src/field_camera.c | 52 ++++++++--------- src/field_tasks.c | 4 +- src/fieldmap.c | 116 +++++++++++++++++++------------------- src/item_use.c | 12 ++-- src/map_name_popup.c | 2 +- src/overworld.c | 72 +++++++++++------------ src/pokemon.c | 2 +- src/region_map.c | 20 +++---- src/secret_base.c | 10 ++-- src/tileset_anims.c | 8 +-- src/tv.c | 8 +-- src/wild_encounter.c | 14 ++--- 20 files changed, 175 insertions(+), 175 deletions(-) diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index b2b4542789..a58a3d2d26 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -30026,7 +30026,7 @@ _081AA0A6: ldr r2, =0x00000169 adds r0, r2 lsls r0, 2 - ldr r1, =gMapAttributes + ldr r1, =gMapLayouts adds r0, r1 ldr r6, [r0] ldr r2, [r6, 0xC] diff --git a/data/layouts_table.inc b/data/layouts_table.inc index cf3cac6469..3f94138fbb 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -1,5 +1,5 @@ .align 2 -gMapAttributes:: @ 8481DD4 +gMapLayouts:: @ 8481DD4 .4byte PetalburgCity_Layout .4byte SlateportCity_Layout .4byte MauvilleCity_Layout diff --git a/include/fieldmap.h b/include/fieldmap.h index 01218493ab..05ffb2edcf 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -1,7 +1,7 @@ #ifndef GUARD_FIELDMAP_H #define GUARD_FIELDMAP_H -extern struct BackupMapData gUnknown_03005DC0; +extern struct BackupMapLayout gUnknown_03005DC0; u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileBehaviorAt(int, int); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 7b38f9ddc5..5b2944a2bd 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -55,7 +55,7 @@ struct Tileset /*0x14*/ TilesetCB callback; }; -struct MapData +struct MapLayout { /*0x00*/ s32 width; /*0x04*/ s32 height; @@ -65,7 +65,7 @@ struct MapData /*0x14*/ struct Tileset *secondaryTileset; }; -struct BackupMapData +struct BackupMapLayout { s32 width; s32 height; @@ -160,12 +160,12 @@ struct MapConnections struct MapHeader { - /* 0x00 */ const struct MapData *mapData; + /* 0x00 */ const struct MapLayout *mapLayout; /* 0x04 */ const struct MapEvents *events; /* 0x08 */ const u8 *mapScripts; /* 0x0C */ const struct MapConnections *connections; /* 0x10 */ u16 music; - /* 0x12 */ u16 mapDataId; + /* 0x12 */ u16 mapLayoutId; /* 0x14 */ u8 regionMapSectionId; /* 0x15 */ u8 cave; /* 0x16 */ u8 weather; diff --git a/include/global.h b/include/global.h index d26184270a..d27dae2ba7 100644 --- a/include/global.h +++ b/include/global.h @@ -777,7 +777,7 @@ struct SaveBlock1 /*0x2E*/ u8 weather; /*0x2F*/ u8 filler_2F; /*0x30*/ u8 flashLevel; - /*0x32*/ u16 mapDataId; + /*0x32*/ u16 mapLayoutId; /*0x34*/ u16 mapView[0x100]; /*0x234*/ u8 playerPartyCount; /*0x238*/ struct Pokemon playerParty[PARTY_SIZE]; diff --git a/include/global.tv.h b/include/global.tv.h index 81f181cf32..805922d5c9 100644 --- a/include/global.tv.h +++ b/include/global.tv.h @@ -301,7 +301,7 @@ typedef union // size = 0x24 /*0x06*/ u8 nGoldSymbols; /*0x07*/ u8 location; /*0x08*/ u16 battlePoints; - /*0x0a*/ u16 mapDataId; + /*0x0a*/ u16 mapLayoutId; /*0x0c*/ u8 language; /*0x0d*/ u8 filler_0d[6]; /*0x13*/ u8 playerName[8]; @@ -326,7 +326,7 @@ typedef union // size = 0x24 /*0x02*/ u16 item; /*0x04*/ u8 location; /*0x05*/ u8 language; - /*0x06*/ u16 mapDataId; + /*0x06*/ u16 mapLayoutId; /*0x08*/ u8 filler_08[11]; /*0x13*/ u8 playerName[8]; } treasureInvestigators; diff --git a/include/overworld.h b/include/overworld.h index a81f10b0d1..6869d70847 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -41,7 +41,7 @@ void LoadEventObjTemplatesFromHeader(void); void LoadSaveblockEventObjScripts(void); void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y); void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); -const struct MapData *get_mapdata_header(void); +const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); @@ -82,7 +82,7 @@ bool32 Overworld_IsBikingAllowed(void); void SetDefaultFlashLevel(void); void Overworld_SetFlashLevel(s32 flashLevel); u8 Overworld_GetFlashLevel(void); -void sub_8085524(u16 mapDataId); +void sub_8085524(u16 mapLayoutId); void sub_8085540(u8 var); u8 sub_808554C(void); u16 GetLocationMusic(struct WarpData *warp); diff --git a/src/decoration.c b/src/decoration.c index ad2cdfa30e..0510b9f312 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1736,7 +1736,7 @@ bool8 sub_8128D10(u8 taskId) data[1] ++; return FALSE; } - if (sDecorationLastDirectionMoved == DIR_NORTH && data[1] - 7 >= gMapHeader.mapData->height) + if (sDecorationLastDirectionMoved == DIR_NORTH && data[1] - 7 >= gMapHeader.mapLayout->height) { data[1] --; return FALSE; @@ -1746,7 +1746,7 @@ bool8 sub_8128D10(u8 taskId) data[0] ++; return FALSE; } - if (sDecorationLastDirectionMoved == DIR_EAST && data[0] + data[5] - 8 >= gMapHeader.mapData->width) + if (sDecorationLastDirectionMoved == DIR_EAST && data[0] + data[5] - 8 >= gMapHeader.mapLayout->width) { data[0] --; return FALSE; @@ -2186,7 +2186,7 @@ void sub_81297F8(void) { for (x = 0; x < sDecorRearrangementDataBuffer[i].width; x ++) { - MapGridSetMetatileEntryAt(posX + 7 + x, posY + 7 - y, gMapHeader.mapData->map[posX + x + gMapHeader.mapData->width * (posY - y)] | 0x3000); + MapGridSetMetatileEntryAt(posX + 7 + x, posY + 7 - y, gMapHeader.mapLayout->map[posX + x + gMapHeader.mapLayout->width * (posY - y)] | 0x3000); } } sub_81296EC(sDecorRearrangementDataBuffer[i].idx); diff --git a/src/field_camera.c b/src/field_camera.c index d7063bd89a..8629bec2b4 100644 --- a/src/field_camera.c +++ b/src/field_camera.c @@ -25,13 +25,13 @@ struct FieldCameraUnknownStruct }; // static functions -static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); -static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); -static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); -static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapData *mapData); +static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); +static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); +static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); +static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout); static s32 MapPosToBgTilemapOffset(struct FieldCameraUnknownStruct *a, s32 x, s32 y); -static void DrawWholeMapViewInternal(int x, int y, const struct MapData *mapData); -static void DrawMetatileAt(const struct MapData *mapData, u16, int, int); +static void DrawWholeMapViewInternal(int x, int y, const struct MapLayout *mapLayout); +static void DrawMetatileAt(const struct MapLayout *mapLayout, u16, int, int); static void DrawMetatile(s32 a, u16 *b, u16 c); static void CameraPanningCB_PanAhead(void); @@ -97,11 +97,11 @@ void sub_8089C08(s16 *a, s16 *b) void DrawWholeMapView(void) { - DrawWholeMapViewInternal(gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y, gMapHeader.mapData); + DrawWholeMapViewInternal(gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y, gMapHeader.mapLayout); gUnknown_03000E20.unk4 = TRUE; } -static void DrawWholeMapViewInternal(int x, int y, const struct MapData *mapData) +static void DrawWholeMapViewInternal(int x, int y, const struct MapLayout *mapLayout) { u8 i; u8 j; @@ -119,27 +119,27 @@ static void DrawWholeMapViewInternal(int x, int y, const struct MapData *mapData temp = gUnknown_03000E20.unk2 + j; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, r6 + temp, x + j / 2, y + i / 2); + DrawMetatileAt(mapLayout, r6 + temp, x + j / 2, y + i / 2); } } } static void RedrawMapSlicesForCameraUpdate(struct FieldCameraUnknownStruct *a, int x, int y) { - const struct MapData *mapData = gMapHeader.mapData; + const struct MapLayout *mapLayout = gMapHeader.mapLayout; if (x > 0) - RedrawMapSliceWest(a, mapData); + RedrawMapSliceWest(a, mapLayout); if (x < 0) - RedrawMapSliceEast(a, mapData); + RedrawMapSliceEast(a, mapLayout); if (y > 0) - RedrawMapSliceNorth(a, mapData); + RedrawMapSliceNorth(a, mapLayout); if (y < 0) - RedrawMapSliceSouth(a, mapData); + RedrawMapSliceSouth(a, mapLayout); a->unk4 = TRUE; } -static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -154,11 +154,11 @@ static void RedrawMapSliceNorth(struct FieldCameraUnknownStruct *a, const struct temp = a->unk2 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y + 14); + DrawMetatileAt(mapLayout, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y + 14); } } -static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -169,11 +169,11 @@ static void RedrawMapSliceSouth(struct FieldCameraUnknownStruct *a, const struct temp = a->unk2 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y); + DrawMetatileAt(mapLayout, r7 + temp, gSaveBlock1Ptr->pos.x + i / 2, gSaveBlock1Ptr->pos.y); } } -static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -184,11 +184,11 @@ static void RedrawMapSliceEast(struct FieldCameraUnknownStruct *a, const struct temp = a->unk3 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, temp * 32 + r6, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y + i / 2); + DrawMetatileAt(mapLayout, temp * 32 + r6, gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y + i / 2); } } -static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapData *mapData) +static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct MapLayout *mapLayout) { u8 i; u8 temp; @@ -201,7 +201,7 @@ static void RedrawMapSliceWest(struct FieldCameraUnknownStruct *a, const struct temp = a->unk3 + i; if (temp >= 32) temp -= 32; - DrawMetatileAt(mapData, temp * 32 + r5, gSaveBlock1Ptr->pos.x + 14, gSaveBlock1Ptr->pos.y + i / 2); + DrawMetatileAt(mapLayout, temp * 32 + r5, gSaveBlock1Ptr->pos.x + 14, gSaveBlock1Ptr->pos.y + i / 2); } } @@ -211,7 +211,7 @@ void CurrentMapDrawMetatileAt(int a, int b) if (offset >= 0) { - DrawMetatileAt(gMapHeader.mapData, offset, a, b); + DrawMetatileAt(gMapHeader.mapLayout, offset, a, b); gUnknown_03000E20.unk4 = TRUE; } } @@ -227,7 +227,7 @@ void DrawDoorMetatileAt(int x, int y, u16 *arr) } } -static void DrawMetatileAt(const struct MapData *mapData, u16 b, int c, int d) +static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 b, int c, int d) { u16 metatileId = MapGridGetMetatileIdAt(c, d); u16 *metatiles; @@ -235,10 +235,10 @@ static void DrawMetatileAt(const struct MapData *mapData, u16 b, int c, int d) if (metatileId > 1024) metatileId = 0; if (metatileId < 512) - metatiles = mapData->primaryTileset->metatiles; + metatiles = mapLayout->primaryTileset->metatiles; else { - metatiles = mapData->secondaryTileset->metatiles; + metatiles = mapLayout->secondaryTileset->metatiles; metatileId -= 512; } DrawMetatile(MapGridGetMetatileLayerTypeAt(c, d), metatiles + metatileId * 8, b); diff --git a/src/field_tasks.c b/src/field_tasks.c index d9c3078dae..3cc40ac9d5 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -525,8 +525,8 @@ static bool32 sub_809E184(s16 x, s16 y) void SetSootopolisGymCrackedIceMetatiles(void) { s32 x, y; - s32 width = gMapHeader.mapData->width; - s32 height = gMapHeader.mapData->height; + s32 width = gMapHeader.mapLayout->width; + s32 height = gMapHeader.mapLayout->height; for (x = 0; x < width; x++) { for (y = 0; y < height; y++) diff --git a/src/fieldmap.c b/src/fieldmap.c index 245c883275..2561bceb70 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -28,7 +28,7 @@ EWRAM_DATA struct Camera gCamera = {0}; EWRAM_DATA static struct ConnectionFlags gUnknown_02037340 = {0}; EWRAM_DATA static u32 sFiller_02037344 = 0; // without this, the next file won't align properly -struct BackupMapData gUnknown_03005DC0; +struct BackupMapLayout gUnknown_03005DC0; static const struct ConnectionFlags sDummyConnectionFlags = {0}; @@ -68,19 +68,19 @@ void trainer_hill_map_load_related(void) void mapheader_copy_mapdata_with_padding(struct MapHeader *mapHeader) { - struct MapData const *mapData; + struct MapLayout const *mapLayout; int width; int height; - mapData = mapHeader->mapData; + mapLayout = mapHeader->mapLayout; CpuFastFill16(0x03ff, gUnknown_02032318, sizeof(gUnknown_02032318)); gUnknown_03005DC0.map = gUnknown_02032318; - width = mapData->width + 15; + width = mapLayout->width + 15; gUnknown_03005DC0.width = width; - height = mapData->height + 14; + height = mapLayout->height + 14; gUnknown_03005DC0.height = height; if (width * height <= 0x2800) { - map_copy_with_padding(mapData->map, mapData->width, mapData->height); + map_copy_with_padding(mapLayout->map, mapLayout->width, mapLayout->height); mapheader_copy_mapdata_of_adjacent_maps(mapHeader); } } @@ -146,8 +146,8 @@ void sub_8087F54(int x, int y, struct MapHeader const *mapHeader, int x2, int y2 u16 *dest; int mapWidth; - mapWidth = mapHeader->mapData->width; - src = &mapHeader->mapData->map[mapWidth * y2 + x2]; + mapWidth = mapHeader->mapLayout->width; + src = &mapHeader->mapLayout->map[mapWidth * y2 + x2]; dest = &gUnknown_03005DC0.map[gUnknown_03005DC0.width * y + x]; for (i = 0; i < height; i++) @@ -167,9 +167,9 @@ void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader con if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; + cWidth = connectedMapHeader->mapLayout->width; x = offset + 7; - y = mapHeader->mapData->height + 7; + y = mapHeader->mapLayout->height + 7; if (x < 0) { x2 = -x; @@ -214,8 +214,8 @@ void fillNorthConnection(struct MapHeader const *mapHeader, struct MapHeader con if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; + cWidth = connectedMapHeader->mapLayout->width; + cHeight = connectedMapHeader->mapLayout->height; x = offset + 7; y2 = cHeight - 7; if (x < 0) @@ -262,8 +262,8 @@ void fillWestConnection(struct MapHeader const *mapHeader, struct MapHeader cons int cWidth, cHeight; if (connectedMapHeader) { - cWidth = connectedMapHeader->mapData->width; - cHeight = connectedMapHeader->mapData->height; + cWidth = connectedMapHeader->mapLayout->width; + cHeight = connectedMapHeader->mapLayout->height; y = offset + 7; x2 = cWidth - 7; if (y < 0) @@ -308,8 +308,8 @@ void fillEastConnection(struct MapHeader const *mapHeader, struct MapHeader cons int cHeight; if (connectedMapHeader) { - cHeight = connectedMapHeader->mapData->height; - x = mapHeader->mapData->width + 7; + cHeight = connectedMapHeader->mapLayout->height; + x = mapHeader->mapLayout->width + 7; y = offset + 7; if (y < 0) { @@ -369,10 +369,10 @@ u8 MapGridGetZCoordAt(int x, int y) } else { - border = gMapHeader.mapData->border; + border = gMapHeader.mapLayout->border; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = gMapHeader.mapData->border[i]; + block = gMapHeader.mapLayout->border[i]; block |= 0xc00; } @@ -397,10 +397,10 @@ u8 MapGridIsImpassableAt(int x, int y) } else { - border = gMapHeader.mapData->border; + border = gMapHeader.mapLayout->border; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = gMapHeader.mapData->border[i]; + block = gMapHeader.mapLayout->border[i]; block |= 0xc00; } if (block == 0x3ff) @@ -415,7 +415,7 @@ u32 MapGridGetMetatileIdAt(int x, int y) u16 block; int i; int j; - struct MapData const *mapData; + struct MapLayout const *mapLayout; u16 *border; u16 block2; @@ -426,17 +426,17 @@ u32 MapGridGetMetatileIdAt(int x, int y) } else { - mapData = gMapHeader.mapData; + mapLayout = gMapHeader.mapLayout; i = (x + 1) & 1; i += ((y + 1) & 1) * 2; - block = mapData->border[i] | 0xc00; + block = mapLayout->border[i] | 0xc00; } if (block == 0x3ff) { - border = gMapHeader.mapData->border; + border = gMapHeader.mapLayout->border; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; - block2 = gMapHeader.mapData->border[j]; + block2 = gMapHeader.mapLayout->border[j]; block2 |= 0xc00; return block2 & block; } @@ -484,12 +484,12 @@ u16 GetBehaviorByMetatileId(u16 metatile) u16 *attributes; if (metatile <= 0x1ff) { - attributes = gMapHeader.mapData->primaryTileset->metatileAttributes; + attributes = gMapHeader.mapLayout->primaryTileset->metatileAttributes; return attributes[metatile]; } else if (metatile <= 0x3ff) { - attributes = gMapHeader.mapData->secondaryTileset->metatileAttributes; + attributes = gMapHeader.mapLayout->secondaryTileset->metatileAttributes; return attributes[metatile - 0x200]; } else @@ -555,7 +555,7 @@ void mapdata_from_sav2(void) { if (i == y && i != 0) a0 = 0; - else if (i == y + 13 && i != gMapHeader.mapData->height - 1) + else if (i == y + 13 && i != gMapHeader.mapLayout->height - 1) a0 = 1; else a0 = -1; @@ -571,7 +571,7 @@ void mapdata_from_sav2(void) { if (y != 0) sub_80D423C(j, y - 1); - if (i < gMapHeader.mapData->height - 1) + if (i < gMapHeader.mapLayout->height - 1) sub_80D42B8(j, y + 13); } sav2_mapdata_clear(); @@ -636,7 +636,7 @@ void sub_80885C4(u8 a1) int GetMapBorderIdAt(int x, int y) { - struct MapData const *mapData; + struct MapLayout const *mapLayout; u16 block, block2; int i, j; if (x >= 0 && x < gUnknown_03005DC0.width @@ -652,10 +652,10 @@ int GetMapBorderIdAt(int x, int y) } else { - mapData = gMapHeader.mapData; + mapLayout = gMapHeader.mapLayout; j = (x + 1) & 1; j += ((y + 1) & 1) * 2; - block2 = 0xc00 | mapData->border[j]; + block2 = 0xc00 | mapLayout->border[j]; if (block2 == 0x3ff) { goto fail; @@ -732,7 +732,7 @@ void sub_80887F8(struct MapConnection *connection, int direction, int x, int y) gSaveBlock1Ptr->pos.y -= connection->offset; break; case CONNECTION_WEST: - gSaveBlock1Ptr->pos.x = mapHeader->mapData->width; + gSaveBlock1Ptr->pos.x = mapHeader->mapLayout->width; gSaveBlock1Ptr->pos.y -= connection->offset; break; case CONNECTION_SOUTH: @@ -741,7 +741,7 @@ void sub_80887F8(struct MapConnection *connection, int direction, int x, int y) break; case CONNECTION_NORTH: gSaveBlock1Ptr->pos.x -= connection->offset; - gSaveBlock1Ptr->pos.y = mapHeader->mapData->height; + gSaveBlock1Ptr->pos.y = mapHeader->mapLayout->height; break; } } @@ -800,10 +800,10 @@ bool8 sub_80889A8(u8 direction, int x, int y, struct MapConnection *connection) { case CONNECTION_SOUTH: case CONNECTION_NORTH: - return sub_8088A0C(x, gMapHeader.mapData->width, mapHeader->mapData->width, connection->offset); + return sub_8088A0C(x, gMapHeader.mapLayout->width, mapHeader->mapLayout->width, connection->offset); case CONNECTION_WEST: case CONNECTION_EAST: - return sub_8088A0C(y, gMapHeader.mapData->height, mapHeader->mapData->height, connection->offset); + return sub_8088A0C(y, gMapHeader.mapLayout->height, mapHeader->mapLayout->height, connection->offset); } return FALSE; } @@ -841,10 +841,10 @@ int sub_8088A4C(struct MapConnection *connection, int x, int y) { case CONNECTION_SOUTH: case CONNECTION_NORTH: - return sub_8088A38(x - connection->offset, mapHeader->mapData->width); + return sub_8088A38(x - connection->offset, mapHeader->mapLayout->width); case CONNECTION_WEST: case CONNECTION_EAST: - return sub_8088A38(y - connection->offset, mapHeader->mapData->height); + return sub_8088A38(y - connection->offset, mapHeader->mapLayout->height); } return FALSE; } @@ -868,9 +868,9 @@ struct MapConnection *sub_8088A8C(s16 x, s16 y) direction = connection->direction; if ((direction == CONNECTION_DIVE || direction == CONNECTION_EMERGE) || (direction == CONNECTION_NORTH && y > 6) - || (direction == CONNECTION_SOUTH && y < gMapHeader.mapData->height + 7) + || (direction == CONNECTION_SOUTH && y < gMapHeader.mapLayout->height + 7) || (direction == CONNECTION_WEST && x > 6) - || (direction == CONNECTION_EAST && x < gMapHeader.mapData->width + 7)) + || (direction == CONNECTION_EAST && x < gMapHeader.mapLayout->width + 7)) { continue; } @@ -990,45 +990,45 @@ void apply_map_tileset_palette(struct Tileset const *tileset, u16 destOffset, u1 } } -void copy_map_tileset1_to_vram(struct MapData const *mapData) +void copy_map_tileset1_to_vram(struct MapLayout const *mapLayout) { - copy_tileset_patterns_to_vram(mapData->primaryTileset, 0x200, 0); + copy_tileset_patterns_to_vram(mapLayout->primaryTileset, 0x200, 0); } -void copy_map_tileset2_to_vram(struct MapData const *mapData) +void copy_map_tileset2_to_vram(struct MapLayout const *mapLayout) { - copy_tileset_patterns_to_vram(mapData->secondaryTileset, 0x200, 0x200); + copy_tileset_patterns_to_vram(mapLayout->secondaryTileset, 0x200, 0x200); } -void copy_map_tileset2_to_vram_2(struct MapData const *mapData) +void copy_map_tileset2_to_vram_2(struct MapLayout const *mapLayout) { - copy_tileset_patterns_to_vram2(mapData->secondaryTileset, 0x200, 0x200); + copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, 0x200, 0x200); } -void apply_map_tileset1_palette(struct MapData const *mapData) +void apply_map_tileset1_palette(struct MapLayout const *mapLayout) { - apply_map_tileset_palette(mapData->primaryTileset, 0, 0xC0); + apply_map_tileset_palette(mapLayout->primaryTileset, 0, 0xC0); } -void apply_map_tileset2_palette(struct MapData const *mapData) +void apply_map_tileset2_palette(struct MapLayout const *mapLayout) { - apply_map_tileset_palette(mapData->secondaryTileset, 0x60, 0xE0); + apply_map_tileset_palette(mapLayout->secondaryTileset, 0x60, 0xE0); } -void copy_map_tileset1_tileset2_to_vram(struct MapData const *mapData) +void copy_map_tileset1_tileset2_to_vram(struct MapLayout const *mapLayout) { - if (mapData) + if (mapLayout) { - copy_tileset_patterns_to_vram2(mapData->primaryTileset, 0x200, 0); - copy_tileset_patterns_to_vram2(mapData->secondaryTileset, 0x200, 0x200); + copy_tileset_patterns_to_vram2(mapLayout->primaryTileset, 0x200, 0); + copy_tileset_patterns_to_vram2(mapLayout->secondaryTileset, 0x200, 0x200); } } -void apply_map_tileset1_tileset2_palette(struct MapData const *mapData) +void apply_map_tileset1_tileset2_palette(struct MapLayout const *mapLayout) { - if (mapData) + if (mapLayout) { - apply_map_tileset1_palette(mapData); - apply_map_tileset2_palette(mapData); + apply_map_tileset1_palette(mapLayout); + apply_map_tileset2_palette(mapLayout); } } diff --git a/src/item_use.c b/src/item_use.c index 96f63ee3ec..f3cb58069e 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -424,23 +424,23 @@ bool8 sub_80FD730(struct MapConnection *connection, int x, int y) case 2: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = mapHeader->mapData->height - 7; + localLength = mapHeader->mapLayout->height - 7; localY = localLength + y; // additions are reversed for some reason break; case 1: localOffset = connection->offset + 7; localX = x - localOffset; - localLength = gMapHeader.mapData->height + 7; + localLength = gMapHeader.mapLayout->height + 7; localY = y - localLength; break; case 3: - localLength = mapHeader->mapData->width - 7; + localLength = mapHeader->mapLayout->width - 7; localX = localLength + x; // additions are reversed for some reason localOffset = connection->offset + 7; localY = y - localOffset; break; case 4: - localLength = gMapHeader.mapData->width + 7; + localLength = gMapHeader.mapLayout->width + 7; localX = x - localLength; localOffset = connection->offset + 7; localY = y - localOffset; @@ -455,8 +455,8 @@ void sub_80FD7C8(u8 taskId) { s16 x, y; s16 curX, curY; - s16 width = gMapHeader.mapData->width + 7; - s16 height = gMapHeader.mapData->height + 7; + s16 width = gMapHeader.mapLayout->width + 7; + s16 height = gMapHeader.mapLayout->height + 7; s16 var1 = 7; s16 var2 = 7; diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 1782e9af82..b2109bb823 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -228,7 +228,7 @@ static void ShowMapNamePopUpWindow(void) if(InBattlePyramid()) { - if(gMapHeader.mapDataId == 0x17A) + if(gMapHeader.mapLayoutId == 0x17A) { withoutPrefixPtr = &(mapDisplayHeader[3]); mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7]; diff --git a/src/overworld.c b/src/overworld.c index 1e41160536..657ffd86a1 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -81,7 +81,7 @@ extern const u8 gUnknown_082774EF[]; extern const u8 gUnknown_08277509[]; // vars -extern const struct MapData *const gMapAttributes[]; +extern const struct MapLayout *const gMapLayouts[]; extern const struct MapHeader *const *const gMapGroups[]; extern const s32 gMaxFlashLevel; extern const u16 gUnknown_82EC7C4[]; @@ -97,16 +97,16 @@ 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 MapData *); -extern void apply_map_tileset1_tileset2_palette(const struct MapData *); +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 not_trainer_hill_battle_pyramid(void); -extern void apply_map_tileset2_palette(const struct MapData *); -extern void copy_map_tileset2_to_vram_2(const struct MapData *); +extern void apply_map_tileset2_palette(const struct MapLayout *); +extern void copy_map_tileset2_to_vram_2(const struct MapLayout *); extern void prev_quest_postbuffer_cursor_backup_reset(void); extern void ShowMapNamePopup(void); extern bool32 InTrainerHill(void); @@ -143,8 +143,8 @@ extern void sub_80EDB44(void); extern void sub_81D64C0(void); extern void sub_81BE6AC(void); extern void sub_8098128(void); -extern void copy_map_tileset1_to_vram(const struct MapData *); -extern void copy_map_tileset2_to_vram(const struct MapData *); +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 bool32 sub_81D5F48(void); @@ -558,17 +558,17 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType) static void mapdata_load_assets_to_gpu_and_full_redraw(void) { move_tilemap_camera_to_upper_left_corner(); - copy_map_tileset1_tileset2_to_vram(gMapHeader.mapData); - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + copy_map_tileset1_tileset2_to_vram(gMapHeader.mapLayout); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); DrawWholeMapView(); cur_mapheader_run_tileset_funcs_after_some_cpuset(); } -const struct MapData *get_mapdata_header(void) +const struct MapLayout *GetMapLayout(void) { - u16 mapDataId = gSaveBlock1Ptr->mapDataId; - if (mapDataId) - return gMapAttributes[mapDataId - 1]; + u16 mapLayoutId = gSaveBlock1Ptr->mapLayoutId; + if (mapLayoutId) + return gMapLayouts[mapLayoutId - 1]; return NULL; } @@ -625,14 +625,14 @@ void set_current_map_header_from_sav1_save_old_name(void) { sLastMapSectionId = gMapHeader.regionMapSectionId; gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); - gSaveBlock1Ptr->mapDataId = gMapHeader.mapDataId; - gMapHeader.mapData = get_mapdata_header(); + gSaveBlock1Ptr->mapLayoutId = gMapHeader.mapLayoutId; + gMapHeader.mapLayout = GetMapLayout(); } void LoadSaveblockMapHeader(void) { gMapHeader = *Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum); - gMapHeader.mapData = get_mapdata_header(); + gMapHeader.mapLayout = GetMapLayout(); } void update_camera_pos_from_warpid(void) @@ -649,8 +649,8 @@ void update_camera_pos_from_warpid(void) } else { - gSaveBlock1Ptr->pos.x = gMapHeader.mapData->width / 2; - gSaveBlock1Ptr->pos.y = gMapHeader.mapData->height / 2; + gSaveBlock1Ptr->pos.x = gMapHeader.mapLayout->width / 2; + gSaveBlock1Ptr->pos.y = gMapHeader.mapLayout->height / 2; } } @@ -837,8 +837,8 @@ void mliX_load_map(u8 mapGroup, u8 mapNum) Overworld_ClearSavedMusic(); mapheader_run_script_with_tag_x3(); not_trainer_hill_battle_pyramid(); - copy_map_tileset2_to_vram_2(gMapHeader.mapData); - apply_map_tileset2_palette(gMapHeader.mapData); + copy_map_tileset2_to_vram_2(gMapHeader.mapLayout); + apply_map_tileset2_palette(gMapHeader.mapLayout); for (paletteIndex = 6; paletteIndex < 13; paletteIndex++) ApplyWeatherGammaShiftToPal(paletteIndex); @@ -862,7 +862,7 @@ static void mli0_load_map(u32 a1) set_current_map_header_from_sav1_save_old_name(); if (!(sUnknown_020322D8 & 1)) { - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) sub_81AA1D8(); else if (InTrainerHill()) sub_81D5DF8(); @@ -890,7 +890,7 @@ static void mli0_load_map(u32 a1) mapheader_run_script_with_tag_x3(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) battle_pyramid_map_load_related(0); else if (InTrainerHill()) trainer_hill_map_load_related(); @@ -1016,10 +1016,10 @@ u8 Overworld_GetFlashLevel(void) return gSaveBlock1Ptr->flashLevel; } -void sub_8085524(u16 mapDataId) +void sub_8085524(u16 mapLayoutId) { - gSaveBlock1Ptr->mapDataId = mapDataId; - gMapHeader.mapData = get_mapdata_header(); + gSaveBlock1Ptr->mapLayoutId = mapLayoutId; + gMapHeader.mapLayout = GetMapLayout(); } void sub_8085540(u8 var) @@ -1729,7 +1729,7 @@ void CB2_ContinueSavedGame(void) LoadSaveblockMapHeader(); set_warp2_warp3_to_neg_1(); trainerHillMapId = GetCurrentTrainerHillMapId(); - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) sub_81AA2F8(); else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); @@ -1739,7 +1739,7 @@ void CB2_ContinueSavedGame(void) UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) battle_pyramid_map_load_related(1); else if (trainerHillMapId != 0) trainer_hill_map_load_related(); @@ -1859,17 +1859,17 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 6: - copy_map_tileset1_to_vram(gMapHeader.mapData); + copy_map_tileset1_to_vram(gMapHeader.mapLayout); (*state)++; break; case 7: - copy_map_tileset2_to_vram(gMapHeader.mapData); + copy_map_tileset2_to_vram(gMapHeader.mapLayout); (*state)++; break; case 8: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; } break; @@ -1934,17 +1934,17 @@ static bool32 load_map_stuff(u8 *state, u32 a2) (*state)++; break; case 6: - copy_map_tileset1_to_vram(gMapHeader.mapData); + copy_map_tileset1_to_vram(gMapHeader.mapLayout); (*state)++; break; case 7: - copy_map_tileset2_to_vram(gMapHeader.mapData); + copy_map_tileset2_to_vram(gMapHeader.mapLayout); (*state)++; break; case 8: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; } break; @@ -2031,17 +2031,17 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 5: - copy_map_tileset1_to_vram(gMapHeader.mapData); + copy_map_tileset1_to_vram(gMapHeader.mapLayout); (*state)++; break; case 6: - copy_map_tileset2_to_vram(gMapHeader.mapData); + copy_map_tileset2_to_vram(gMapHeader.mapLayout); (*state)++; break; case 7: if (free_temp_tile_data_buffers_if_possible() != TRUE) { - apply_map_tileset1_tileset2_palette(gMapHeader.mapData); + apply_map_tileset1_tileset2_palette(gMapHeader.mapLayout); (*state)++; } break; diff --git a/src/pokemon.c b/src/pokemon.c index 800b7c0cd4..1fa1c08f84 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5620,7 +5620,7 @@ void SetWildMonHeldItem(void) var1 = 20; var2 = 80; } - if (gMapHeader.mapDataId == 0x1A4) + if (gMapHeader.mapLayoutId == 0x1A4) { s32 alteringCaveId = GetWildMonTableIdInAlteringCave(species); if (alteringCaveId != 0) diff --git a/src/region_map.c b/src/region_map.c index f16787fc93..0dcccfdab6 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -891,8 +891,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) case 6: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; gRegionMap->playerIsInCave = FALSE; - mapWidth = gMapHeader.mapData->width; - mapHeight = gMapHeader.mapData->height; + mapWidth = gMapHeader.mapLayout->width; + mapHeight = gMapHeader.mapLayout->height; x = gSaveBlock1Ptr->pos.x; y = gSaveBlock1Ptr->pos.y; if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_128 || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE) @@ -907,8 +907,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->warp4.mapGroup, gSaveBlock1Ptr->warp4.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->playerIsInCave = TRUE; - mapWidth = mapHeader->mapData->width; - mapHeight = mapHeader->mapData->height; + mapWidth = mapHeader->mapLayout->width; + mapHeight = mapHeader->mapLayout->height; x = gSaveBlock1Ptr->warp4.x; y = gSaveBlock1Ptr->warp4.y; } @@ -926,8 +926,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) mapHeader = Overworld_GetMapHeaderByGroupAndId((u16)gSaveBlock1Ptr->warp2.mapGroup, (u16)gSaveBlock1Ptr->warp2.mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; gRegionMap->playerIsInCave = TRUE; - mapWidth = mapHeader->mapData->width; - mapHeight = mapHeader->mapData->height; + mapWidth = mapHeader->mapLayout->width; + mapHeight = mapHeader->mapLayout->height; x = gSaveBlock1Ptr->warp2.x; y = gSaveBlock1Ptr->warp2.y; break; @@ -953,8 +953,8 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) { gRegionMap->playerIsInCave = FALSE; } - mapWidth = mapHeader->mapData->width; - mapHeight = mapHeader->mapData->height; + mapWidth = mapHeader->mapLayout->width; + mapHeight = mapHeader->mapLayout->height; x = storedWarp->x; y = storedWarp->y; break; @@ -1068,14 +1068,14 @@ static void RegionMap_InitializeStateBasedOnSSTidalLocation(void) mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); gRegionMap->mapSecId = mapHeader->regionMapSectionId; - dimensionScale = mapHeader->mapData->width / gRegionMapEntries[gRegionMap->mapSecId].width; + dimensionScale = mapHeader->mapLayout->width / gRegionMapEntries[gRegionMap->mapSecId].width; if (dimensionScale == 0) dimensionScale = 1; x = xOnMap / dimensionScale; if (x >= gRegionMapEntries[gRegionMap->mapSecId].width) x = gRegionMapEntries[gRegionMap->mapSecId].width - 1; - dimensionScale = mapHeader->mapData->height / gRegionMapEntries[gRegionMap->mapSecId].height; + dimensionScale = mapHeader->mapLayout->height / gRegionMapEntries[gRegionMap->mapSecId].height; if (dimensionScale == 0) dimensionScale = 1; y = yOnMap / dimensionScale; diff --git a/src/secret_base.c b/src/secret_base.c index d6f4e24a5e..93b82b3cbd 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -246,16 +246,16 @@ void sub_80E8C98(void) void sub_80E8CB0(s16 *xPtr, s16 *yPtr, u16 tile) { - const struct MapData *mapData; + const struct MapLayout *mapLayout; s16 x; s16 y; - mapData = gMapHeader.mapData; - for (y = 0; y < mapData->height; y ++) + mapLayout = gMapHeader.mapLayout; + for (y = 0; y < mapLayout->height; y ++) { - for (x = 0; x < mapData->width; x ++) + for (x = 0; x < mapLayout->width; x ++) { - if ((mapData->map[y * mapData->width + x] & 0x3ff) == tile) + if ((mapLayout->map[y * mapLayout->width + x] & 0x3ff) == tile) { *xPtr = x; *yPtr = y; diff --git a/src/tileset_anims.c b/src/tileset_anims.c index aaa05bcc82..d05931dbad 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -686,8 +686,8 @@ static void cur_mapheader_run_tileset1_func(void) sPrimaryTilesetCBCounter = 0; sPrimaryTilesetCBBufferSize = 0; sPrimaryTilesetCB = NULL; - if (gMapHeader.mapData->primaryTileset && gMapHeader.mapData->primaryTileset->callback) - gMapHeader.mapData->primaryTileset->callback(); + if (gMapHeader.mapLayout->primaryTileset && gMapHeader.mapLayout->primaryTileset->callback) + gMapHeader.mapLayout->primaryTileset->callback(); } static void cur_mapheader_run_tileset2_func(void) @@ -695,8 +695,8 @@ static void cur_mapheader_run_tileset2_func(void) sSecondaryTilesetCBCounter = 0; sSecondaryTilesetCBBufferSize = 0; sSecondaryTilesetCB = NULL; - if (gMapHeader.mapData->secondaryTileset && gMapHeader.mapData->secondaryTileset->callback) - gMapHeader.mapData->secondaryTileset->callback(); + if (gMapHeader.mapLayout->secondaryTileset && gMapHeader.mapLayout->secondaryTileset->callback) + gMapHeader.mapLayout->secondaryTileset->callback(); } void TilesetCb_General(void) diff --git a/src/tv.c b/src/tv.c index 2219a720b6..d32a8940ed 100644 --- a/src/tv.c +++ b/src/tv.c @@ -1958,7 +1958,7 @@ void sub_80EDB44(void) show->rivalTrainer.dexCount = GetHoennPokedexCount(0x01); } show->rivalTrainer.location = gMapHeader.regionMapSectionId; - show->rivalTrainer.mapDataId = gMapHeader.mapDataId; + show->rivalTrainer.mapLayoutId = gMapHeader.mapLayoutId; show->rivalTrainer.nSilverSymbols = 0; show->rivalTrainer.nGoldSymbols = 0; for (i = 0; i < 7; i ++) @@ -2010,7 +2010,7 @@ void sub_80EDCE8(void) show->treasureInvestigators.active = FALSE; show->treasureInvestigators.item = gSpecialVar_0x8005; show->treasureInvestigators.location = gMapHeader.regionMapSectionId; - show->treasureInvestigators.mapDataId = gMapHeader.mapDataId; + show->treasureInvestigators.mapLayoutId = gMapHeader.mapLayoutId; StringCopy(show->treasureInvestigators.playerName, gSaveBlock2Ptr->playerName); tv_store_id_3x(show); show->treasureInvestigators.language = gGameLanguage; @@ -6261,7 +6261,7 @@ static void DoTVShowTodaysRivalTrainer(void) sTVShowState = 8; break; case MAPSEC_DYNAMIC: - switch (show->rivalTrainer.mapDataId) + switch (show->rivalTrainer.mapLayoutId) { case 0x115 ... 0x117: sTVShowState = 10; @@ -6460,7 +6460,7 @@ static void DoTVShowHoennTreasureInvestigators(void) StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item)); if (show->treasureInvestigators.location == MAPSEC_DYNAMIC) { - switch (show->treasureInvestigators.mapDataId) + switch (show->treasureInvestigators.mapLayoutId) { case 0x115 ... 0x117: sTVShowState = 2; diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 862672e198..6beacf0a2b 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -4613,7 +4613,7 @@ static u16 GetRoute119WaterTileNum(s16 x, s16 y, u8 section) for (yCur = yMin; yCur <= yMax; yCur++) { - for (xCur = 0; xCur < gMapHeader.mapData->width; xCur++) + for (xCur = 0; xCur < gMapHeader.mapLayout->width; xCur++) { u8 tileBehaviorId = MapGridGetMetatileBehaviorAt(xCur + 7, yCur + 7); if (MetatileBehavior_IsSurfableAndNotWaterfall(tileBehaviorId) == TRUE) @@ -4976,7 +4976,7 @@ static bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 ar level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]); if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(level)) return FALSE; - if (gMapHeader.mapDataId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) + if (gMapHeader.mapLayoutId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) return FALSE; CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level); @@ -5037,7 +5037,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility) { u32 ability = GetMonAbility(&gPlayerParty[0]); - if (ability == ABILITY_STENCH && gMapHeader.mapDataId == 0x169) + if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == 0x169) encounterRate = encounterRate * 3 / 4; else if (ability == ABILITY_STENCH) encounterRate /= 2; @@ -5085,7 +5085,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) // invalid { - if (gMapHeader.mapDataId == 0x166) + if (gMapHeader.mapLayoutId == 0x166) { headerId = GetBattlePikeWildMonHeaderId(); if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -5100,7 +5100,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) { headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -5228,7 +5228,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) // invalid { - if (gMapHeader.mapDataId == 0x166) + if (gMapHeader.mapLayoutId == 0x166) { headerId = GetBattlePikeWildMonHeaderId(); if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) @@ -5238,7 +5238,7 @@ bool8 SweetScentWildEncounter(void) BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapDataId == 0x169) + if (gMapHeader.mapLayoutId == 0x169) { headerId = gSaveBlock2Ptr->battlePyramidWildHeaderId; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) From 5e00c0bfcf54271b392dd1b83a901c7d623ce704 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:42:01 -0500 Subject: [PATCH 6/9] Fix map constants --- data/event_scripts.s | 4 +- data/map_events.s | 4 +- .../events.inc | 2 +- .../events.inc | 4 +- .../events.inc | 2 +- .../EverGrandeCity_ChampionsRoom/events.inc | 2 +- .../maps/EverGrandeCity_DrakesRoom/events.inc | 4 +- .../EverGrandeCity_GlaciasRoom/events.inc | 4 +- .../EverGrandeCity_PhoebesRoom/events.inc | 4 +- .../events.inc | 4 +- .../EverGrandeCity_SidneysRoom/events.inc | 4 +- data/maps/Route110/events.inc | 8 +-- .../events.inc | 16 ----- .../header.inc | 15 ---- .../scripts.inc | 50 -------------- .../events.inc | 16 ----- .../header.inc | 15 ---- .../scripts.inc | 69 ------------------- .../events.inc | 16 +++++ .../header.inc | 15 ++++ .../scripts.inc | 50 ++++++++++++++ .../events.inc | 16 +++++ .../header.inc | 15 ++++ .../scripts.inc | 69 +++++++++++++++++++ data/maps/groups.inc | 4 +- data/maps/headers.inc | 4 +- include/constants/maps.h | 20 +++--- src/wild_encounter.c | 12 ++-- 28 files changed, 224 insertions(+), 224 deletions(-) delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc diff --git a/data/event_scripts.s b/data/event_scripts.s index 4ad0ad60dd..0336c0c97c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -767,8 +767,8 @@ SecretBase_RedCave1_Text_23B759: @ 823B759 .include "data/maps/Route110_TrickHousePuzzle6/scripts.inc" .include "data/maps/Route110_TrickHousePuzzle7/scripts.inc" .include "data/maps/Route110_TrickHousePuzzle8/scripts.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc" .include "data/maps/Route113_GlassWorkshop/scripts.inc" .include "data/maps/Route123_BerryMastersHouse/scripts.inc" .include "data/maps/Route119_WeatherInstitute_1F/scripts.inc" diff --git a/data/map_events.s b/data/map_events.s index aca9978e48..4fcfb59796 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -518,8 +518,8 @@ .include "data/maps/Route110_TrickHousePuzzle6/events.inc" .include "data/maps/Route110_TrickHousePuzzle7/events.inc" .include "data/maps/Route110_TrickHousePuzzle8/events.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc" .include "data/maps/Route113_GlassWorkshop/events.inc" .include "data/maps/Route123_BerryMastersHouse/events.inc" .include "data/maps/Route119_WeatherInstitute_1F/events.inc" diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc index c9eeaff22b..049c263da7 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc index c8e9bbeeba..5af05a4712 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc @@ -1,6 +1,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 - warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F - warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc index 953eef5581..a17416bd31 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -1,5 +1,5 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC - warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 6226fe527c..c97236e419 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -4,7 +4,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 56eda43748..90c9af1c4a 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4 EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index c8d85fd988..5490ed006f 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index c9b5ef7fd2..296fe32400 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc index 536dbf934b..ff2ca71c2b 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -7,8 +7,8 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY - warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 - warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 + warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index 1823af7cd5..af4c5de980 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index c982ededf5..a38375d8e5 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -39,10 +39,10 @@ Route110_EventObjects: @ 8528CF0 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE Route110_MapCoordEvents: @ 8529080 coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc deleted file mode 100644 index ed1750f79f..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0 - -Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 - warp_def 1, 5, 0, 4, MAP_ROUTE110 - warp_def 2, 5, 0, 4, MAP_ROUTE110 - warp_def 12, 5, 0, 5, MAP_ROUTE110 - warp_def 13, 5, 0, 5, MAP_ROUTE110 - -Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6 - -Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8 - map_events Route110_SeasideCyclingRoadEntrance1_EventObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc deleted file mode 100644 index a2d6a37a5d..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadEntrance1: @ 8485C80 - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadEntrance1_MapEvents - .4byte Route110_SeasideCyclingRoadEntrance1_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte 256 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc deleted file mode 100644 index 9579df56c5..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc +++ /dev/null @@ -1,50 +0,0 @@ -Route110_SeasideCyclingRoadEntrance1_MapScripts:: @ 826EA77 - .byte 0 - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78 - lock - faceplayer - msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EAC1, 4 - release - end - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84 - lockall - specialvar VAR_RESULT, GetPlayerAvatarBike - compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F - setflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 1 - releaseall - end - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F - msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EB48, 4 - closemessage - applymovement 255, Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4 - waitmovement 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4 - walk_left - step_end - -Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6 - lockall - clearflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance1_Text_26EAC1: @ 826EAC1 - .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" - .string "It feels great to go that fast, but try\n" - .string "not to crash into anyone!$" - -Route110_SeasideCyclingRoadEntrance1_Text_26EB48: @ 826EB48 - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" - .string "Please come back with a BIKE.$" - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc deleted file mode 100644 index 5ad30e6c1f..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0 - -Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 - warp_def 1, 5, 0, 2, MAP_ROUTE110 - warp_def 2, 5, 0, 2, MAP_ROUTE110 - warp_def 12, 5, 0, 3, MAP_ROUTE110 - warp_def 13, 5, 0, 3, MAP_ROUTE110 - -Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13 - -Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64 - map_events Route110_SeasideCyclingRoadEntrance2_EventObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc deleted file mode 100644 index 1720a77a25..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadEntrance2: @ 8485C9C - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadEntrance2_MapEvents - .4byte Route110_SeasideCyclingRoadEntrance2_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte 256 - .byte 25 - .byte 0 - .byte 0 - .byte 8 - .2byte 0 - .byte 1 - .byte 0 - diff --git a/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc deleted file mode 100644 index 499969d6eb..0000000000 --- a/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc +++ /dev/null @@ -1,69 +0,0 @@ -Route110_SeasideCyclingRoadEntrance2_MapScripts:: @ 826EBA1 - map_script 3, Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7 - .byte 0 - -Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7: @ 826EBA7 - compare VAR_0x40A9, 3 - call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE - compare VAR_0x40A9, 2 - call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE - end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE:: @ 826EBBE - setvar VAR_0x40A9, 1 - return - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4 - lock - faceplayer - msgbox Route110_SeasideCyclingRoadEntrance2_Text_26EC23, 4 - release - end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0 - lockall - specialvar VAR_RESULT, GetPlayerAvatarBike - compare VAR_RESULT, 2 - call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6 - compare VAR_RESULT, 0 - goto_eq Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC - setflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 1 - releaseall - end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6:: @ 826EBF6 - setvar VAR_0x40A9, 1 - return - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC - msgbox Route110_SeasideCyclingRoadEntrance2_Text_26ECAA, 4 - closemessage - applymovement 255, Route110_SeasideCyclingRoadEntrance2_Movement_26EC11 - waitmovement 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11 - walk_left - step_end - -Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13 - lockall - setvar VAR_0x40A9, 0 - clearflag FLAG_SYS_CYCLING_ROAD - setvar VAR_TEMP_1, 0 - releaseall - end - -Route110_SeasideCyclingRoadEntrance2_Text_26EC23: @ 826EC23 - .string "On CYCLING ROAD, you can go all out\n" - .string "and cycle as fast as you’d like.\p" - .string "It feels great to go that fast, but try\n" - .string "not to crash into anyone!$" - -Route110_SeasideCyclingRoadEntrance2_Text_26ECAA: @ 826ECAA - .string "Sorry, you can’t walk on CYCLING\n" - .string "ROAD. It’s too dangerous.\p" - .string "Please come back with a BIKE.$" - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc new file mode 100644 index 0000000000..adb59f580e --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -0,0 +1,16 @@ +Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 + +Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 + warp_def 1, 5, 0, 4, MAP_ROUTE110 + warp_def 2, 5, 0, 4, MAP_ROUTE110 + warp_def 12, 5, 0, 5, MAP_ROUTE110 + warp_def 13, 5, 0, 5, MAP_ROUTE110 + +Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 + +Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8 + map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 + diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc new file mode 100644 index 0000000000..35a466e1e2 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -0,0 +1,15 @@ +Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 + .4byte Route110_SeasideCyclingRoadEntrance_Layout + .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents + .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts + .4byte 0x0 + .2byte MUS_FINECITY + .2byte 256 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 + diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc new file mode 100644 index 0000000000..cbb5070a2a --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -0,0 +1,50 @@ +Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77 + .byte 0 + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78 + lock + faceplayer + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, 4 + release + end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84 + lockall + specialvar VAR_RESULT, GetPlayerAvatarBike + compare VAR_RESULT, 0 + goto_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F + setflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 1 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F + msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, 4 + closemessage + applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4 + waitmovement 0 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4: @ 826EAB4 + walk_left + step_end + +Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6 + lockall + clearflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 0 + releaseall + end + +Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1 + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" + +Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48 + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" + diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc new file mode 100644 index 0000000000..5def6e102b --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -0,0 +1,16 @@ +Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 + +Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 + warp_def 1, 5, 0, 2, MAP_ROUTE110 + warp_def 2, 5, 0, 2, MAP_ROUTE110 + warp_def 12, 5, 0, 3, MAP_ROUTE110 + warp_def 13, 5, 0, 3, MAP_ROUTE110 + +Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 + +Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64 + map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 + diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc new file mode 100644 index 0000000000..2529d7366b --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -0,0 +1,15 @@ +Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C + .4byte Route110_SeasideCyclingRoadEntrance_Layout + .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents + .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts + .4byte 0x0 + .2byte MUS_FINECITY + .2byte 256 + .byte 25 + .byte 0 + .byte 0 + .byte 8 + .2byte 0 + .byte 1 + .byte 0 + diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc new file mode 100644 index 0000000000..9f99cf44f3 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -0,0 +1,69 @@ +Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 + map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + .byte 0 + +Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 + compare VAR_0x40A9, 3 + call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + compare VAR_0x40A9, 2 + call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE + setvar VAR_0x40A9, 1 + return + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4 + lock + faceplayer + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, 4 + release + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0 + lockall + specialvar VAR_RESULT, GetPlayerAvatarBike + compare VAR_RESULT, 2 + call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6 + compare VAR_RESULT, 0 + goto_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC + setflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 1 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6 + setvar VAR_0x40A9, 1 + return + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC + msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, 4 + closemessage + applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11 + waitmovement 0 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11 + walk_left + step_end + +Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13 + lockall + setvar VAR_0x40A9, 0 + clearflag FLAG_SYS_CYCLING_ROAD + setvar VAR_TEMP_1, 0 + releaseall + end + +Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23 + .string "On CYCLING ROAD, you can go all out\n" + .string "and cycle as fast as you’d like.\p" + .string "It feels great to go that fast, but try\n" + .string "not to crash into anyone!$" + +Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA + .string "Sorry, you can’t walk on CYCLING\n" + .string "ROAD. It’s too dangerous.\p" + .string "Please come back with a BIKE.$" + diff --git a/data/maps/groups.inc b/data/maps/groups.inc index f7fc7be897..77f9c4441b 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -567,8 +567,8 @@ gMapGroup29: @ 848652C .4byte Route110_TrickHousePuzzle6 .4byte Route110_TrickHousePuzzle7 .4byte Route110_TrickHousePuzzle8 - .4byte Route110_SeasideCyclingRoadEntrance1 - .4byte Route110_SeasideCyclingRoadEntrance2 + .4byte Route110_SeasideCyclingRoadNorthEntrance + .4byte Route110_SeasideCyclingRoadSouthEntrance gMapGroup30: @ 8486560 .4byte Route113_GlassWorkshop diff --git a/data/maps/headers.inc b/data/maps/headers.inc index 58d2cc66cb..b4be3ab0c2 100644 --- a/data/maps/headers.inc +++ b/data/maps/headers.inc @@ -508,8 +508,8 @@ .include "data/maps/Route110_TrickHousePuzzle6/header.inc" .include "data/maps/Route110_TrickHousePuzzle7/header.inc" .include "data/maps/Route110_TrickHousePuzzle8/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc" + .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc" .include "data/maps/Route113_GlassWorkshop/header.inc" .include "data/maps/Route123_BerryMastersHouse/header.inc" .include "data/maps/Route119_WeatherInstitute_1F/header.inc" diff --git a/include/constants/maps.h b/include/constants/maps.h index f6096e1c5b..bcb7784221 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -250,11 +250,11 @@ #define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR1 (5 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR2 (6 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR3 (7 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR4 (8 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CORRIDOR5 (9 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) @@ -327,9 +327,9 @@ #define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) #define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) #define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F (39 | (24 << 8)) // -#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F (40 | (24 << 8)) // Ruby/Sapphire leftovers -#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F (41 | (24 << 8)) // +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) // +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) // Ruby/Sapphire leftovers +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) // #define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) #define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) #define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) @@ -570,8 +570,8 @@ #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (11 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (12 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8)) // Map Group 30 #define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 6beacf0a2b..82ef742133 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -3821,24 +3821,24 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B1F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B1F), + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1), .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B2F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B2F), + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2), .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B3F), - .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B3F), + .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), + .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3), .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, From 91ee3221b3a4885d155ad2cca16b7678062ad18a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:42:34 -0500 Subject: [PATCH 7/9] Formatting --- .../AbandonedShip_CaptainsOffice/layout.inc | 3 +- .../AbandonedShip_Corridors_1F/layout.inc | 3 +- .../AbandonedShip_Corridors_B1F/layout.inc | 3 +- data/layouts/AbandonedShip_Deck/layout.inc | 3 +- .../layout.inc | 3 +- .../AbandonedShip_HiddenFloorRooms/layout.inc | 3 +- .../layouts/AbandonedShip_Room_B1F/layout.inc | 3 +- .../AbandonedShip_Rooms2_1F/layout.inc | 3 +- .../AbandonedShip_Rooms2_B1F/layout.inc | 3 +- .../layouts/AbandonedShip_Rooms_1F/layout.inc | 3 +- .../AbandonedShip_Rooms_B1F/layout.inc | 3 +- .../AbandonedShip_Underwater1/layout.inc | 3 +- .../AbandonedShip_Underwater2/layout.inc | 3 +- data/layouts/AlteringCave/layout.inc | 3 +- data/layouts/AncientTomb/layout.inc | 3 +- data/layouts/AquaHideout_1F/layout.inc | 3 +- data/layouts/AquaHideout_B1F/layout.inc | 3 +- data/layouts/AquaHideout_B2F/layout.inc | 3 +- .../AquaHideout_UnusedRubyMap1/layout.inc | 3 +- .../AquaHideout_UnusedRubyMap2/layout.inc | 3 +- .../AquaHideout_UnusedRubyMap3/layout.inc | 3 +- data/layouts/ArtisanCave_1F/layout.inc | 3 +- data/layouts/ArtisanCave_B1F/layout.inc | 3 +- data/layouts/BattleElevator/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../BattleFrontier_BattleDomeLobby/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../BattleFrontier_BattlePikeLobby/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layouts/BattleFrontier_Lounge1/layout.inc | 3 +- .../layouts/BattleFrontier_Lounge2/layout.inc | 3 +- .../BattleFrontier_OutsideEast/layout.inc | 3 +- .../BattleFrontier_OutsideWest/layout.inc | 3 +- .../BattleFrontier_RankingHall/layout.inc | 3 +- .../BattleFrontier_ReceptionGate/layout.inc | 3 +- .../BattleFrontier_ScottsHouse/layout.inc | 3 +- data/layouts/BattlePyramidSquare01/layout.inc | 3 +- data/layouts/BattlePyramidSquare02/layout.inc | 3 +- data/layouts/BattlePyramidSquare03/layout.inc | 3 +- data/layouts/BattlePyramidSquare04/layout.inc | 3 +- data/layouts/BattlePyramidSquare05/layout.inc | 3 +- data/layouts/BattlePyramidSquare06/layout.inc | 3 +- data/layouts/BattlePyramidSquare07/layout.inc | 3 +- data/layouts/BattlePyramidSquare08/layout.inc | 3 +- data/layouts/BattlePyramidSquare09/layout.inc | 3 +- data/layouts/BattlePyramidSquare10/layout.inc | 3 +- data/layouts/BattlePyramidSquare11/layout.inc | 3 +- data/layouts/BattlePyramidSquare12/layout.inc | 3 +- data/layouts/BattlePyramidSquare13/layout.inc | 3 +- data/layouts/BattlePyramidSquare14/layout.inc | 3 +- data/layouts/BattlePyramidSquare15/layout.inc | 3 +- data/layouts/BattlePyramidSquare16/layout.inc | 3 +- data/layouts/BattleTentBattleRoom/layout.inc | 3 +- data/layouts/BattleTentCorridor/layout.inc | 3 +- data/layouts/BattleTentLobby/layout.inc | 3 +- data/layouts/BirthIsland_Exterior/layout.inc | 3 +- data/layouts/CableCarStation/layout.inc | 3 +- data/layouts/CaveOfOrigin_1F/layout.inc | 3 +- data/layouts/CaveOfOrigin_B1F/layout.inc | 3 +- data/layouts/CaveOfOrigin_Entrance/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/DesertRuins/layout.inc | 3 +- data/layouts/DesertUnderpass/layout.inc | 3 +- data/layouts/DewfordTown/layout.inc | 3 +- data/layouts/DewfordTown_Gym/layout.inc | 3 +- data/layouts/DewfordTown_Hall/layout.inc | 3 +- data/layouts/DoubleBattleColosseum/layout.inc | 3 +- data/layouts/EverGrandeCity/layout.inc | 3 +- .../EverGrandeCity_ChampionsRoom/layout.inc | 3 +- .../EverGrandeCity_DrakesRoom/layout.inc | 3 +- .../EverGrandeCity_GlaciasRoom/layout.inc | 3 +- data/layouts/EverGrandeCity_Hall4/layout.inc | 3 +- .../EverGrandeCity_HallOfFame/layout.inc | 3 +- .../EverGrandeCity_PhoebesRoom/layout.inc | 3 +- .../layout.inc | 3 +- .../EverGrandeCity_ShortHall/layout.inc | 3 +- .../EverGrandeCity_SidneysRoom/layout.inc | 3 +- data/layouts/FallarborTown/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layouts/FarawayIsland_Entrance/layout.inc | 3 +- .../layouts/FarawayIsland_Interior/layout.inc | 3 +- data/layouts/FieryPath/layout.inc | 3 +- data/layouts/FortreeCity/layout.inc | 3 +- .../FortreeCity_DecorationShop/layout.inc | 3 +- data/layouts/FortreeCity_Gym/layout.inc | 3 +- data/layouts/FortreeCity_House1/layout.inc | 3 +- data/layouts/FortreeCity_House2/layout.inc | 3 +- data/layouts/GraniteCave_1F/layout.inc | 3 +- data/layouts/GraniteCave_B1F/layout.inc | 3 +- data/layouts/GraniteCave_B2F/layout.inc | 3 +- .../GraniteCave_StevensRoom/layout.inc | 3 +- data/layouts/Harbor/layout.inc | 3 +- data/layouts/House1/layout.inc | 3 +- data/layouts/House2/layout.inc | 3 +- data/layouts/House3/layout.inc | 3 +- data/layouts/House4/layout.inc | 3 +- data/layouts/HouseWithBed/layout.inc | 3 +- data/layouts/InsideOfTruck/layout.inc | 3 +- data/layouts/IslandCave/layout.inc | 3 +- data/layouts/IslandHarbor/layout.inc | 3 +- data/layouts/JaggedPass/layout.inc | 3 +- data/layouts/LavaridgeTown/layout.inc | 3 +- data/layouts/LavaridgeTown_Gym_1F/layout.inc | 3 +- data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 3 +- .../layouts/LavaridgeTown_HerbShop/layout.inc | 3 +- .../LavaridgeTown_PokemonCenter_1F/layout.inc | 3 +- data/layouts/LilycoveCity/layout.inc | 3 +- .../LilycoveCity_ContestHall/layout.inc | 3 +- .../LilycoveCity_ContestLobby/layout.inc | 3 +- .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 3 +- .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/LilycoveCity_House2/layout.inc | 3 +- .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 3 +- .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/LinkContestRoom1/layout.inc | 3 +- data/layouts/LinkContestRoom2/layout.inc | 3 +- data/layouts/LinkContestRoom3/layout.inc | 3 +- data/layouts/LinkContestRoom4/layout.inc | 3 +- data/layouts/LinkContestRoom5/layout.inc | 3 +- data/layouts/LinkContestRoom6/layout.inc | 3 +- data/layouts/LittlerootTown/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../LittlerootTown_MaysHouse_1F/layout.inc | 3 +- .../LittlerootTown_MaysHouse_2F/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/MagmaHideout_1F/layout.inc | 3 +- data/layouts/MagmaHideout_2F_1R/layout.inc | 3 +- data/layouts/MagmaHideout_2F_2R/layout.inc | 3 +- data/layouts/MagmaHideout_2F_3R/layout.inc | 3 +- data/layouts/MagmaHideout_3F_1R/layout.inc | 3 +- data/layouts/MagmaHideout_3F_2R/layout.inc | 3 +- data/layouts/MagmaHideout_3F_3R/layout.inc | 3 +- data/layouts/MagmaHideout_4F/layout.inc | 3 +- data/layouts/MarineCave_End/layout.inc | 3 +- data/layouts/MarineCave_Entrance/layout.inc | 3 +- data/layouts/Mart/layout.inc | 3 +- data/layouts/MauvilleCity/layout.inc | 3 +- data/layouts/MauvilleCity_BikeShop/layout.inc | 3 +- .../MauvilleCity_GameCorner/layout.inc | 3 +- data/layouts/MauvilleCity_Gym/layout.inc | 3 +- data/layouts/MeteorFalls_1F_1R/layout.inc | 3 +- data/layouts/MeteorFalls_1F_2R/layout.inc | 3 +- data/layouts/MeteorFalls_B1F_1R/layout.inc | 3 +- data/layouts/MeteorFalls_B1F_2R/layout.inc | 3 +- .../MeteorFalls_StevensCave/layout.inc | 3 +- data/layouts/MirageTower_1F/layout.inc | 3 +- data/layouts/MirageTower_2F/layout.inc | 3 +- data/layouts/MirageTower_3F/layout.inc | 3 +- data/layouts/MirageTower_4F/layout.inc | 3 +- data/layouts/MossdeepCity/layout.inc | 3 +- .../MossdeepCity_GameCorner_1F/layout.inc | 3 +- .../MossdeepCity_GameCorner_B1F/layout.inc | 3 +- data/layouts/MossdeepCity_Gym/layout.inc | 3 +- .../MossdeepCity_SpaceCenter_1F/layout.inc | 3 +- .../MossdeepCity_SpaceCenter_2F/layout.inc | 3 +- .../MossdeepCity_StevensHouse/layout.inc | 3 +- data/layouts/MtChimney/layout.inc | 3 +- data/layouts/MtPyre_1F/layout.inc | 3 +- data/layouts/MtPyre_2F/layout.inc | 3 +- data/layouts/MtPyre_3F/layout.inc | 3 +- data/layouts/MtPyre_4F/layout.inc | 3 +- data/layouts/MtPyre_5F/layout.inc | 3 +- data/layouts/MtPyre_6F/layout.inc | 3 +- data/layouts/MtPyre_Exterior/layout.inc | 3 +- data/layouts/MtPyre_Summit/layout.inc | 3 +- data/layouts/NavelRock_B1F/layout.inc | 3 +- data/layouts/NavelRock_Bottom/layout.inc | 3 +- data/layouts/NavelRock_Entrance/layout.inc | 3 +- data/layouts/NavelRock_Exterior/layout.inc | 3 +- data/layouts/NavelRock_Fork/layout.inc | 3 +- data/layouts/NavelRock_LadderRoom1/layout.inc | 3 +- data/layouts/NavelRock_LadderRoom2/layout.inc | 3 +- data/layouts/NavelRock_Top/layout.inc | 3 +- data/layouts/NewMauville_Entrance/layout.inc | 3 +- data/layouts/NewMauville_Inside/layout.inc | 3 +- data/layouts/OldaleTown/layout.inc | 3 +- data/layouts/PacifidlogTown/layout.inc | 3 +- data/layouts/PacifidlogTown_House1/layout.inc | 3 +- data/layouts/PacifidlogTown_House2/layout.inc | 3 +- data/layouts/PetalburgCity/layout.inc | 3 +- data/layouts/PetalburgCity_Gym/layout.inc | 3 +- data/layouts/PetalburgWoods/layout.inc | 3 +- data/layouts/PokemonCenter_1F/layout.inc | 3 +- data/layouts/PokemonCenter_2F/layout.inc | 3 +- data/layouts/RecordCorner/layout.inc | 3 +- data/layouts/Route101/layout.inc | 3 +- data/layouts/Route102/layout.inc | 3 +- data/layouts/Route103/layout.inc | 3 +- data/layouts/Route104/layout.inc | 3 +- .../Route104_MrBrineysHouse/layout.inc | 3 +- .../Route104_PrettyPetalFlowerShop/layout.inc | 3 +- data/layouts/Route104_Prototype/layout.inc | 3 +- data/layouts/Route105/layout.inc | 3 +- data/layouts/Route106/layout.inc | 3 +- data/layouts/Route107/layout.inc | 3 +- data/layouts/Route108/layout.inc | 3 +- data/layouts/Route109/layout.inc | 3 +- .../layouts/Route109_SeashoreHouse/layout.inc | 3 +- data/layouts/Route110/layout.inc | 3 +- .../layout.inc | 3 +- .../Route110_TrickHouseCorridor/layout.inc | 3 +- .../layouts/Route110_TrickHouseEnd/layout.inc | 3 +- .../Route110_TrickHouseEntrance/layout.inc | 3 +- .../Route110_TrickHousePuzzle1/layout.inc | 3 +- .../Route110_TrickHousePuzzle2/layout.inc | 3 +- .../Route110_TrickHousePuzzle3/layout.inc | 3 +- .../Route110_TrickHousePuzzle4/layout.inc | 3 +- .../Route110_TrickHousePuzzle5/layout.inc | 3 +- .../Route110_TrickHousePuzzle6/layout.inc | 3 +- .../Route110_TrickHousePuzzle7/layout.inc | 3 +- .../Route110_TrickHousePuzzle8/layout.inc | 3 +- data/layouts/Route111/layout.inc | 3 +- data/layouts/Route112/layout.inc | 3 +- data/layouts/Route113/layout.inc | 3 +- data/layouts/Route114/layout.inc | 3 +- .../Route114_FossilManiacsHouse/layout.inc | 3 +- .../Route114_FossilManiacsTunnel/layout.inc | 3 +- .../layouts/Route114_LanettesHouse/layout.inc | 3 +- data/layouts/Route115/layout.inc | 3 +- data/layouts/Route116/layout.inc | 3 +- .../Route116_TunnelersRestHouse/layout.inc | 3 +- data/layouts/Route117/layout.inc | 3 +- .../Route117_PokemonDayCare/layout.inc | 3 +- data/layouts/Route118/layout.inc | 3 +- data/layouts/Route119/layout.inc | 3 +- .../Route119_WeatherInstitute_1F/layout.inc | 3 +- .../Route119_WeatherInstitute_2F/layout.inc | 3 +- data/layouts/Route120/layout.inc | 3 +- data/layouts/Route121/layout.inc | 3 +- .../Route121_SafariZoneEntrance/layout.inc | 3 +- data/layouts/Route122/layout.inc | 3 +- data/layouts/Route123/layout.inc | 3 +- data/layouts/Route124/layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/Route125/layout.inc | 3 +- data/layouts/Route126/layout.inc | 3 +- data/layouts/Route127/layout.inc | 3 +- data/layouts/Route128/layout.inc | 3 +- data/layouts/Route129/layout.inc | 3 +- data/layouts/Route130/layout.inc | 3 +- data/layouts/Route131/layout.inc | 3 +- data/layouts/Route132/layout.inc | 3 +- data/layouts/Route133/layout.inc | 3 +- data/layouts/Route134/layout.inc | 3 +- data/layouts/RustboroCity/layout.inc | 3 +- .../RustboroCity_CuttersHouse/layout.inc | 3 +- .../RustboroCity_DevonCorp_1F/layout.inc | 3 +- .../RustboroCity_DevonCorp_2F/layout.inc | 3 +- .../RustboroCity_DevonCorp_3F/layout.inc | 3 +- data/layouts/RustboroCity_Flat1_1F/layout.inc | 3 +- data/layouts/RustboroCity_Flat1_2F/layout.inc | 3 +- data/layouts/RustboroCity_Flat2_1F/layout.inc | 3 +- data/layouts/RustboroCity_Flat2_2F/layout.inc | 3 +- data/layouts/RustboroCity_Flat2_3F/layout.inc | 3 +- data/layouts/RustboroCity_Gym/layout.inc | 3 +- data/layouts/RustboroCity_House/layout.inc | 3 +- data/layouts/RustboroCity_House1/layout.inc | 3 +- .../RustboroCity_PokemonSchool/layout.inc | 3 +- data/layouts/RusturfTunnel/layout.inc | 3 +- data/layouts/SSTidalCorridor/layout.inc | 3 +- data/layouts/SSTidalLowerDeck/layout.inc | 3 +- data/layouts/SSTidalRooms/layout.inc | 3 +- data/layouts/SafariZone_North/layout.inc | 3 +- data/layouts/SafariZone_Northeast/layout.inc | 3 +- data/layouts/SafariZone_Northwest/layout.inc | 3 +- data/layouts/SafariZone_RestHouse/layout.inc | 3 +- data/layouts/SafariZone_South/layout.inc | 3 +- data/layouts/SafariZone_Southeast/layout.inc | 3 +- data/layouts/SafariZone_Southwest/layout.inc | 3 +- data/layouts/ScorchedSlab/layout.inc | 3 +- .../SeafloorCavern_Entrance/layout.inc | 3 +- data/layouts/SeafloorCavern_Room1/layout.inc | 3 +- data/layouts/SeafloorCavern_Room2/layout.inc | 3 +- data/layouts/SeafloorCavern_Room3/layout.inc | 3 +- data/layouts/SeafloorCavern_Room4/layout.inc | 3 +- data/layouts/SeafloorCavern_Room5/layout.inc | 3 +- data/layouts/SeafloorCavern_Room6/layout.inc | 3 +- data/layouts/SeafloorCavern_Room7/layout.inc | 3 +- data/layouts/SeafloorCavern_Room8/layout.inc | 3 +- data/layouts/SeafloorCavern_Room9/layout.inc | 3 +- .../SealedChamber_InnerRoom/layout.inc | 3 +- .../SealedChamber_OuterRoom/layout.inc | 3 +- data/layouts/SecretBase_BlueCave1/layout.inc | 3 +- data/layouts/SecretBase_BlueCave2/layout.inc | 3 +- data/layouts/SecretBase_BlueCave3/layout.inc | 3 +- data/layouts/SecretBase_BlueCave4/layout.inc | 3 +- data/layouts/SecretBase_BrownCave1/layout.inc | 3 +- data/layouts/SecretBase_BrownCave2/layout.inc | 3 +- data/layouts/SecretBase_BrownCave3/layout.inc | 3 +- data/layouts/SecretBase_BrownCave4/layout.inc | 3 +- data/layouts/SecretBase_RedCave1/layout.inc | 3 +- data/layouts/SecretBase_RedCave2/layout.inc | 3 +- data/layouts/SecretBase_RedCave3/layout.inc | 3 +- data/layouts/SecretBase_RedCave4/layout.inc | 3 +- data/layouts/SecretBase_Shrub1/layout.inc | 3 +- data/layouts/SecretBase_Shrub2/layout.inc | 3 +- data/layouts/SecretBase_Shrub3/layout.inc | 3 +- data/layouts/SecretBase_Shrub4/layout.inc | 3 +- data/layouts/SecretBase_Tree1/layout.inc | 3 +- data/layouts/SecretBase_Tree2/layout.inc | 3 +- data/layouts/SecretBase_Tree3/layout.inc | 3 +- data/layouts/SecretBase_Tree4/layout.inc | 3 +- .../layouts/SecretBase_YellowCave1/layout.inc | 3 +- .../layouts/SecretBase_YellowCave2/layout.inc | 3 +- .../layouts/SecretBase_YellowCave3/layout.inc | 3 +- .../layouts/SecretBase_YellowCave4/layout.inc | 3 +- .../ShoalCave_HighTideEntranceRoom/layout.inc | 3 +- .../ShoalCave_HighTideInnerRoom/layout.inc | 3 +- .../ShoalCave_LowTideEntranceRoom/layout.inc | 3 +- .../ShoalCave_LowTideIceRoom/layout.inc | 3 +- .../ShoalCave_LowTideInnerRoom/layout.inc | 3 +- .../ShoalCave_LowTideLowerRoom/layout.inc | 3 +- .../ShoalCave_LowTideStairsRoom/layout.inc | 3 +- data/layouts/SingleBattleColosseum/layout.inc | 3 +- data/layouts/SkyPillar_1F/layout.inc | 3 +- data/layouts/SkyPillar_2F/layout.inc | 3 +- data/layouts/SkyPillar_3F/layout.inc | 3 +- data/layouts/SkyPillar_4F/layout.inc | 3 +- data/layouts/SkyPillar_5F/layout.inc | 3 +- data/layouts/SkyPillar_Entrance/layout.inc | 3 +- data/layouts/SkyPillar_Outside/layout.inc | 3 +- data/layouts/SkyPillar_Top/layout.inc | 3 +- data/layouts/SlateportCity/layout.inc | 3 +- .../SlateportCity_OceanicMuseum_1F/layout.inc | 3 +- .../SlateportCity_OceanicMuseum_2F/layout.inc | 3 +- .../SlateportCity_PokemonFanClub/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- data/layouts/SootopolisCity/layout.inc | 3 +- data/layouts/SootopolisCity_Gym_1F/layout.inc | 3 +- .../layouts/SootopolisCity_Gym_B1F/layout.inc | 3 +- data/layouts/SootopolisCity_House1/layout.inc | 3 +- data/layouts/SootopolisCity_House2/layout.inc | 3 +- data/layouts/SootopolisCity_House3/layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../layout.inc | 3 +- .../SouthernIsland_Exterior/layout.inc | 3 +- .../SouthernIsland_Interior/layout.inc | 3 +- data/layouts/TerraCave_End/layout.inc | 3 +- data/layouts/TerraCave_Entrance/layout.inc | 3 +- data/layouts/TradeCenter/layout.inc | 3 +- data/layouts/TrainerHill_1F/layout.inc | 3 +- data/layouts/TrainerHill_2F/layout.inc | 3 +- data/layouts/TrainerHill_3F/layout.inc | 3 +- data/layouts/TrainerHill_4F/layout.inc | 3 +- data/layouts/TrainerHill_Entrance/layout.inc | 3 +- data/layouts/TrainerHill_Roof/layout.inc | 3 +- data/layouts/Underwater1/layout.inc | 3 +- data/layouts/Underwater2/layout.inc | 3 +- data/layouts/Underwater3/layout.inc | 3 +- data/layouts/Underwater4/layout.inc | 3 +- data/layouts/Underwater5/layout.inc | 3 +- data/layouts/Underwater6/layout.inc | 3 +- data/layouts/Underwater7/layout.inc | 3 +- data/layouts/Underwater_MarineCave/layout.inc | 3 +- data/layouts/Underwater_Route134/layout.inc | 3 +- .../Underwater_SeafloorCavern/layout.inc | 3 +- .../Underwater_SealedChamber/layout.inc | 3 +- .../Underwater_SootopolisCity/layout.inc | 3 +- data/layouts/UnionRoom/layout.inc | 3 +- data/layouts/UnknownMap_08417FC4/layout.inc | 3 +- data/layouts/UnknownMap_08428450/layout.inc | 3 +- data/layouts/UnknownMap_084294C4/layout.inc | 3 +- data/layouts/UnknownMap_084294E8/layout.inc | 3 +- data/layouts/UnknownMap_0843E6C0/layout.inc | 3 +- data/layouts/UnknownMap_0843E6E4/layout.inc | 3 +- data/layouts/UnknownMap_0843E708/layout.inc | 3 +- data/layouts/UnknownMap_0843E72C/layout.inc | 3 +- data/layouts/UnknownMap_0843E750/layout.inc | 3 +- data/layouts/UnknownMap_0843E774/layout.inc | 3 +- data/layouts/UnknownMap_0843E798/layout.inc | 3 +- data/layouts/UnknownMap_0843E7BC/layout.inc | 3 +- data/layouts/UnknownMap_0843E7E0/layout.inc | 3 +- data/layouts/UnknownMap_0843E804/layout.inc | 3 +- data/layouts/UnknownMap_0843E828/layout.inc | 3 +- data/layouts/UnknownMap_0843E84C/layout.inc | 3 +- data/layouts/UnknownMap_0843E870/layout.inc | 3 +- data/layouts/UnknownMap_0843E894/layout.inc | 2 +- data/layouts/UnknownMap_08447028/layout.inc | 3 +- data/layouts/UnknownMap_0845A394/layout.inc | 3 +- data/layouts/UnknownMap_0845D470/layout.inc | 3 +- data/layouts/UnknownMap_0845ECB4/layout.inc | 3 +- data/layouts/UnknownMap_08469200/layout.inc | 3 +- data/layouts/UnknownMap_084693AC/layout.inc | 3 +- data/layouts/UnknownMap_08470BD8/layout.inc | 3 +- data/layouts/UnknownMap_08480DAC/layout.inc | 3 +- data/layouts/UnknownMap_08480F54/layout.inc | 3 +- data/layouts/UnknownMap_084810FC/layout.inc | 3 +- data/layouts/UnknownMap_084812A4/layout.inc | 3 +- data/layouts/UnknownMap_0848144C/layout.inc | 3 +- data/layouts/UnknownMap_084815F4/layout.inc | 3 +- data/layouts/UnknownMap_08481B24/layout.inc | 3 +- data/layouts/UnknownMap_08481DBC/layout.inc | 3 +- data/layouts/UnknownMap_25_29/layout.inc | 3 +- data/layouts/UnknownMap_25_30/layout.inc | 3 +- data/layouts/UnknownMap_25_31/layout.inc | 3 +- data/layouts/UnknownMap_25_32/layout.inc | 3 +- data/layouts/UnknownMap_25_33/layout.inc | 3 +- data/layouts/UnknownMap_25_34/layout.inc | 3 +- data/layouts/VerdanturfTown/layout.inc | 3 +- .../layout.inc | 3 +- .../VerdanturfTown_WandasHouse/layout.inc | 3 +- data/layouts/VictoryRoad_1F/layout.inc | 3 +- data/layouts/VictoryRoad_B1F/layout.inc | 3 +- data/layouts/VictoryRoad_B2F/layout.inc | 3 +- data/layouts_table.inc | 263 +++++++++--------- 442 files changed, 572 insertions(+), 1013 deletions(-) diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc index 8a123be4ca..d9e122ef20 100644 --- a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc +++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_CaptainsOffice_MapBorder:: .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" - .align 2 AbandonedShip_CaptainsOffice_MapBlockdata:: .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_CaptainsOffice_Layout:: .4byte AbandonedShip_CaptainsOffice_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc index f3704b1cc7..d5fd225782 100644 --- a/data/layouts/AbandonedShip_Corridors_1F/layout.inc +++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Corridors_1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin" - .align 2 AbandonedShip_Corridors_1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Corridors_1F_Layout:: .4byte AbandonedShip_Corridors_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc index 131caed67e..7299aa6f89 100644 --- a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Corridors_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin" - .align 2 AbandonedShip_Corridors_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Corridors_B1F_Layout:: .4byte AbandonedShip_Corridors_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc index 81b598fb4f..7f0baaaec2 100644 --- a/data/layouts/AbandonedShip_Deck/layout.inc +++ b/data/layouts/AbandonedShip_Deck/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Deck_MapBorder:: .incbin "data/layouts/AbandonedShip_Deck/border.bin" - .align 2 AbandonedShip_Deck_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Deck/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Deck_Layout:: .4byte AbandonedShip_Deck_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc index 1f7d3117af..0ee7aa7556 100644 --- a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc +++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_HiddenFloorCorridors_MapBorder:: .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" - .align 2 AbandonedShip_HiddenFloorCorridors_MapBlockdata:: .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_HiddenFloorCorridors_Layout:: .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc index d7b36dd8be..bf2f758d7a 100644 --- a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc +++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_HiddenFloorRooms_MapBorder:: .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" - .align 2 AbandonedShip_HiddenFloorRooms_MapBlockdata:: .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_HiddenFloorRooms_Layout:: .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc index 62c4127f8b..fdd5b395d4 100644 --- a/data/layouts/AbandonedShip_Room_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Room_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin" - .align 2 AbandonedShip_Room_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Room_B1F_Layout:: .4byte AbandonedShip_Room_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc index 26789691e8..d15652cc07 100644 --- a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms2_1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin" - .align 2 AbandonedShip_Rooms2_1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms2_1F_Layout:: .4byte AbandonedShip_Rooms2_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc index 35b92addd8..d99e43f473 100644 --- a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms2_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin" - .align 2 AbandonedShip_Rooms2_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms2_B1F_Layout:: .4byte AbandonedShip_Rooms2_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc index 0109a26f07..63e4a716a3 100644 --- a/data/layouts/AbandonedShip_Rooms_1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms_1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin" - .align 2 AbandonedShip_Rooms_1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms_1F_Layout:: .4byte AbandonedShip_Rooms_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc index 40ef7680a1..ab688d668a 100644 --- a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc +++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Rooms_B1F_MapBorder:: .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin" - .align 2 AbandonedShip_Rooms_B1F_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Rooms_B1F_Layout:: .4byte AbandonedShip_Rooms_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc index 5619d0dba4..8fa1b14859 100644 --- a/data/layouts/AbandonedShip_Underwater1/layout.inc +++ b/data/layouts/AbandonedShip_Underwater1/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Underwater1_MapBorder:: .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" - .align 2 AbandonedShip_Underwater1_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Underwater1_Layout:: .4byte AbandonedShip_Underwater1_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc index 1d123c8c7b..feea82d163 100644 --- a/data/layouts/AbandonedShip_Underwater2/layout.inc +++ b/data/layouts/AbandonedShip_Underwater2/layout.inc @@ -1,8 +1,6 @@ - .align 2 AbandonedShip_Underwater2_MapBorder:: .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" - .align 2 AbandonedShip_Underwater2_MapBlockdata:: .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" @@ -14,3 +12,4 @@ AbandonedShip_Underwater2_Layout:: .4byte AbandonedShip_Underwater2_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc index e69cc1dd0b..9f03e7d871 100644 --- a/data/layouts/AlteringCave/layout.inc +++ b/data/layouts/AlteringCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 AlteringCave_MapBorder:: .incbin "data/layouts/AlteringCave/border.bin" - .align 2 AlteringCave_MapBlockdata:: .incbin "data/layouts/AlteringCave/map.bin" @@ -14,3 +12,4 @@ AlteringCave_Layout:: .4byte AlteringCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc index 7aabb07cc0..ad173f9360 100644 --- a/data/layouts/AncientTomb/layout.inc +++ b/data/layouts/AncientTomb/layout.inc @@ -1,8 +1,6 @@ - .align 2 AncientTomb_MapBorder:: .incbin "data/layouts/AncientTomb/border.bin" - .align 2 AncientTomb_MapBlockdata:: .incbin "data/layouts/AncientTomb/map.bin" @@ -14,3 +12,4 @@ AncientTomb_Layout:: .4byte AncientTomb_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc index 645be578fd..5508a668b4 100644 --- a/data/layouts/AquaHideout_1F/layout.inc +++ b/data/layouts/AquaHideout_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_1F_MapBorder:: .incbin "data/layouts/AquaHideout_1F/border.bin" - .align 2 AquaHideout_1F_MapBlockdata:: .incbin "data/layouts/AquaHideout_1F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_1F_Layout:: .4byte AquaHideout_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc index 10cfd2d9b3..0889e548a8 100644 --- a/data/layouts/AquaHideout_B1F/layout.inc +++ b/data/layouts/AquaHideout_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_B1F_MapBorder:: .incbin "data/layouts/AquaHideout_B1F/border.bin" - .align 2 AquaHideout_B1F_MapBlockdata:: .incbin "data/layouts/AquaHideout_B1F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_B1F_Layout:: .4byte AquaHideout_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc index 188e51fcc3..9e335e5d92 100644 --- a/data/layouts/AquaHideout_B2F/layout.inc +++ b/data/layouts/AquaHideout_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_B2F_MapBorder:: .incbin "data/layouts/AquaHideout_B2F/border.bin" - .align 2 AquaHideout_B2F_MapBlockdata:: .incbin "data/layouts/AquaHideout_B2F/map.bin" @@ -14,3 +12,4 @@ AquaHideout_B2F_Layout:: .4byte AquaHideout_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc index 643993a221..05862b275b 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap1_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" - .align 2 AquaHideout_UnusedRubyMap1_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap1_Layout:: .4byte AquaHideout_UnusedRubyMap1_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc index 6fdf6b31ce..e9e08ab97f 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap2_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" - .align 2 AquaHideout_UnusedRubyMap2_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap2_Layout:: .4byte AquaHideout_UnusedRubyMap2_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc index 070fb2bace..44b35666f0 100644 --- a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc +++ b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc @@ -1,8 +1,6 @@ - .align 2 AquaHideout_UnusedRubyMap3_MapBorder:: .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" - .align 2 AquaHideout_UnusedRubyMap3_MapBlockdata:: .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" @@ -14,3 +12,4 @@ AquaHideout_UnusedRubyMap3_Layout:: .4byte AquaHideout_UnusedRubyMap3_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc index 7a5d636902..b32eef4221 100644 --- a/data/layouts/ArtisanCave_1F/layout.inc +++ b/data/layouts/ArtisanCave_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 ArtisanCave_1F_MapBorder:: .incbin "data/layouts/ArtisanCave_1F/border.bin" - .align 2 ArtisanCave_1F_MapBlockdata:: .incbin "data/layouts/ArtisanCave_1F/map.bin" @@ -14,3 +12,4 @@ ArtisanCave_1F_Layout:: .4byte ArtisanCave_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc index 97e409473b..2640303e34 100644 --- a/data/layouts/ArtisanCave_B1F/layout.inc +++ b/data/layouts/ArtisanCave_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 ArtisanCave_B1F_MapBorder:: .incbin "data/layouts/ArtisanCave_B1F/border.bin" - .align 2 ArtisanCave_B1F_MapBlockdata:: .incbin "data/layouts/ArtisanCave_B1F/map.bin" @@ -14,3 +12,4 @@ ArtisanCave_B1F_Layout:: .4byte ArtisanCave_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc index b101dbdda8..374af9ffad 100644 --- a/data/layouts/BattleElevator/layout.inc +++ b/data/layouts/BattleElevator/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleElevator_MapBorder:: .incbin "data/layouts/BattleElevator/border.bin" - .align 2 BattleElevator_MapBlockdata:: .incbin "data/layouts/BattleElevator/map.bin" @@ -14,3 +12,4 @@ BattleElevator_Layout:: .4byte BattleElevator_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc index 6b0f61b5fe..89f799d84f 100644 --- a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" - .align 2 BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaBattleRoom_Layout:: .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc index c984be1fb7..8961ed7785 100644 --- a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" - .align 2 BattleFrontier_BattleArenaCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaCorridor_Layout:: .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc index bda4799ece..305fcc0d97 100644 --- a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleArenaLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" - .align 2 BattleFrontier_BattleArenaLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleArenaLobby_Layout:: .4byte BattleFrontier_BattleArenaLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleArena + diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc index 3ed732898a..a4991ae0c0 100644 --- a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" - .align 2 BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeBattleRoom_Layout:: .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc index f4354caf0c..7f3c93b827 100644 --- a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" - .align 2 BattleFrontier_BattleDomeCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeCorridor_Layout:: .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc index d9127802ac..2553e70987 100644 --- a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomeLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" - .align 2 BattleFrontier_BattleDomeLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomeLobby_Layout:: .4byte BattleFrontier_BattleDomeLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc index 4ac7a79df1..8c0fe2ce5c 100644 --- a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" - .align 2 BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleDomePreBattleRoom_Layout:: .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleDome + diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc index 35b8a1dec5..21ba6a0156 100644 --- a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" - .align 2 BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryBattleRoom_Layout:: .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc index 2071dd54a9..cc0a336110 100644 --- a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" - .align 2 BattleFrontier_BattleFactoryLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryLobby_Layout:: .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc index f458fb9c22..fc4fc49bcc 100644 --- a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - .align 2 BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleFactoryPreBattleRoom_Layout:: .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFactory + diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc index 2a570bbd78..3d9acc3c49 100644 --- a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" - .align 2 BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceBattleRoom_Layout:: .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc index b76b87cb57..2d16216c52 100644 --- a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" - .align 2 BattleFrontier_BattlePalaceCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceCorridor_Layout:: .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata .4byte gTileset_General .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc index 08c904db80..f9a1dad7b5 100644 --- a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePalaceLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" - .align 2 BattleFrontier_BattlePalaceLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePalaceLobby_Layout:: .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePalace + diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc index 7dd3dcbaa1..1d6d21778c 100644 --- a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" - .align 2 BattleFrontier_BattlePikeCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeCorridor_Layout:: .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc index a1bd10dd31..3a5cd35380 100644 --- a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" - .align 2 BattleFrontier_BattlePikeLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeLobby_Layout:: .4byte BattleFrontier_BattlePikeLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc index c860deb93c..466ad0ff4e 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom1_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc index 1ad2a90cc8..1c7fb35d45 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom2_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc index b60e073615..ce17a0bf68 100644 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" - .align 2 BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeRandomRoom3_Layout:: .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc index d4f99085b7..d7a082d13b 100644 --- a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" - .align 2 BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePikeThreePathRoom_Layout:: .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc index 8a991e45d9..a65e7928b1 100644 --- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc +++ b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - .align 2 BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePointExchangeServiceCorner_Layout:: .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc index 2097173cc6..a9e779ddbe 100644 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" - .align 2 BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidEmptySquare_Layout:: .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc index ecdceec7f9..28575776ac 100644 --- a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" - .align 2 BattleFrontier_BattlePyramidLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidLobby_Layout:: .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc index e962595890..4657c37a36 100644 --- a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc +++ b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattlePyramidTop_MapBorder:: .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" - .align 2 BattleFrontier_BattlePyramidTop_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattlePyramidTop_Layout:: .4byte BattleFrontier_BattlePyramidTop_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc index 8738d81e11..3d498239ae 100644 --- a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" - .align 2 BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerBattleRoom_Layout:: .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc index c54c388120..56335aa234 100644 --- a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerCorridor_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" - .align 2 BattleFrontier_BattleTowerCorridor_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerCorridor_Layout:: .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc index 9e822f0f95..7dba3777cd 100644 --- a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerCorridor2_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" - .align 2 BattleFrontier_BattleTowerCorridor2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerCorridor2_Layout:: .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc index dc3733bc08..790ff3bcd7 100644 --- a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerLobby_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" - .align 2 BattleFrontier_BattleTowerLobby_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerLobby_Layout:: .4byte BattleFrontier_BattleTowerLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc index dbd77c420c..df5615873f 100644 --- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc +++ b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - .align 2 BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_BattleTowerMultiBattleRoom_Layout:: .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc index cc22cc8d72..c25b3b2a0f 100644 --- a/data/layouts/BattleFrontier_Lounge1/layout.inc +++ b/data/layouts/BattleFrontier_Lounge1/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_Lounge1_MapBorder:: .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" - .align 2 BattleFrontier_Lounge1_MapBlockdata:: .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_Lounge1_Layout:: .4byte BattleFrontier_Lounge1_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc index 1f8df21ae2..b735b4994e 100644 --- a/data/layouts/BattleFrontier_Lounge2/layout.inc +++ b/data/layouts/BattleFrontier_Lounge2/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_Lounge2_MapBorder:: .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" - .align 2 BattleFrontier_Lounge2_MapBlockdata:: .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_Lounge2_Layout:: .4byte BattleFrontier_Lounge2_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc index e79db8ee71..ddaf204465 100644 --- a/data/layouts/BattleFrontier_OutsideEast/layout.inc +++ b/data/layouts/BattleFrontier_OutsideEast/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_OutsideEast_MapBorder:: .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" - .align 2 BattleFrontier_OutsideEast_MapBlockdata:: .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_OutsideEast_Layout:: .4byte BattleFrontier_OutsideEast_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideEast + diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc index 0644d4b2b8..a506e554fb 100644 --- a/data/layouts/BattleFrontier_OutsideWest/layout.inc +++ b/data/layouts/BattleFrontier_OutsideWest/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_OutsideWest_MapBorder:: .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" - .align 2 BattleFrontier_OutsideWest_MapBlockdata:: .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_OutsideWest_Layout:: .4byte BattleFrontier_OutsideWest_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontierOutsideWest + diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc index 03639f2032..d7615e693d 100644 --- a/data/layouts/BattleFrontier_RankingHall/layout.inc +++ b/data/layouts/BattleFrontier_RankingHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_RankingHall_MapBorder:: .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" - .align 2 BattleFrontier_RankingHall_MapBlockdata:: .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_RankingHall_Layout:: .4byte BattleFrontier_RankingHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontierRankingHall + diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc index 11beca5e5a..3dd4aeaa53 100644 --- a/data/layouts/BattleFrontier_ReceptionGate/layout.inc +++ b/data/layouts/BattleFrontier_ReceptionGate/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_ReceptionGate_MapBorder:: .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" - .align 2 BattleFrontier_ReceptionGate_MapBlockdata:: .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_ReceptionGate_Layout:: .4byte BattleFrontier_ReceptionGate_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc index 913d636d1c..f087371096 100644 --- a/data/layouts/BattleFrontier_ScottsHouse/layout.inc +++ b/data/layouts/BattleFrontier_ScottsHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleFrontier_ScottsHouse_MapBorder:: .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" - .align 2 BattleFrontier_ScottsHouse_MapBlockdata:: .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" @@ -14,3 +12,4 @@ BattleFrontier_ScottsHouse_Layout:: .4byte BattleFrontier_ScottsHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc index 103f35b315..fe710cc404 100644 --- a/data/layouts/BattlePyramidSquare01/layout.inc +++ b/data/layouts/BattlePyramidSquare01/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare01_MapBorder:: .incbin "data/layouts/BattlePyramidSquare01/border.bin" - .align 2 BattlePyramidSquare01_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare01/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare01_Layout:: .4byte BattlePyramidSquare01_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc index c831af0a8c..6aa5b7aa98 100644 --- a/data/layouts/BattlePyramidSquare02/layout.inc +++ b/data/layouts/BattlePyramidSquare02/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare02_MapBorder:: .incbin "data/layouts/BattlePyramidSquare02/border.bin" - .align 2 BattlePyramidSquare02_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare02/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare02_Layout:: .4byte BattlePyramidSquare02_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc index fb1da5213c..4da41f9e9b 100644 --- a/data/layouts/BattlePyramidSquare03/layout.inc +++ b/data/layouts/BattlePyramidSquare03/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare03_MapBorder:: .incbin "data/layouts/BattlePyramidSquare03/border.bin" - .align 2 BattlePyramidSquare03_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare03/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare03_Layout:: .4byte BattlePyramidSquare03_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc index b8b7ce24f6..c298ee6f4e 100644 --- a/data/layouts/BattlePyramidSquare04/layout.inc +++ b/data/layouts/BattlePyramidSquare04/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare04_MapBorder:: .incbin "data/layouts/BattlePyramidSquare04/border.bin" - .align 2 BattlePyramidSquare04_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare04/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare04_Layout:: .4byte BattlePyramidSquare04_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc index f6f61cd5fe..87ce532740 100644 --- a/data/layouts/BattlePyramidSquare05/layout.inc +++ b/data/layouts/BattlePyramidSquare05/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare05_MapBorder:: .incbin "data/layouts/BattlePyramidSquare05/border.bin" - .align 2 BattlePyramidSquare05_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare05/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare05_Layout:: .4byte BattlePyramidSquare05_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc index 3774ce871f..bcaeb89b01 100644 --- a/data/layouts/BattlePyramidSquare06/layout.inc +++ b/data/layouts/BattlePyramidSquare06/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare06_MapBorder:: .incbin "data/layouts/BattlePyramidSquare06/border.bin" - .align 2 BattlePyramidSquare06_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare06/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare06_Layout:: .4byte BattlePyramidSquare06_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc index cd5f16b0e1..bb469b3c81 100644 --- a/data/layouts/BattlePyramidSquare07/layout.inc +++ b/data/layouts/BattlePyramidSquare07/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare07_MapBorder:: .incbin "data/layouts/BattlePyramidSquare07/border.bin" - .align 2 BattlePyramidSquare07_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare07/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare07_Layout:: .4byte BattlePyramidSquare07_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc index bc3ac30050..df88b710fd 100644 --- a/data/layouts/BattlePyramidSquare08/layout.inc +++ b/data/layouts/BattlePyramidSquare08/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare08_MapBorder:: .incbin "data/layouts/BattlePyramidSquare08/border.bin" - .align 2 BattlePyramidSquare08_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare08/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare08_Layout:: .4byte BattlePyramidSquare08_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc index 1794f72b3b..2869d9ac25 100644 --- a/data/layouts/BattlePyramidSquare09/layout.inc +++ b/data/layouts/BattlePyramidSquare09/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare09_MapBorder:: .incbin "data/layouts/BattlePyramidSquare09/border.bin" - .align 2 BattlePyramidSquare09_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare09/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare09_Layout:: .4byte BattlePyramidSquare09_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc index 49150f493f..2ba8e8124d 100644 --- a/data/layouts/BattlePyramidSquare10/layout.inc +++ b/data/layouts/BattlePyramidSquare10/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare10_MapBorder:: .incbin "data/layouts/BattlePyramidSquare10/border.bin" - .align 2 BattlePyramidSquare10_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare10/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare10_Layout:: .4byte BattlePyramidSquare10_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc index 8385b6f3a0..190bddf10b 100644 --- a/data/layouts/BattlePyramidSquare11/layout.inc +++ b/data/layouts/BattlePyramidSquare11/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare11_MapBorder:: .incbin "data/layouts/BattlePyramidSquare11/border.bin" - .align 2 BattlePyramidSquare11_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare11/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare11_Layout:: .4byte BattlePyramidSquare11_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc index a63f1dc346..199f66aceb 100644 --- a/data/layouts/BattlePyramidSquare12/layout.inc +++ b/data/layouts/BattlePyramidSquare12/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare12_MapBorder:: .incbin "data/layouts/BattlePyramidSquare12/border.bin" - .align 2 BattlePyramidSquare12_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare12/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare12_Layout:: .4byte BattlePyramidSquare12_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc index 6f145fe96b..351b04227c 100644 --- a/data/layouts/BattlePyramidSquare13/layout.inc +++ b/data/layouts/BattlePyramidSquare13/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare13_MapBorder:: .incbin "data/layouts/BattlePyramidSquare13/border.bin" - .align 2 BattlePyramidSquare13_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare13/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare13_Layout:: .4byte BattlePyramidSquare13_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc index ec69a1b54d..653ad161b5 100644 --- a/data/layouts/BattlePyramidSquare14/layout.inc +++ b/data/layouts/BattlePyramidSquare14/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare14_MapBorder:: .incbin "data/layouts/BattlePyramidSquare14/border.bin" - .align 2 BattlePyramidSquare14_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare14/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare14_Layout:: .4byte BattlePyramidSquare14_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc index 29c5444f90..24090c671e 100644 --- a/data/layouts/BattlePyramidSquare15/layout.inc +++ b/data/layouts/BattlePyramidSquare15/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare15_MapBorder:: .incbin "data/layouts/BattlePyramidSquare15/border.bin" - .align 2 BattlePyramidSquare15_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare15/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare15_Layout:: .4byte BattlePyramidSquare15_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc index cc28959436..67187b9bf6 100644 --- a/data/layouts/BattlePyramidSquare16/layout.inc +++ b/data/layouts/BattlePyramidSquare16/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattlePyramidSquare16_MapBorder:: .incbin "data/layouts/BattlePyramidSquare16/border.bin" - .align 2 BattlePyramidSquare16_MapBlockdata:: .incbin "data/layouts/BattlePyramidSquare16/map.bin" @@ -14,3 +12,4 @@ BattlePyramidSquare16_Layout:: .4byte BattlePyramidSquare16_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePyramid + diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc index 97be7fdb4f..4f9a8e6261 100644 --- a/data/layouts/BattleTentBattleRoom/layout.inc +++ b/data/layouts/BattleTentBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentBattleRoom_MapBorder:: .incbin "data/layouts/BattleTentBattleRoom/border.bin" - .align 2 BattleTentBattleRoom_MapBlockdata:: .incbin "data/layouts/BattleTentBattleRoom/map.bin" @@ -14,3 +12,4 @@ BattleTentBattleRoom_Layout:: .4byte BattleTentBattleRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc index 21f6c94fdf..9abcdefa43 100644 --- a/data/layouts/BattleTentCorridor/layout.inc +++ b/data/layouts/BattleTentCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentCorridor_MapBorder:: .incbin "data/layouts/BattleTentCorridor/border.bin" - .align 2 BattleTentCorridor_MapBlockdata:: .incbin "data/layouts/BattleTentCorridor/map.bin" @@ -14,3 +12,4 @@ BattleTentCorridor_Layout:: .4byte BattleTentCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc index a740ae2f93..a3216370f0 100644 --- a/data/layouts/BattleTentLobby/layout.inc +++ b/data/layouts/BattleTentLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 BattleTentLobby_MapBorder:: .incbin "data/layouts/BattleTentLobby/border.bin" - .align 2 BattleTentLobby_MapBlockdata:: .incbin "data/layouts/BattleTentLobby/map.bin" @@ -14,3 +12,4 @@ BattleTentLobby_Layout:: .4byte BattleTentLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleTent + diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc index 0fe3899ae7..17dc4f0fbd 100644 --- a/data/layouts/BirthIsland_Exterior/layout.inc +++ b/data/layouts/BirthIsland_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 BirthIsland_Exterior_MapBorder:: .incbin "data/layouts/BirthIsland_Exterior/border.bin" - .align 2 BirthIsland_Exterior_MapBlockdata:: .incbin "data/layouts/BirthIsland_Exterior/map.bin" @@ -14,3 +12,4 @@ BirthIsland_Exterior_Layout:: .4byte BirthIsland_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc index c2727063f6..1113f89f2e 100644 --- a/data/layouts/CableCarStation/layout.inc +++ b/data/layouts/CableCarStation/layout.inc @@ -1,8 +1,6 @@ - .align 2 CableCarStation_MapBorder:: .incbin "data/layouts/CableCarStation/border.bin" - .align 2 CableCarStation_MapBlockdata:: .incbin "data/layouts/CableCarStation/map.bin" @@ -14,3 +12,4 @@ CableCarStation_Layout:: .4byte CableCarStation_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc index d82ecddd0f..616af16558 100644 --- a/data/layouts/CaveOfOrigin_1F/layout.inc +++ b/data/layouts/CaveOfOrigin_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_1F_MapBorder:: .incbin "data/layouts/CaveOfOrigin_1F/border.bin" - .align 2 CaveOfOrigin_1F_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_1F/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_1F_Layout:: .4byte CaveOfOrigin_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc index 41158462c8..5850f15c90 100644 --- a/data/layouts/CaveOfOrigin_B1F/layout.inc +++ b/data/layouts/CaveOfOrigin_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_B1F_MapBorder:: .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" - .align 2 CaveOfOrigin_B1F_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_B1F_Layout:: .4byte CaveOfOrigin_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc index 3e6375d3e6..11e230ce36 100644 --- a/data/layouts/CaveOfOrigin_Entrance/layout.inc +++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_Entrance_MapBorder:: .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" - .align 2 CaveOfOrigin_Entrance_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_Entrance_Layout:: .4byte CaveOfOrigin_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc index dfaf8b8a6d..294bf786a2 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap1_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc index 5caa1b9e5a..c3a05f75f7 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap2_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc index 6290452c0b..cbc5c052a7 100644 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc +++ b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc @@ -1,8 +1,6 @@ - .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - .align 2 CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" @@ -14,3 +12,4 @@ CaveOfOrigin_UnusedRubySapphireMap3_Layout:: .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc index 6c4bff8862..4d6e7571ab 100644 --- a/data/layouts/DesertRuins/layout.inc +++ b/data/layouts/DesertRuins/layout.inc @@ -1,8 +1,6 @@ - .align 2 DesertRuins_MapBorder:: .incbin "data/layouts/DesertRuins/border.bin" - .align 2 DesertRuins_MapBlockdata:: .incbin "data/layouts/DesertRuins/map.bin" @@ -14,3 +12,4 @@ DesertRuins_Layout:: .4byte DesertRuins_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc index 3871e181ea..9a17a128e0 100644 --- a/data/layouts/DesertUnderpass/layout.inc +++ b/data/layouts/DesertUnderpass/layout.inc @@ -1,8 +1,6 @@ - .align 2 DesertUnderpass_MapBorder:: .incbin "data/layouts/DesertUnderpass/border.bin" - .align 2 DesertUnderpass_MapBlockdata:: .incbin "data/layouts/DesertUnderpass/map.bin" @@ -14,3 +12,4 @@ DesertUnderpass_Layout:: .4byte DesertUnderpass_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc index 077262836c..28ccdc43c5 100644 --- a/data/layouts/DewfordTown/layout.inc +++ b/data/layouts/DewfordTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_MapBorder:: .incbin "data/layouts/DewfordTown/border.bin" - .align 2 DewfordTown_MapBlockdata:: .incbin "data/layouts/DewfordTown/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Layout:: .4byte DewfordTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc index 89eb399360..bbada5bdc0 100644 --- a/data/layouts/DewfordTown_Gym/layout.inc +++ b/data/layouts/DewfordTown_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_Gym_MapBorder:: .incbin "data/layouts/DewfordTown_Gym/border.bin" - .align 2 DewfordTown_Gym_MapBlockdata:: .incbin "data/layouts/DewfordTown_Gym/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Gym_Layout:: .4byte DewfordTown_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_DewfordGym + diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc index 59e88cd47b..bd9cd03aec 100644 --- a/data/layouts/DewfordTown_Hall/layout.inc +++ b/data/layouts/DewfordTown_Hall/layout.inc @@ -1,8 +1,6 @@ - .align 2 DewfordTown_Hall_MapBorder:: .incbin "data/layouts/DewfordTown_Hall/border.bin" - .align 2 DewfordTown_Hall_MapBlockdata:: .incbin "data/layouts/DewfordTown_Hall/map.bin" @@ -14,3 +12,4 @@ DewfordTown_Hall_Layout:: .4byte DewfordTown_Hall_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc index 9641fb2bf8..61d112c1e9 100644 --- a/data/layouts/DoubleBattleColosseum/layout.inc +++ b/data/layouts/DoubleBattleColosseum/layout.inc @@ -1,8 +1,6 @@ - .align 2 DoubleBattleColosseum_MapBorder:: .incbin "data/layouts/DoubleBattleColosseum/border.bin" - .align 2 DoubleBattleColosseum_MapBlockdata:: .incbin "data/layouts/DoubleBattleColosseum/map.bin" @@ -14,3 +12,4 @@ DoubleBattleColosseum_Layout:: .4byte DoubleBattleColosseum_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc index e12d3c259a..16c02fbaac 100644 --- a/data/layouts/EverGrandeCity/layout.inc +++ b/data/layouts/EverGrandeCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_MapBorder:: .incbin "data/layouts/EverGrandeCity/border.bin" - .align 2 EverGrandeCity_MapBlockdata:: .incbin "data/layouts/EverGrandeCity/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_Layout:: .4byte EverGrandeCity_MapBlockdata .4byte gTileset_General .4byte gTileset_EverGrande + diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc index c92ee599db..dad4c7ef35 100644 --- a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc +++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_ChampionsRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" - .align 2 EverGrandeCity_ChampionsRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_ChampionsRoom_Layout:: .4byte EverGrandeCity_ChampionsRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc index 1cd96a760e..9c140d49d3 100644 --- a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc +++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_DrakesRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" - .align 2 EverGrandeCity_DrakesRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_DrakesRoom_Layout:: .4byte EverGrandeCity_DrakesRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc index 17031e546e..bcd610d8c8 100644 --- a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc +++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_GlaciasRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" - .align 2 EverGrandeCity_GlaciasRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_GlaciasRoom_Layout:: .4byte EverGrandeCity_GlaciasRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc index 169d5fda7e..464fc8998f 100644 --- a/data/layouts/EverGrandeCity_Hall4/layout.inc +++ b/data/layouts/EverGrandeCity_Hall4/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_Hall4_MapBorder:: .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" - .align 2 EverGrandeCity_Hall4_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_Hall4_Layout:: .4byte EverGrandeCity_Hall4_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc index f7442adde4..deaa4429d1 100644 --- a/data/layouts/EverGrandeCity_HallOfFame/layout.inc +++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_HallOfFame_MapBorder:: .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" - .align 2 EverGrandeCity_HallOfFame_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_HallOfFame_Layout:: .4byte EverGrandeCity_HallOfFame_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc index dc2847ed09..b02d5c312c 100644 --- a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc +++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_PhoebesRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" - .align 2 EverGrandeCity_PhoebesRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_PhoebesRoom_Layout:: .4byte EverGrandeCity_PhoebesRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc index da1a3de82d..d84e6449f7 100644 --- a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc +++ b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_PokemonLeague_1F_MapBorder:: .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin" - .align 2 EverGrandeCity_PokemonLeague_1F_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_PokemonLeague_1F_Layout:: .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc index b880ee4394..2159c894d3 100644 --- a/data/layouts/EverGrandeCity_ShortHall/layout.inc +++ b/data/layouts/EverGrandeCity_ShortHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_ShortHall_MapBorder:: .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" - .align 2 EverGrandeCity_ShortHall_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_ShortHall_Layout:: .4byte EverGrandeCity_ShortHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc index f43fdae6b7..86ffa16a15 100644 --- a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc +++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 EverGrandeCity_SidneysRoom_MapBorder:: .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" - .align 2 EverGrandeCity_SidneysRoom_MapBlockdata:: .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" @@ -14,3 +12,4 @@ EverGrandeCity_SidneysRoom_Layout:: .4byte EverGrandeCity_SidneysRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_EliteFour + diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc index f8ba2bf1a0..7f08949032 100644 --- a/data/layouts/FallarborTown/layout.inc +++ b/data/layouts/FallarborTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_MapBorder:: .incbin "data/layouts/FallarborTown/border.bin" - .align 2 FallarborTown_MapBlockdata:: .incbin "data/layouts/FallarborTown/map.bin" @@ -14,3 +12,4 @@ FallarborTown_Layout:: .4byte FallarborTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc index 70d1a079fe..66acc546b4 100644 --- a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc +++ b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_LeftoverRSContestHall_MapBorder:: .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" - .align 2 FallarborTown_LeftoverRSContestHall_MapBlockdata:: .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" @@ -14,3 +12,4 @@ FallarborTown_LeftoverRSContestHall_Layout:: .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc index c30723a044..3ad232728e 100644 --- a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc +++ b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 FallarborTown_LeftoverRSContestLobby_MapBorder:: .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" - .align 2 FallarborTown_LeftoverRSContestLobby_MapBlockdata:: .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" @@ -14,3 +12,4 @@ FallarborTown_LeftoverRSContestLobby_Layout:: .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc index 4a1c6c36b6..c7d6bef917 100644 --- a/data/layouts/FarawayIsland_Entrance/layout.inc +++ b/data/layouts/FarawayIsland_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 FarawayIsland_Entrance_MapBorder:: .incbin "data/layouts/FarawayIsland_Entrance/border.bin" - .align 2 FarawayIsland_Entrance_MapBlockdata:: .incbin "data/layouts/FarawayIsland_Entrance/map.bin" @@ -14,3 +12,4 @@ FarawayIsland_Entrance_Layout:: .4byte FarawayIsland_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc index bf8cbdbf47..787dd53c9e 100644 --- a/data/layouts/FarawayIsland_Interior/layout.inc +++ b/data/layouts/FarawayIsland_Interior/layout.inc @@ -1,8 +1,6 @@ - .align 2 FarawayIsland_Interior_MapBorder:: .incbin "data/layouts/FarawayIsland_Interior/border.bin" - .align 2 FarawayIsland_Interior_MapBlockdata:: .incbin "data/layouts/FarawayIsland_Interior/map.bin" @@ -14,3 +12,4 @@ FarawayIsland_Interior_Layout:: .4byte FarawayIsland_Interior_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc index 7fff04df13..c129ae7150 100644 --- a/data/layouts/FieryPath/layout.inc +++ b/data/layouts/FieryPath/layout.inc @@ -1,8 +1,6 @@ - .align 2 FieryPath_MapBorder:: .incbin "data/layouts/FieryPath/border.bin" - .align 2 FieryPath_MapBlockdata:: .incbin "data/layouts/FieryPath/map.bin" @@ -14,3 +12,4 @@ FieryPath_Layout:: .4byte FieryPath_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc index e273287ded..02564b36ad 100644 --- a/data/layouts/FortreeCity/layout.inc +++ b/data/layouts/FortreeCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_MapBorder:: .incbin "data/layouts/FortreeCity/border.bin" - .align 2 FortreeCity_MapBlockdata:: .incbin "data/layouts/FortreeCity/map.bin" @@ -14,3 +12,4 @@ FortreeCity_Layout:: .4byte FortreeCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc index e4727cf759..6460a35b54 100644 --- a/data/layouts/FortreeCity_DecorationShop/layout.inc +++ b/data/layouts/FortreeCity_DecorationShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_DecorationShop_MapBorder:: .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" - .align 2 FortreeCity_DecorationShop_MapBlockdata:: .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" @@ -14,3 +12,4 @@ FortreeCity_DecorationShop_Layout:: .4byte FortreeCity_DecorationShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc index 81994276b8..da7f1e73e9 100644 --- a/data/layouts/FortreeCity_Gym/layout.inc +++ b/data/layouts/FortreeCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_Gym_MapBorder:: .incbin "data/layouts/FortreeCity_Gym/border.bin" - .align 2 FortreeCity_Gym_MapBlockdata:: .incbin "data/layouts/FortreeCity_Gym/map.bin" @@ -14,3 +12,4 @@ FortreeCity_Gym_Layout:: .4byte FortreeCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_FortreeGym + diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc index dd9962fdeb..214846c228 100644 --- a/data/layouts/FortreeCity_House1/layout.inc +++ b/data/layouts/FortreeCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_House1_MapBorder:: .incbin "data/layouts/FortreeCity_House1/border.bin" - .align 2 FortreeCity_House1_MapBlockdata:: .incbin "data/layouts/FortreeCity_House1/map.bin" @@ -14,3 +12,4 @@ FortreeCity_House1_Layout:: .4byte FortreeCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc index 5ab659b9a5..3aa0898bfe 100644 --- a/data/layouts/FortreeCity_House2/layout.inc +++ b/data/layouts/FortreeCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 FortreeCity_House2_MapBorder:: .incbin "data/layouts/FortreeCity_House2/border.bin" - .align 2 FortreeCity_House2_MapBlockdata:: .incbin "data/layouts/FortreeCity_House2/map.bin" @@ -14,3 +12,4 @@ FortreeCity_House2_Layout:: .4byte FortreeCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc index 641310f758..009fd12f5c 100644 --- a/data/layouts/GraniteCave_1F/layout.inc +++ b/data/layouts/GraniteCave_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_1F_MapBorder:: .incbin "data/layouts/GraniteCave_1F/border.bin" - .align 2 GraniteCave_1F_MapBlockdata:: .incbin "data/layouts/GraniteCave_1F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_1F_Layout:: .4byte GraniteCave_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc index dcdafcd4e2..a57b238be1 100644 --- a/data/layouts/GraniteCave_B1F/layout.inc +++ b/data/layouts/GraniteCave_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_B1F_MapBorder:: .incbin "data/layouts/GraniteCave_B1F/border.bin" - .align 2 GraniteCave_B1F_MapBlockdata:: .incbin "data/layouts/GraniteCave_B1F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_B1F_Layout:: .4byte GraniteCave_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc index 90d63c5bb4..7ffd04b001 100644 --- a/data/layouts/GraniteCave_B2F/layout.inc +++ b/data/layouts/GraniteCave_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_B2F_MapBorder:: .incbin "data/layouts/GraniteCave_B2F/border.bin" - .align 2 GraniteCave_B2F_MapBlockdata:: .incbin "data/layouts/GraniteCave_B2F/map.bin" @@ -14,3 +12,4 @@ GraniteCave_B2F_Layout:: .4byte GraniteCave_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc index ea61473432..5ee4fade44 100644 --- a/data/layouts/GraniteCave_StevensRoom/layout.inc +++ b/data/layouts/GraniteCave_StevensRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 GraniteCave_StevensRoom_MapBorder:: .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" - .align 2 GraniteCave_StevensRoom_MapBlockdata:: .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" @@ -14,3 +12,4 @@ GraniteCave_StevensRoom_Layout:: .4byte GraniteCave_StevensRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc index ab5f0e0325..e95b8ec9d7 100644 --- a/data/layouts/Harbor/layout.inc +++ b/data/layouts/Harbor/layout.inc @@ -1,8 +1,6 @@ - .align 2 Harbor_MapBorder:: .incbin "data/layouts/Harbor/border.bin" - .align 2 Harbor_MapBlockdata:: .incbin "data/layouts/Harbor/map.bin" @@ -14,3 +12,4 @@ Harbor_Layout:: .4byte Harbor_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc index 0d1c9a6991..b93f24df4f 100644 --- a/data/layouts/House1/layout.inc +++ b/data/layouts/House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 House1_MapBorder:: .incbin "data/layouts/House1/border.bin" - .align 2 House1_MapBlockdata:: .incbin "data/layouts/House1/map.bin" @@ -14,3 +12,4 @@ House1_Layout:: .4byte House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc index 357e6022ff..35566d8d12 100644 --- a/data/layouts/House2/layout.inc +++ b/data/layouts/House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 House2_MapBorder:: .incbin "data/layouts/House2/border.bin" - .align 2 House2_MapBlockdata:: .incbin "data/layouts/House2/map.bin" @@ -14,3 +12,4 @@ House2_Layout:: .4byte House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc index 2fe4bee46c..6e2de11f48 100644 --- a/data/layouts/House3/layout.inc +++ b/data/layouts/House3/layout.inc @@ -1,8 +1,6 @@ - .align 2 House3_MapBorder:: .incbin "data/layouts/House3/border.bin" - .align 2 House3_MapBlockdata:: .incbin "data/layouts/House3/map.bin" @@ -14,3 +12,4 @@ House3_Layout:: .4byte House3_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc index caeca73a89..b06b3d4273 100644 --- a/data/layouts/House4/layout.inc +++ b/data/layouts/House4/layout.inc @@ -1,8 +1,6 @@ - .align 2 House4_MapBorder:: .incbin "data/layouts/House4/border.bin" - .align 2 House4_MapBlockdata:: .incbin "data/layouts/House4/map.bin" @@ -14,3 +12,4 @@ House4_Layout:: .4byte House4_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc index bdb047feba..7fb8d2c9bd 100644 --- a/data/layouts/HouseWithBed/layout.inc +++ b/data/layouts/HouseWithBed/layout.inc @@ -1,8 +1,6 @@ - .align 2 HouseWithBed_MapBorder:: .incbin "data/layouts/HouseWithBed/border.bin" - .align 2 HouseWithBed_MapBlockdata:: .incbin "data/layouts/HouseWithBed/map.bin" @@ -14,3 +12,4 @@ HouseWithBed_Layout:: .4byte HouseWithBed_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc index dc93f12a8e..d1ddf86865 100644 --- a/data/layouts/InsideOfTruck/layout.inc +++ b/data/layouts/InsideOfTruck/layout.inc @@ -1,8 +1,6 @@ - .align 2 InsideOfTruck_MapBorder:: .incbin "data/layouts/InsideOfTruck/border.bin" - .align 2 InsideOfTruck_MapBlockdata:: .incbin "data/layouts/InsideOfTruck/map.bin" @@ -14,3 +12,4 @@ InsideOfTruck_Layout:: .4byte InsideOfTruck_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideOfTruck + diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc index 25d870e682..5a3035b721 100644 --- a/data/layouts/IslandCave/layout.inc +++ b/data/layouts/IslandCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 IslandCave_MapBorder:: .incbin "data/layouts/IslandCave/border.bin" - .align 2 IslandCave_MapBlockdata:: .incbin "data/layouts/IslandCave/map.bin" @@ -14,3 +12,4 @@ IslandCave_Layout:: .4byte IslandCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc index 7a1c432848..7fc86dca44 100644 --- a/data/layouts/IslandHarbor/layout.inc +++ b/data/layouts/IslandHarbor/layout.inc @@ -1,8 +1,6 @@ - .align 2 IslandHarbor_MapBorder:: .incbin "data/layouts/IslandHarbor/border.bin" - .align 2 IslandHarbor_MapBlockdata:: .incbin "data/layouts/IslandHarbor/map.bin" @@ -14,3 +12,4 @@ IslandHarbor_Layout:: .4byte IslandHarbor_MapBlockdata .4byte gTileset_General .4byte gTileset_IslandHarbor + diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc index 6aefbf6059..5620551b8a 100644 --- a/data/layouts/JaggedPass/layout.inc +++ b/data/layouts/JaggedPass/layout.inc @@ -1,8 +1,6 @@ - .align 2 JaggedPass_MapBorder:: .incbin "data/layouts/JaggedPass/border.bin" - .align 2 JaggedPass_MapBlockdata:: .incbin "data/layouts/JaggedPass/map.bin" @@ -14,3 +12,4 @@ JaggedPass_Layout:: .4byte JaggedPass_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc index 48d0bbe58b..6629554306 100644 --- a/data/layouts/LavaridgeTown/layout.inc +++ b/data/layouts/LavaridgeTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_MapBorder:: .incbin "data/layouts/LavaridgeTown/border.bin" - .align 2 LavaridgeTown_MapBlockdata:: .incbin "data/layouts/LavaridgeTown/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_Layout:: .4byte LavaridgeTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc index e881e9d58d..36f4cb826a 100644 --- a/data/layouts/LavaridgeTown_Gym_1F/layout.inc +++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_Gym_1F_MapBorder:: .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin" - .align 2 LavaridgeTown_Gym_1F_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_Gym_1F_Layout:: .4byte LavaridgeTown_Gym_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LavaridgeGym + diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc index 1fa258cbaf..9b80d7f90f 100644 --- a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc +++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_Gym_B1F_MapBorder:: .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin" - .align 2 LavaridgeTown_Gym_B1F_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_Gym_B1F_Layout:: .4byte LavaridgeTown_Gym_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LavaridgeGym + diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc index bf107dca9a..c59e12e49c 100644 --- a/data/layouts/LavaridgeTown_HerbShop/layout.inc +++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_HerbShop_MapBorder:: .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" - .align 2 LavaridgeTown_HerbShop_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_HerbShop_Layout:: .4byte LavaridgeTown_HerbShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc index e0ba92bbfc..e38d63815f 100644 --- a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc +++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LavaridgeTown_PokemonCenter_1F_MapBorder:: .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin" - .align 2 LavaridgeTown_PokemonCenter_1F_MapBlockdata:: .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" @@ -14,3 +12,4 @@ LavaridgeTown_PokemonCenter_1F_Layout:: .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc index fedb7a91ed..ed4bd81e4a 100644 --- a/data/layouts/LilycoveCity/layout.inc +++ b/data/layouts/LilycoveCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_MapBorder:: .incbin "data/layouts/LilycoveCity/border.bin" - .align 2 LilycoveCity_MapBlockdata:: .incbin "data/layouts/LilycoveCity/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_Layout:: .4byte LilycoveCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc index e0ce089f76..61e6e27ee5 100644 --- a/data/layouts/LilycoveCity_ContestHall/layout.inc +++ b/data/layouts/LilycoveCity_ContestHall/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_ContestHall_MapBorder:: .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" - .align 2 LilycoveCity_ContestHall_MapBlockdata:: .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_ContestHall_Layout:: .4byte LilycoveCity_ContestHall_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc index 8ca1d160f1..20cf4389fb 100644 --- a/data/layouts/LilycoveCity_ContestLobby/layout.inc +++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_ContestLobby_MapBorder:: .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" - .align 2 LilycoveCity_ContestLobby_MapBlockdata:: .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_ContestLobby_Layout:: .4byte LilycoveCity_ContestLobby_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc index 3c6c30cdc7..b275834f7e 100644 --- a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc +++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_CoveLilyMotel_1F_MapBorder:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin" - .align 2 LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_CoveLilyMotel_1F_Layout:: .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc index c65508e1a1..82a294c48f 100644 --- a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc +++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_CoveLilyMotel_2F_MapBorder:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin" - .align 2 LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_CoveLilyMotel_2F_Layout:: .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc index 53d452438b..899e934bdb 100644 --- a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStoreElevator_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" - .align 2 LilycoveCity_DepartmentStoreElevator_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStoreElevator_Layout:: .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattleFrontier + diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc index 61a5db9c23..d404833086 100644 --- a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStoreRooftop_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" - .align 2 LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStoreRooftop_Layout:: .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc index 441cfc4741..d3b5d94207 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_1F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin" - .align 2 LilycoveCity_DepartmentStore_1F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_1F_Layout:: .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc index 54ede95cd9..e5b01c8fd7 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_2F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin" - .align 2 LilycoveCity_DepartmentStore_2F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_2F_Layout:: .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc index a163424253..5d7aa93ebe 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_3F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin" - .align 2 LilycoveCity_DepartmentStore_3F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_3F_Layout:: .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc index 26806016a2..b4585ca031 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_4F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin" - .align 2 LilycoveCity_DepartmentStore_4F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_4F_Layout:: .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc index 6b5a98fe4e..ade5e4bf51 100644 --- a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc +++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_DepartmentStore_5F_MapBorder:: .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin" - .align 2 LilycoveCity_DepartmentStore_5F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_DepartmentStore_5F_Layout:: .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc index a7926872fc..de51e7fd61 100644 --- a/data/layouts/LilycoveCity_House2/layout.inc +++ b/data/layouts/LilycoveCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_House2_MapBorder:: .incbin "data/layouts/LilycoveCity_House2/border.bin" - .align 2 LilycoveCity_House2_MapBlockdata:: .incbin "data/layouts/LilycoveCity_House2/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_House2_Layout:: .4byte LilycoveCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc index 3a0215859e..0dab4095ce 100644 --- a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc +++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_LilycoveMuseum_1F_MapBorder:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin" - .align 2 LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_LilycoveMuseum_1F_Layout:: .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LilycoveMuseum + diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc index 0cc19b0394..aea4464109 100644 --- a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc +++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_LilycoveMuseum_2F_MapBorder:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin" - .align 2 LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_LilycoveMuseum_2F_Layout:: .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_LilycoveMuseum + diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc index 3a3a624bd5..9b30c7c08e 100644 --- a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc +++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc @@ -1,8 +1,6 @@ - .align 2 LilycoveCity_PokemonTrainerFanClub_MapBorder:: .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" - .align 2 LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" @@ -14,3 +12,4 @@ LilycoveCity_PokemonTrainerFanClub_Layout:: .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc index 38af498294..e71fe2df32 100644 --- a/data/layouts/LinkContestRoom1/layout.inc +++ b/data/layouts/LinkContestRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom1_MapBorder:: .incbin "data/layouts/LinkContestRoom1/border.bin" - .align 2 LinkContestRoom1_MapBlockdata:: .incbin "data/layouts/LinkContestRoom1/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom1_Layout:: .4byte LinkContestRoom1_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc index d09439edde..2dd66ab962 100644 --- a/data/layouts/LinkContestRoom2/layout.inc +++ b/data/layouts/LinkContestRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom2_MapBorder:: .incbin "data/layouts/LinkContestRoom2/border.bin" - .align 2 LinkContestRoom2_MapBlockdata:: .incbin "data/layouts/LinkContestRoom2/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom2_Layout:: .4byte LinkContestRoom2_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc index c969be1ace..c53cad7230 100644 --- a/data/layouts/LinkContestRoom3/layout.inc +++ b/data/layouts/LinkContestRoom3/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom3_MapBorder:: .incbin "data/layouts/LinkContestRoom3/border.bin" - .align 2 LinkContestRoom3_MapBlockdata:: .incbin "data/layouts/LinkContestRoom3/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom3_Layout:: .4byte LinkContestRoom3_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc index 61b03a2ce5..883918f377 100644 --- a/data/layouts/LinkContestRoom4/layout.inc +++ b/data/layouts/LinkContestRoom4/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom4_MapBorder:: .incbin "data/layouts/LinkContestRoom4/border.bin" - .align 2 LinkContestRoom4_MapBlockdata:: .incbin "data/layouts/LinkContestRoom4/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom4_Layout:: .4byte LinkContestRoom4_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc index 38f1e42cdf..72a9d9f4ed 100644 --- a/data/layouts/LinkContestRoom5/layout.inc +++ b/data/layouts/LinkContestRoom5/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom5_MapBorder:: .incbin "data/layouts/LinkContestRoom5/border.bin" - .align 2 LinkContestRoom5_MapBlockdata:: .incbin "data/layouts/LinkContestRoom5/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom5_Layout:: .4byte LinkContestRoom5_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc index 39349840a1..33db4b56dc 100644 --- a/data/layouts/LinkContestRoom6/layout.inc +++ b/data/layouts/LinkContestRoom6/layout.inc @@ -1,8 +1,6 @@ - .align 2 LinkContestRoom6_MapBorder:: .incbin "data/layouts/LinkContestRoom6/border.bin" - .align 2 LinkContestRoom6_MapBlockdata:: .incbin "data/layouts/LinkContestRoom6/map.bin" @@ -14,3 +12,4 @@ LinkContestRoom6_Layout:: .4byte LinkContestRoom6_MapBlockdata .4byte gTileset_General .4byte gTileset_Contest + diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc index 5f8254576d..8193ac6956 100644 --- a/data/layouts/LittlerootTown/layout.inc +++ b/data/layouts/LittlerootTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_MapBorder:: .incbin "data/layouts/LittlerootTown/border.bin" - .align 2 LittlerootTown_MapBlockdata:: .incbin "data/layouts/LittlerootTown/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_Layout:: .4byte LittlerootTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc index 0ccddcca8f..092c7d20b3 100644 --- a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc +++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_BrendansHouse_1F_MapBorder:: .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin" - .align 2 LittlerootTown_BrendansHouse_1F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_BrendansHouse_1F_Layout:: .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc index f626ecfb0a..5235f4d986 100644 --- a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc +++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_BrendansHouse_2F_MapBorder:: .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin" - .align 2 LittlerootTown_BrendansHouse_2F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_BrendansHouse_2F_Layout:: .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc index 42d1365c33..88b81a289a 100644 --- a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc +++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_MaysHouse_1F_MapBorder:: .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin" - .align 2 LittlerootTown_MaysHouse_1F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_MaysHouse_1F_Layout:: .4byte LittlerootTown_MaysHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc index c0770b8f66..0b6134dbd9 100644 --- a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc +++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_MaysHouse_2F_MapBorder:: .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin" - .align 2 LittlerootTown_MaysHouse_2F_MapBlockdata:: .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_MaysHouse_2F_Layout:: .4byte LittlerootTown_MaysHouse_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_BrendansMaysHouse + diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc index 77d07033f9..d0be539a0f 100644 --- a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc +++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc @@ -1,8 +1,6 @@ - .align 2 LittlerootTown_ProfessorBirchsLab_MapBorder:: .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" - .align 2 LittlerootTown_ProfessorBirchsLab_MapBlockdata:: .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" @@ -14,3 +12,4 @@ LittlerootTown_ProfessorBirchsLab_Layout:: .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc index 2721bb6ff9..b50c7f015f 100644 --- a/data/layouts/MagmaHideout_1F/layout.inc +++ b/data/layouts/MagmaHideout_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_1F_MapBorder:: .incbin "data/layouts/MagmaHideout_1F/border.bin" - .align 2 MagmaHideout_1F_MapBlockdata:: .incbin "data/layouts/MagmaHideout_1F/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_1F_Layout:: .4byte MagmaHideout_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc index 9d16b20b09..b9f0d27d7e 100644 --- a/data/layouts/MagmaHideout_2F_1R/layout.inc +++ b/data/layouts/MagmaHideout_2F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_2F_1R_MapBorder:: .incbin "data/layouts/MagmaHideout_2F_1R/border.bin" - .align 2 MagmaHideout_2F_1R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_2F_1R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_2F_1R_Layout:: .4byte MagmaHideout_2F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc index 47a492f525..01507909c1 100644 --- a/data/layouts/MagmaHideout_2F_2R/layout.inc +++ b/data/layouts/MagmaHideout_2F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_2F_2R_MapBorder:: .incbin "data/layouts/MagmaHideout_2F_2R/border.bin" - .align 2 MagmaHideout_2F_2R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_2F_2R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_2F_2R_Layout:: .4byte MagmaHideout_2F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc index cf13105878..d88fb50fd0 100644 --- a/data/layouts/MagmaHideout_2F_3R/layout.inc +++ b/data/layouts/MagmaHideout_2F_3R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_2F_3R_MapBorder:: .incbin "data/layouts/MagmaHideout_2F_3R/border.bin" - .align 2 MagmaHideout_2F_3R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_2F_3R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_2F_3R_Layout:: .4byte MagmaHideout_2F_3R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc index 6e72159144..c2199b2f2e 100644 --- a/data/layouts/MagmaHideout_3F_1R/layout.inc +++ b/data/layouts/MagmaHideout_3F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_3F_1R_MapBorder:: .incbin "data/layouts/MagmaHideout_3F_1R/border.bin" - .align 2 MagmaHideout_3F_1R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_3F_1R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_3F_1R_Layout:: .4byte MagmaHideout_3F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc index 6f108d1989..2c4662a49d 100644 --- a/data/layouts/MagmaHideout_3F_2R/layout.inc +++ b/data/layouts/MagmaHideout_3F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_3F_2R_MapBorder:: .incbin "data/layouts/MagmaHideout_3F_2R/border.bin" - .align 2 MagmaHideout_3F_2R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_3F_2R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_3F_2R_Layout:: .4byte MagmaHideout_3F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc index 6508e73bf9..4042b9653b 100644 --- a/data/layouts/MagmaHideout_3F_3R/layout.inc +++ b/data/layouts/MagmaHideout_3F_3R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_3F_3R_MapBorder:: .incbin "data/layouts/MagmaHideout_3F_3R/border.bin" - .align 2 MagmaHideout_3F_3R_MapBlockdata:: .incbin "data/layouts/MagmaHideout_3F_3R/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_3F_3R_Layout:: .4byte MagmaHideout_3F_3R_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc index 32db601011..d7f8c547ca 100644 --- a/data/layouts/MagmaHideout_4F/layout.inc +++ b/data/layouts/MagmaHideout_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MagmaHideout_4F_MapBorder:: .incbin "data/layouts/MagmaHideout_4F/border.bin" - .align 2 MagmaHideout_4F_MapBlockdata:: .incbin "data/layouts/MagmaHideout_4F/map.bin" @@ -14,3 +12,4 @@ MagmaHideout_4F_Layout:: .4byte MagmaHideout_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc index f69952dced..256338b897 100644 --- a/data/layouts/MarineCave_End/layout.inc +++ b/data/layouts/MarineCave_End/layout.inc @@ -1,8 +1,6 @@ - .align 2 MarineCave_End_MapBorder:: .incbin "data/layouts/MarineCave_End/border.bin" - .align 2 MarineCave_End_MapBlockdata:: .incbin "data/layouts/MarineCave_End/map.bin" @@ -14,3 +12,4 @@ MarineCave_End_Layout:: .4byte MarineCave_End_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc index b6c9248c6a..219c182d79 100644 --- a/data/layouts/MarineCave_Entrance/layout.inc +++ b/data/layouts/MarineCave_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 MarineCave_Entrance_MapBorder:: .incbin "data/layouts/MarineCave_Entrance/border.bin" - .align 2 MarineCave_Entrance_MapBlockdata:: .incbin "data/layouts/MarineCave_Entrance/map.bin" @@ -14,3 +12,4 @@ MarineCave_Entrance_Layout:: .4byte MarineCave_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc index 33c2320598..5233e09ab0 100644 --- a/data/layouts/Mart/layout.inc +++ b/data/layouts/Mart/layout.inc @@ -1,8 +1,6 @@ - .align 2 Mart_MapBorder:: .incbin "data/layouts/Mart/border.bin" - .align 2 Mart_MapBlockdata:: .incbin "data/layouts/Mart/map.bin" @@ -14,3 +12,4 @@ Mart_Layout:: .4byte Mart_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc index ba7785c3ee..7a8c17da2e 100644 --- a/data/layouts/MauvilleCity/layout.inc +++ b/data/layouts/MauvilleCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_MapBorder:: .incbin "data/layouts/MauvilleCity/border.bin" - .align 2 MauvilleCity_MapBlockdata:: .incbin "data/layouts/MauvilleCity/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_Layout:: .4byte MauvilleCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc index 4814becf80..f0d358a354 100644 --- a/data/layouts/MauvilleCity_BikeShop/layout.inc +++ b/data/layouts/MauvilleCity_BikeShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_BikeShop_MapBorder:: .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" - .align 2 MauvilleCity_BikeShop_MapBlockdata:: .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_BikeShop_Layout:: .4byte MauvilleCity_BikeShop_MapBlockdata .4byte gTileset_General .4byte gTileset_BikeShop + diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc index 9403c9df66..307f7205e7 100644 --- a/data/layouts/MauvilleCity_GameCorner/layout.inc +++ b/data/layouts/MauvilleCity_GameCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_GameCorner_MapBorder:: .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" - .align 2 MauvilleCity_GameCorner_MapBlockdata:: .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_GameCorner_Layout:: .4byte MauvilleCity_GameCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_MauvilleGameCorner + diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc index 1fdaf921e5..290fca78e0 100644 --- a/data/layouts/MauvilleCity_Gym/layout.inc +++ b/data/layouts/MauvilleCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 MauvilleCity_Gym_MapBorder:: .incbin "data/layouts/MauvilleCity_Gym/border.bin" - .align 2 MauvilleCity_Gym_MapBlockdata:: .incbin "data/layouts/MauvilleCity_Gym/map.bin" @@ -14,3 +12,4 @@ MauvilleCity_Gym_Layout:: .4byte MauvilleCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_MauvilleGym + diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc index 3fea20553d..ba7a0e487b 100644 --- a/data/layouts/MeteorFalls_1F_1R/layout.inc +++ b/data/layouts/MeteorFalls_1F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_1F_1R_MapBorder:: .incbin "data/layouts/MeteorFalls_1F_1R/border.bin" - .align 2 MeteorFalls_1F_1R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_1F_1R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_1F_1R_Layout:: .4byte MeteorFalls_1F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc index ac91e848ea..2e3fcaf2e1 100644 --- a/data/layouts/MeteorFalls_1F_2R/layout.inc +++ b/data/layouts/MeteorFalls_1F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_1F_2R_MapBorder:: .incbin "data/layouts/MeteorFalls_1F_2R/border.bin" - .align 2 MeteorFalls_1F_2R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_1F_2R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_1F_2R_Layout:: .4byte MeteorFalls_1F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc index c424edf3bc..a4f385d8f4 100644 --- a/data/layouts/MeteorFalls_B1F_1R/layout.inc +++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_B1F_1R_MapBorder:: .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin" - .align 2 MeteorFalls_B1F_1R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_B1F_1R_Layout:: .4byte MeteorFalls_B1F_1R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc index b7ee944ccd..982edc975e 100644 --- a/data/layouts/MeteorFalls_B1F_2R/layout.inc +++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_B1F_2R_MapBorder:: .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin" - .align 2 MeteorFalls_B1F_2R_MapBlockdata:: .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_B1F_2R_Layout:: .4byte MeteorFalls_B1F_2R_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc index 992e7d1740..1baf70a097 100644 --- a/data/layouts/MeteorFalls_StevensCave/layout.inc +++ b/data/layouts/MeteorFalls_StevensCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 MeteorFalls_StevensCave_MapBorder:: .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" - .align 2 MeteorFalls_StevensCave_MapBlockdata:: .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" @@ -14,3 +12,4 @@ MeteorFalls_StevensCave_Layout:: .4byte MeteorFalls_StevensCave_MapBlockdata .4byte gTileset_General .4byte gTileset_MeteorFalls + diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc index e4bb92d747..be36cc758b 100644 --- a/data/layouts/MirageTower_1F/layout.inc +++ b/data/layouts/MirageTower_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_1F_MapBorder:: .incbin "data/layouts/MirageTower_1F/border.bin" - .align 2 MirageTower_1F_MapBlockdata:: .incbin "data/layouts/MirageTower_1F/map.bin" @@ -14,3 +12,4 @@ MirageTower_1F_Layout:: .4byte MirageTower_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc index 601dd9de29..ec4971bc41 100644 --- a/data/layouts/MirageTower_2F/layout.inc +++ b/data/layouts/MirageTower_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_2F_MapBorder:: .incbin "data/layouts/MirageTower_2F/border.bin" - .align 2 MirageTower_2F_MapBlockdata:: .incbin "data/layouts/MirageTower_2F/map.bin" @@ -14,3 +12,4 @@ MirageTower_2F_Layout:: .4byte MirageTower_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc index 2bcd9806dd..c12de3a150 100644 --- a/data/layouts/MirageTower_3F/layout.inc +++ b/data/layouts/MirageTower_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_3F_MapBorder:: .incbin "data/layouts/MirageTower_3F/border.bin" - .align 2 MirageTower_3F_MapBlockdata:: .incbin "data/layouts/MirageTower_3F/map.bin" @@ -14,3 +12,4 @@ MirageTower_3F_Layout:: .4byte MirageTower_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc index babf2a5c74..518f7c9435 100644 --- a/data/layouts/MirageTower_4F/layout.inc +++ b/data/layouts/MirageTower_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MirageTower_4F_MapBorder:: .incbin "data/layouts/MirageTower_4F/border.bin" - .align 2 MirageTower_4F_MapBlockdata:: .incbin "data/layouts/MirageTower_4F/map.bin" @@ -14,3 +12,4 @@ MirageTower_4F_Layout:: .4byte MirageTower_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_MirageTower + diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc index b5d392dc71..881cf9498d 100644 --- a/data/layouts/MossdeepCity/layout.inc +++ b/data/layouts/MossdeepCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_MapBorder:: .incbin "data/layouts/MossdeepCity/border.bin" - .align 2 MossdeepCity_MapBlockdata:: .incbin "data/layouts/MossdeepCity/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_Layout:: .4byte MossdeepCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc index e03619423c..2c2fb717da 100644 --- a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc +++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_GameCorner_1F_MapBorder:: .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin" - .align 2 MossdeepCity_GameCorner_1F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_GameCorner_1F_Layout:: .4byte MossdeepCity_GameCorner_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MossdeepGameCorner + diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc index b51e183626..ec5dd2a574 100644 --- a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc +++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_GameCorner_B1F_MapBorder:: .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin" - .align 2 MossdeepCity_GameCorner_B1F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_GameCorner_B1F_Layout:: .4byte MossdeepCity_GameCorner_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc index fbdfa6fddd..a65212a40c 100644 --- a/data/layouts/MossdeepCity_Gym/layout.inc +++ b/data/layouts/MossdeepCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_Gym_MapBorder:: .incbin "data/layouts/MossdeepCity_Gym/border.bin" - .align 2 MossdeepCity_Gym_MapBlockdata:: .incbin "data/layouts/MossdeepCity_Gym/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_Gym_Layout:: .4byte MossdeepCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_MossdeepGym + diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc index c5fc2f5707..759e688912 100644 --- a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc +++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_SpaceCenter_1F_MapBorder:: .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin" - .align 2 MossdeepCity_SpaceCenter_1F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_SpaceCenter_1F_Layout:: .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc index 4d406accc6..6e370a7fac 100644 --- a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc +++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_SpaceCenter_2F_MapBorder:: .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin" - .align 2 MossdeepCity_SpaceCenter_2F_MapBlockdata:: .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_SpaceCenter_2F_Layout:: .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc index 29aede186e..0db92aee9f 100644 --- a/data/layouts/MossdeepCity_StevensHouse/layout.inc +++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 MossdeepCity_StevensHouse_MapBorder:: .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" - .align 2 MossdeepCity_StevensHouse_MapBlockdata:: .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" @@ -14,3 +12,4 @@ MossdeepCity_StevensHouse_Layout:: .4byte MossdeepCity_StevensHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc index f0afefe3b7..29a3b1ad7e 100644 --- a/data/layouts/MtChimney/layout.inc +++ b/data/layouts/MtChimney/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtChimney_MapBorder:: .incbin "data/layouts/MtChimney/border.bin" - .align 2 MtChimney_MapBlockdata:: .incbin "data/layouts/MtChimney/map.bin" @@ -14,3 +12,4 @@ MtChimney_Layout:: .4byte MtChimney_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc index bd7fd82d51..2402e815c4 100644 --- a/data/layouts/MtPyre_1F/layout.inc +++ b/data/layouts/MtPyre_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_1F_MapBorder:: .incbin "data/layouts/MtPyre_1F/border.bin" - .align 2 MtPyre_1F_MapBlockdata:: .incbin "data/layouts/MtPyre_1F/map.bin" @@ -14,3 +12,4 @@ MtPyre_1F_Layout:: .4byte MtPyre_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc index cbf534f693..8d6ca12003 100644 --- a/data/layouts/MtPyre_2F/layout.inc +++ b/data/layouts/MtPyre_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_2F_MapBorder:: .incbin "data/layouts/MtPyre_2F/border.bin" - .align 2 MtPyre_2F_MapBlockdata:: .incbin "data/layouts/MtPyre_2F/map.bin" @@ -14,3 +12,4 @@ MtPyre_2F_Layout:: .4byte MtPyre_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc index ceaa1bea9d..24ed0f7b12 100644 --- a/data/layouts/MtPyre_3F/layout.inc +++ b/data/layouts/MtPyre_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_3F_MapBorder:: .incbin "data/layouts/MtPyre_3F/border.bin" - .align 2 MtPyre_3F_MapBlockdata:: .incbin "data/layouts/MtPyre_3F/map.bin" @@ -14,3 +12,4 @@ MtPyre_3F_Layout:: .4byte MtPyre_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc index 5bd0eab595..65a8fcf598 100644 --- a/data/layouts/MtPyre_4F/layout.inc +++ b/data/layouts/MtPyre_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_4F_MapBorder:: .incbin "data/layouts/MtPyre_4F/border.bin" - .align 2 MtPyre_4F_MapBlockdata:: .incbin "data/layouts/MtPyre_4F/map.bin" @@ -14,3 +12,4 @@ MtPyre_4F_Layout:: .4byte MtPyre_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc index fed3f9ae2f..222c6eb804 100644 --- a/data/layouts/MtPyre_5F/layout.inc +++ b/data/layouts/MtPyre_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_5F_MapBorder:: .incbin "data/layouts/MtPyre_5F/border.bin" - .align 2 MtPyre_5F_MapBlockdata:: .incbin "data/layouts/MtPyre_5F/map.bin" @@ -14,3 +12,4 @@ MtPyre_5F_Layout:: .4byte MtPyre_5F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc index 0fe9f6982a..31b5288d5b 100644 --- a/data/layouts/MtPyre_6F/layout.inc +++ b/data/layouts/MtPyre_6F/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_6F_MapBorder:: .incbin "data/layouts/MtPyre_6F/border.bin" - .align 2 MtPyre_6F_MapBlockdata:: .incbin "data/layouts/MtPyre_6F/map.bin" @@ -14,3 +12,4 @@ MtPyre_6F_Layout:: .4byte MtPyre_6F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc index 2f81759d75..1b5997dbae 100644 --- a/data/layouts/MtPyre_Exterior/layout.inc +++ b/data/layouts/MtPyre_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_Exterior_MapBorder:: .incbin "data/layouts/MtPyre_Exterior/border.bin" - .align 2 MtPyre_Exterior_MapBlockdata:: .incbin "data/layouts/MtPyre_Exterior/map.bin" @@ -14,3 +12,4 @@ MtPyre_Exterior_Layout:: .4byte MtPyre_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc index 4f30ac9e1d..58e932eb7a 100644 --- a/data/layouts/MtPyre_Summit/layout.inc +++ b/data/layouts/MtPyre_Summit/layout.inc @@ -1,8 +1,6 @@ - .align 2 MtPyre_Summit_MapBorder:: .incbin "data/layouts/MtPyre_Summit/border.bin" - .align 2 MtPyre_Summit_MapBlockdata:: .incbin "data/layouts/MtPyre_Summit/map.bin" @@ -14,3 +12,4 @@ MtPyre_Summit_Layout:: .4byte MtPyre_Summit_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc index 899aa8eed3..6f15bd2766 100644 --- a/data/layouts/NavelRock_B1F/layout.inc +++ b/data/layouts/NavelRock_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_B1F_MapBorder:: .incbin "data/layouts/NavelRock_B1F/border.bin" - .align 2 NavelRock_B1F_MapBlockdata:: .incbin "data/layouts/NavelRock_B1F/map.bin" @@ -14,3 +12,4 @@ NavelRock_B1F_Layout:: .4byte NavelRock_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc index 043a977de6..5c96a8cef2 100644 --- a/data/layouts/NavelRock_Bottom/layout.inc +++ b/data/layouts/NavelRock_Bottom/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Bottom_MapBorder:: .incbin "data/layouts/NavelRock_Bottom/border.bin" - .align 2 NavelRock_Bottom_MapBlockdata:: .incbin "data/layouts/NavelRock_Bottom/map.bin" @@ -14,3 +12,4 @@ NavelRock_Bottom_Layout:: .4byte NavelRock_Bottom_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc index d9a12b71d9..6dcedcb208 100644 --- a/data/layouts/NavelRock_Entrance/layout.inc +++ b/data/layouts/NavelRock_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Entrance_MapBorder:: .incbin "data/layouts/NavelRock_Entrance/border.bin" - .align 2 NavelRock_Entrance_MapBlockdata:: .incbin "data/layouts/NavelRock_Entrance/map.bin" @@ -14,3 +12,4 @@ NavelRock_Entrance_Layout:: .4byte NavelRock_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc index b3fc825cf6..c2c4fa95e5 100644 --- a/data/layouts/NavelRock_Exterior/layout.inc +++ b/data/layouts/NavelRock_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Exterior_MapBorder:: .incbin "data/layouts/NavelRock_Exterior/border.bin" - .align 2 NavelRock_Exterior_MapBlockdata:: .incbin "data/layouts/NavelRock_Exterior/map.bin" @@ -14,3 +12,4 @@ NavelRock_Exterior_Layout:: .4byte NavelRock_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc index 0f7956e5eb..ab5d9c8673 100644 --- a/data/layouts/NavelRock_Fork/layout.inc +++ b/data/layouts/NavelRock_Fork/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Fork_MapBorder:: .incbin "data/layouts/NavelRock_Fork/border.bin" - .align 2 NavelRock_Fork_MapBlockdata:: .incbin "data/layouts/NavelRock_Fork/map.bin" @@ -14,3 +12,4 @@ NavelRock_Fork_Layout:: .4byte NavelRock_Fork_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc index 34ff05e395..a7fc73d220 100644 --- a/data/layouts/NavelRock_LadderRoom1/layout.inc +++ b/data/layouts/NavelRock_LadderRoom1/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_LadderRoom1_MapBorder:: .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" - .align 2 NavelRock_LadderRoom1_MapBlockdata:: .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" @@ -14,3 +12,4 @@ NavelRock_LadderRoom1_Layout:: .4byte NavelRock_LadderRoom1_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc index a50a32690f..8fbd6e51ff 100644 --- a/data/layouts/NavelRock_LadderRoom2/layout.inc +++ b/data/layouts/NavelRock_LadderRoom2/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_LadderRoom2_MapBorder:: .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" - .align 2 NavelRock_LadderRoom2_MapBlockdata:: .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" @@ -14,3 +12,4 @@ NavelRock_LadderRoom2_Layout:: .4byte NavelRock_LadderRoom2_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc index 6e99e9bf41..50698cc768 100644 --- a/data/layouts/NavelRock_Top/layout.inc +++ b/data/layouts/NavelRock_Top/layout.inc @@ -1,8 +1,6 @@ - .align 2 NavelRock_Top_MapBorder:: .incbin "data/layouts/NavelRock_Top/border.bin" - .align 2 NavelRock_Top_MapBlockdata:: .incbin "data/layouts/NavelRock_Top/map.bin" @@ -14,3 +12,4 @@ NavelRock_Top_Layout:: .4byte NavelRock_Top_MapBlockdata .4byte gTileset_General .4byte gTileset_NavelRock + diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc index 78e3edee40..bbd81cac7d 100644 --- a/data/layouts/NewMauville_Entrance/layout.inc +++ b/data/layouts/NewMauville_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 NewMauville_Entrance_MapBorder:: .incbin "data/layouts/NewMauville_Entrance/border.bin" - .align 2 NewMauville_Entrance_MapBlockdata:: .incbin "data/layouts/NewMauville_Entrance/map.bin" @@ -14,3 +12,4 @@ NewMauville_Entrance_Layout:: .4byte NewMauville_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc index d7dbe6a620..096142c6de 100644 --- a/data/layouts/NewMauville_Inside/layout.inc +++ b/data/layouts/NewMauville_Inside/layout.inc @@ -1,8 +1,6 @@ - .align 2 NewMauville_Inside_MapBorder:: .incbin "data/layouts/NewMauville_Inside/border.bin" - .align 2 NewMauville_Inside_MapBlockdata:: .incbin "data/layouts/NewMauville_Inside/map.bin" @@ -14,3 +12,4 @@ NewMauville_Inside_Layout:: .4byte NewMauville_Inside_MapBlockdata .4byte gTileset_General .4byte gTileset_BikeShop + diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc index 7d266cfba9..9709ca1ea0 100644 --- a/data/layouts/OldaleTown/layout.inc +++ b/data/layouts/OldaleTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 OldaleTown_MapBorder:: .incbin "data/layouts/OldaleTown/border.bin" - .align 2 OldaleTown_MapBlockdata:: .incbin "data/layouts/OldaleTown/map.bin" @@ -14,3 +12,4 @@ OldaleTown_Layout:: .4byte OldaleTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc index a87de70363..4ba791f231 100644 --- a/data/layouts/PacifidlogTown/layout.inc +++ b/data/layouts/PacifidlogTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_MapBorder:: .incbin "data/layouts/PacifidlogTown/border.bin" - .align 2 PacifidlogTown_MapBlockdata:: .incbin "data/layouts/PacifidlogTown/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_Layout:: .4byte PacifidlogTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc index 16f9402ca4..b5dcf58b23 100644 --- a/data/layouts/PacifidlogTown_House1/layout.inc +++ b/data/layouts/PacifidlogTown_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_House1_MapBorder:: .incbin "data/layouts/PacifidlogTown_House1/border.bin" - .align 2 PacifidlogTown_House1_MapBlockdata:: .incbin "data/layouts/PacifidlogTown_House1/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_House1_Layout:: .4byte PacifidlogTown_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc index deb1110599..a10daa3cd6 100644 --- a/data/layouts/PacifidlogTown_House2/layout.inc +++ b/data/layouts/PacifidlogTown_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 PacifidlogTown_House2_MapBorder:: .incbin "data/layouts/PacifidlogTown_House2/border.bin" - .align 2 PacifidlogTown_House2_MapBlockdata:: .incbin "data/layouts/PacifidlogTown_House2/map.bin" @@ -14,3 +12,4 @@ PacifidlogTown_House2_Layout:: .4byte PacifidlogTown_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc index c458140a9c..bae16b88f3 100644 --- a/data/layouts/PetalburgCity/layout.inc +++ b/data/layouts/PetalburgCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgCity_MapBorder:: .incbin "data/layouts/PetalburgCity/border.bin" - .align 2 PetalburgCity_MapBlockdata:: .incbin "data/layouts/PetalburgCity/map.bin" @@ -14,3 +12,4 @@ PetalburgCity_Layout:: .4byte PetalburgCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc index 974b95baf0..36fe1002ff 100644 --- a/data/layouts/PetalburgCity_Gym/layout.inc +++ b/data/layouts/PetalburgCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgCity_Gym_MapBorder:: .incbin "data/layouts/PetalburgCity_Gym/border.bin" - .align 2 PetalburgCity_Gym_MapBlockdata:: .incbin "data/layouts/PetalburgCity_Gym/map.bin" @@ -14,3 +12,4 @@ PetalburgCity_Gym_Layout:: .4byte PetalburgCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_PetalburgGym + diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc index 6ee24ef31e..840e17f7e8 100644 --- a/data/layouts/PetalburgWoods/layout.inc +++ b/data/layouts/PetalburgWoods/layout.inc @@ -1,8 +1,6 @@ - .align 2 PetalburgWoods_MapBorder:: .incbin "data/layouts/PetalburgWoods/border.bin" - .align 2 PetalburgWoods_MapBlockdata:: .incbin "data/layouts/PetalburgWoods/map.bin" @@ -14,3 +12,4 @@ PetalburgWoods_Layout:: .4byte PetalburgWoods_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc index 4d299d4070..bf1335f844 100644 --- a/data/layouts/PokemonCenter_1F/layout.inc +++ b/data/layouts/PokemonCenter_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 PokemonCenter_1F_MapBorder:: .incbin "data/layouts/PokemonCenter_1F/border.bin" - .align 2 PokemonCenter_1F_MapBlockdata:: .incbin "data/layouts/PokemonCenter_1F/map.bin" @@ -14,3 +12,4 @@ PokemonCenter_1F_Layout:: .4byte PokemonCenter_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc index cc2aba89a0..3cb812de77 100644 --- a/data/layouts/PokemonCenter_2F/layout.inc +++ b/data/layouts/PokemonCenter_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 PokemonCenter_2F_MapBorder:: .incbin "data/layouts/PokemonCenter_2F/border.bin" - .align 2 PokemonCenter_2F_MapBlockdata:: .incbin "data/layouts/PokemonCenter_2F/map.bin" @@ -14,3 +12,4 @@ PokemonCenter_2F_Layout:: .4byte PokemonCenter_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonCenter + diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc index ab18faa0db..ed258b2a7f 100644 --- a/data/layouts/RecordCorner/layout.inc +++ b/data/layouts/RecordCorner/layout.inc @@ -1,8 +1,6 @@ - .align 2 RecordCorner_MapBorder:: .incbin "data/layouts/RecordCorner/border.bin" - .align 2 RecordCorner_MapBlockdata:: .incbin "data/layouts/RecordCorner/map.bin" @@ -14,3 +12,4 @@ RecordCorner_Layout:: .4byte RecordCorner_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc index 54193c3435..e42ecf340e 100644 --- a/data/layouts/Route101/layout.inc +++ b/data/layouts/Route101/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route101_MapBorder:: .incbin "data/layouts/Route101/border.bin" - .align 2 Route101_MapBlockdata:: .incbin "data/layouts/Route101/map.bin" @@ -14,3 +12,4 @@ Route101_Layout:: .4byte Route101_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc index eaf962db27..194d44fce7 100644 --- a/data/layouts/Route102/layout.inc +++ b/data/layouts/Route102/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route102_MapBorder:: .incbin "data/layouts/Route102/border.bin" - .align 2 Route102_MapBlockdata:: .incbin "data/layouts/Route102/map.bin" @@ -14,3 +12,4 @@ Route102_Layout:: .4byte Route102_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc index eaf00808e5..fe3bac0668 100644 --- a/data/layouts/Route103/layout.inc +++ b/data/layouts/Route103/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route103_MapBorder:: .incbin "data/layouts/Route103/border.bin" - .align 2 Route103_MapBlockdata:: .incbin "data/layouts/Route103/map.bin" @@ -14,3 +12,4 @@ Route103_Layout:: .4byte Route103_MapBlockdata .4byte gTileset_General .4byte gTileset_Petalburg + diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc index 58a000d706..9a9418e461 100644 --- a/data/layouts/Route104/layout.inc +++ b/data/layouts/Route104/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_MapBorder:: .incbin "data/layouts/Route104/border.bin" - .align 2 Route104_MapBlockdata:: .incbin "data/layouts/Route104/map.bin" @@ -14,3 +12,4 @@ Route104_Layout:: .4byte Route104_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc index 039901d0a5..3474f33351 100644 --- a/data/layouts/Route104_MrBrineysHouse/layout.inc +++ b/data/layouts/Route104_MrBrineysHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_MrBrineysHouse_MapBorder:: .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" - .align 2 Route104_MrBrineysHouse_MapBlockdata:: .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" @@ -14,3 +12,4 @@ Route104_MrBrineysHouse_Layout:: .4byte Route104_MrBrineysHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc index 0510c90288..a46ffc18c8 100644 --- a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc +++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_PrettyPetalFlowerShop_MapBorder:: .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" - .align 2 Route104_PrettyPetalFlowerShop_MapBlockdata:: .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" @@ -14,3 +12,4 @@ Route104_PrettyPetalFlowerShop_Layout:: .4byte Route104_PrettyPetalFlowerShop_MapBlockdata .4byte gTileset_Building .4byte gTileset_PrettyPetalFlowerShop + diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc index eb70f55c9a..b2b2c4f194 100644 --- a/data/layouts/Route104_Prototype/layout.inc +++ b/data/layouts/Route104_Prototype/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route104_Prototype_MapBorder:: .incbin "data/layouts/Route104_Prototype/border.bin" - .align 2 Route104_Prototype_MapBlockdata:: .incbin "data/layouts/Route104_Prototype/map.bin" @@ -14,3 +12,4 @@ Route104_Prototype_Layout:: .4byte Route104_Prototype_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc index 4156bc9a46..ce78ef9cc2 100644 --- a/data/layouts/Route105/layout.inc +++ b/data/layouts/Route105/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route105_MapBorder:: .incbin "data/layouts/Route105/border.bin" - .align 2 Route105_MapBlockdata:: .incbin "data/layouts/Route105/map.bin" @@ -14,3 +12,4 @@ Route105_Layout:: .4byte Route105_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc index ff43ced2ed..ea255b383b 100644 --- a/data/layouts/Route106/layout.inc +++ b/data/layouts/Route106/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route106_MapBorder:: .incbin "data/layouts/Route106/border.bin" - .align 2 Route106_MapBlockdata:: .incbin "data/layouts/Route106/map.bin" @@ -14,3 +12,4 @@ Route106_Layout:: .4byte Route106_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc index 9de501c61b..ea305b2a76 100644 --- a/data/layouts/Route107/layout.inc +++ b/data/layouts/Route107/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route107_MapBorder:: .incbin "data/layouts/Route107/border.bin" - .align 2 Route107_MapBlockdata:: .incbin "data/layouts/Route107/map.bin" @@ -14,3 +12,4 @@ Route107_Layout:: .4byte Route107_MapBlockdata .4byte gTileset_General .4byte gTileset_Dewford + diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc index 10fd278b3e..1ec7171cf0 100644 --- a/data/layouts/Route108/layout.inc +++ b/data/layouts/Route108/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route108_MapBorder:: .incbin "data/layouts/Route108/border.bin" - .align 2 Route108_MapBlockdata:: .incbin "data/layouts/Route108/map.bin" @@ -14,3 +12,4 @@ Route108_Layout:: .4byte Route108_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc index f6d4864bf7..fa41585e93 100644 --- a/data/layouts/Route109/layout.inc +++ b/data/layouts/Route109/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route109_MapBorder:: .incbin "data/layouts/Route109/border.bin" - .align 2 Route109_MapBlockdata:: .incbin "data/layouts/Route109/map.bin" @@ -14,3 +12,4 @@ Route109_Layout:: .4byte Route109_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc index 316c1fc1b6..9ec997b484 100644 --- a/data/layouts/Route109_SeashoreHouse/layout.inc +++ b/data/layouts/Route109_SeashoreHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route109_SeashoreHouse_MapBorder:: .incbin "data/layouts/Route109_SeashoreHouse/border.bin" - .align 2 Route109_SeashoreHouse_MapBlockdata:: .incbin "data/layouts/Route109_SeashoreHouse/map.bin" @@ -14,3 +12,4 @@ Route109_SeashoreHouse_Layout:: .4byte Route109_SeashoreHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_SeashoreHouse + diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc index 1539ae91d5..24e5a93210 100644 --- a/data/layouts/Route110/layout.inc +++ b/data/layouts/Route110/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_MapBorder:: .incbin "data/layouts/Route110/border.bin" - .align 2 Route110_MapBlockdata:: .incbin "data/layouts/Route110/map.bin" @@ -14,3 +12,4 @@ Route110_Layout:: .4byte Route110_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc index 4f804ef53d..abf78f62dd 100644 --- a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc +++ b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_SeasideCyclingRoadEntrance_MapBorder:: .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" - .align 2 Route110_SeasideCyclingRoadEntrance_MapBlockdata:: .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" @@ -14,3 +12,4 @@ Route110_SeasideCyclingRoadEntrance_Layout:: .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc index 8f9c4d9eea..fe6ee4d26b 100644 --- a/data/layouts/Route110_TrickHouseCorridor/layout.inc +++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseCorridor_MapBorder:: .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" - .align 2 Route110_TrickHouseCorridor_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseCorridor_Layout:: .4byte Route110_TrickHouseCorridor_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc index ee2b6b47f0..dd9474aeef 100644 --- a/data/layouts/Route110_TrickHouseEnd/layout.inc +++ b/data/layouts/Route110_TrickHouseEnd/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseEnd_MapBorder:: .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" - .align 2 Route110_TrickHouseEnd_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseEnd_Layout:: .4byte Route110_TrickHouseEnd_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc index ec96366279..97f3abe24c 100644 --- a/data/layouts/Route110_TrickHouseEntrance/layout.inc +++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHouseEntrance_MapBorder:: .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" - .align 2 Route110_TrickHouseEntrance_MapBlockdata:: .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHouseEntrance_Layout:: .4byte Route110_TrickHouseEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc index d8aadf1101..546876ab00 100644 --- a/data/layouts/Route110_TrickHousePuzzle1/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle1_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" - .align 2 Route110_TrickHousePuzzle1_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle1_Layout:: .4byte Route110_TrickHousePuzzle1_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc index 59bc2d06c0..65caaa7341 100644 --- a/data/layouts/Route110_TrickHousePuzzle2/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle2_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" - .align 2 Route110_TrickHousePuzzle2_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle2_Layout:: .4byte Route110_TrickHousePuzzle2_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc index 384a840327..a03cf9a719 100644 --- a/data/layouts/Route110_TrickHousePuzzle3/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle3_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" - .align 2 Route110_TrickHousePuzzle3_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle3_Layout:: .4byte Route110_TrickHousePuzzle3_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc index 3524e092d8..581b41a43b 100644 --- a/data/layouts/Route110_TrickHousePuzzle4/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle4_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" - .align 2 Route110_TrickHousePuzzle4_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle4_Layout:: .4byte Route110_TrickHousePuzzle4_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc index 06f105c71d..5e06ac31e4 100644 --- a/data/layouts/Route110_TrickHousePuzzle5/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle5_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" - .align 2 Route110_TrickHousePuzzle5_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle5_Layout:: .4byte Route110_TrickHousePuzzle5_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc index b11da0a1de..398c179516 100644 --- a/data/layouts/Route110_TrickHousePuzzle6/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle6_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" - .align 2 Route110_TrickHousePuzzle6_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle6_Layout:: .4byte Route110_TrickHousePuzzle6_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc index 8d9e88b7e5..1612ec41b5 100644 --- a/data/layouts/Route110_TrickHousePuzzle7/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle7_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" - .align 2 Route110_TrickHousePuzzle7_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle7_Layout:: .4byte Route110_TrickHousePuzzle7_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc index 139cefadcc..3520b503f7 100644 --- a/data/layouts/Route110_TrickHousePuzzle8/layout.inc +++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route110_TrickHousePuzzle8_MapBorder:: .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" - .align 2 Route110_TrickHousePuzzle8_MapBlockdata:: .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" @@ -14,3 +12,4 @@ Route110_TrickHousePuzzle8_Layout:: .4byte Route110_TrickHousePuzzle8_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrickHousePuzzle + diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc index 911ecfcb08..2966c06c54 100644 --- a/data/layouts/Route111/layout.inc +++ b/data/layouts/Route111/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route111_MapBorder:: .incbin "data/layouts/Route111/border.bin" - .align 2 Route111_MapBlockdata:: .incbin "data/layouts/Route111/map.bin" @@ -14,3 +12,4 @@ Route111_Layout:: .4byte Route111_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc index 22aae208c8..72a0c428c4 100644 --- a/data/layouts/Route112/layout.inc +++ b/data/layouts/Route112/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route112_MapBorder:: .incbin "data/layouts/Route112/border.bin" - .align 2 Route112_MapBlockdata:: .incbin "data/layouts/Route112/map.bin" @@ -14,3 +12,4 @@ Route112_Layout:: .4byte Route112_MapBlockdata .4byte gTileset_General .4byte gTileset_Lavaridge + diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc index a6a4389864..0c1d76b585 100644 --- a/data/layouts/Route113/layout.inc +++ b/data/layouts/Route113/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route113_MapBorder:: .incbin "data/layouts/Route113/border.bin" - .align 2 Route113_MapBlockdata:: .incbin "data/layouts/Route113/map.bin" @@ -14,3 +12,4 @@ Route113_Layout:: .4byte Route113_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc index 1391ce2969..071f9e1b66 100644 --- a/data/layouts/Route114/layout.inc +++ b/data/layouts/Route114/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_MapBorder:: .incbin "data/layouts/Route114/border.bin" - .align 2 Route114_MapBlockdata:: .incbin "data/layouts/Route114/map.bin" @@ -14,3 +12,4 @@ Route114_Layout:: .4byte Route114_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc index 3140908493..f915e572a9 100644 --- a/data/layouts/Route114_FossilManiacsHouse/layout.inc +++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_FossilManiacsHouse_MapBorder:: .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" - .align 2 Route114_FossilManiacsHouse_MapBlockdata:: .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" @@ -14,3 +12,4 @@ Route114_FossilManiacsHouse_Layout:: .4byte Route114_FossilManiacsHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc index 90a891b57b..c2392ff01c 100644 --- a/data/layouts/Route114_FossilManiacsTunnel/layout.inc +++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_FossilManiacsTunnel_MapBorder:: .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" - .align 2 Route114_FossilManiacsTunnel_MapBlockdata:: .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" @@ -14,3 +12,4 @@ Route114_FossilManiacsTunnel_Layout:: .4byte Route114_FossilManiacsTunnel_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc index e1f2354c1f..be9689ae30 100644 --- a/data/layouts/Route114_LanettesHouse/layout.inc +++ b/data/layouts/Route114_LanettesHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route114_LanettesHouse_MapBorder:: .incbin "data/layouts/Route114_LanettesHouse/border.bin" - .align 2 Route114_LanettesHouse_MapBlockdata:: .incbin "data/layouts/Route114_LanettesHouse/map.bin" @@ -14,3 +12,4 @@ Route114_LanettesHouse_Layout:: .4byte Route114_LanettesHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc index 1a51214745..9d6c3c969b 100644 --- a/data/layouts/Route115/layout.inc +++ b/data/layouts/Route115/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route115_MapBorder:: .incbin "data/layouts/Route115/border.bin" - .align 2 Route115_MapBlockdata:: .incbin "data/layouts/Route115/map.bin" @@ -14,3 +12,4 @@ Route115_Layout:: .4byte Route115_MapBlockdata .4byte gTileset_General .4byte gTileset_Fallarbor + diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc index 54471a0e09..232cc41f8a 100644 --- a/data/layouts/Route116/layout.inc +++ b/data/layouts/Route116/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route116_MapBorder:: .incbin "data/layouts/Route116/border.bin" - .align 2 Route116_MapBlockdata:: .incbin "data/layouts/Route116/map.bin" @@ -14,3 +12,4 @@ Route116_Layout:: .4byte Route116_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc index 4faea6ce60..1bd42eafca 100644 --- a/data/layouts/Route116_TunnelersRestHouse/layout.inc +++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route116_TunnelersRestHouse_MapBorder:: .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" - .align 2 Route116_TunnelersRestHouse_MapBlockdata:: .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" @@ -14,3 +12,4 @@ Route116_TunnelersRestHouse_Layout:: .4byte Route116_TunnelersRestHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc index 75b7f0d986..25e133f28e 100644 --- a/data/layouts/Route117/layout.inc +++ b/data/layouts/Route117/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route117_MapBorder:: .incbin "data/layouts/Route117/border.bin" - .align 2 Route117_MapBlockdata:: .incbin "data/layouts/Route117/map.bin" @@ -14,3 +12,4 @@ Route117_Layout:: .4byte Route117_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc index 0589c2d1b1..403881bfea 100644 --- a/data/layouts/Route117_PokemonDayCare/layout.inc +++ b/data/layouts/Route117_PokemonDayCare/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route117_PokemonDayCare_MapBorder:: .incbin "data/layouts/Route117_PokemonDayCare/border.bin" - .align 2 Route117_PokemonDayCare_MapBlockdata:: .incbin "data/layouts/Route117_PokemonDayCare/map.bin" @@ -14,3 +12,4 @@ Route117_PokemonDayCare_Layout:: .4byte Route117_PokemonDayCare_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonDayCare + diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc index a78bd28dea..cb87f8414e 100644 --- a/data/layouts/Route118/layout.inc +++ b/data/layouts/Route118/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route118_MapBorder:: .incbin "data/layouts/Route118/border.bin" - .align 2 Route118_MapBlockdata:: .incbin "data/layouts/Route118/map.bin" @@ -14,3 +12,4 @@ Route118_Layout:: .4byte Route118_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc index 0f288c2c5a..66502fb15f 100644 --- a/data/layouts/Route119/layout.inc +++ b/data/layouts/Route119/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route119_MapBorder:: .incbin "data/layouts/Route119/border.bin" - .align 2 Route119_MapBlockdata:: .incbin "data/layouts/Route119/map.bin" @@ -14,3 +12,4 @@ Route119_Layout:: .4byte Route119_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc index 35ae95d378..9637beea5c 100644 --- a/data/layouts/Route119_WeatherInstitute_1F/layout.inc +++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route119_WeatherInstitute_1F_MapBorder:: .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin" - .align 2 Route119_WeatherInstitute_1F_MapBlockdata:: .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin" @@ -14,3 +12,4 @@ Route119_WeatherInstitute_1F_Layout:: .4byte Route119_WeatherInstitute_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc index 476ebf4fae..4f0948f7be 100644 --- a/data/layouts/Route119_WeatherInstitute_2F/layout.inc +++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route119_WeatherInstitute_2F_MapBorder:: .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin" - .align 2 Route119_WeatherInstitute_2F_MapBlockdata:: .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin" @@ -14,3 +12,4 @@ Route119_WeatherInstitute_2F_Layout:: .4byte Route119_WeatherInstitute_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc index a58e60aee4..f9e9255a0f 100644 --- a/data/layouts/Route120/layout.inc +++ b/data/layouts/Route120/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route120_MapBorder:: .incbin "data/layouts/Route120/border.bin" - .align 2 Route120_MapBlockdata:: .incbin "data/layouts/Route120/map.bin" @@ -14,3 +12,4 @@ Route120_Layout:: .4byte Route120_MapBlockdata .4byte gTileset_General .4byte gTileset_Fortree + diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc index 0e39c4d35a..4d2c9744a4 100644 --- a/data/layouts/Route121/layout.inc +++ b/data/layouts/Route121/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route121_MapBorder:: .incbin "data/layouts/Route121/border.bin" - .align 2 Route121_MapBlockdata:: .incbin "data/layouts/Route121/map.bin" @@ -14,3 +12,4 @@ Route121_Layout:: .4byte Route121_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc index f28d1b4dc9..38ad9e97ed 100644 --- a/data/layouts/Route121_SafariZoneEntrance/layout.inc +++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route121_SafariZoneEntrance_MapBorder:: .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" - .align 2 Route121_SafariZoneEntrance_MapBlockdata:: .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" @@ -14,3 +12,4 @@ Route121_SafariZoneEntrance_Layout:: .4byte Route121_SafariZoneEntrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_Shop + diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc index 39f70e4e49..7f0baac20e 100644 --- a/data/layouts/Route122/layout.inc +++ b/data/layouts/Route122/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route122_MapBorder:: .incbin "data/layouts/Route122/border.bin" - .align 2 Route122_MapBlockdata:: .incbin "data/layouts/Route122/map.bin" @@ -14,3 +12,4 @@ Route122_Layout:: .4byte Route122_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc index db9093ba9f..0c76c2b7b6 100644 --- a/data/layouts/Route123/layout.inc +++ b/data/layouts/Route123/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route123_MapBorder:: .incbin "data/layouts/Route123/border.bin" - .align 2 Route123_MapBlockdata:: .incbin "data/layouts/Route123/map.bin" @@ -14,3 +12,4 @@ Route123_Layout:: .4byte Route123_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc index e2c9abffcb..d27ed902a5 100644 --- a/data/layouts/Route124/layout.inc +++ b/data/layouts/Route124/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route124_MapBorder:: .incbin "data/layouts/Route124/border.bin" - .align 2 Route124_MapBlockdata:: .incbin "data/layouts/Route124/map.bin" @@ -14,3 +12,4 @@ Route124_Layout:: .4byte Route124_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc index 2179d72080..2635712359 100644 --- a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc +++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route124_DivingTreasureHuntersHouse_MapBorder:: .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" - .align 2 Route124_DivingTreasureHuntersHouse_MapBlockdata:: .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" @@ -14,3 +12,4 @@ Route124_DivingTreasureHuntersHouse_Layout:: .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc index 7c894c943d..f0d4e13b73 100644 --- a/data/layouts/Route125/layout.inc +++ b/data/layouts/Route125/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route125_MapBorder:: .incbin "data/layouts/Route125/border.bin" - .align 2 Route125_MapBlockdata:: .incbin "data/layouts/Route125/map.bin" @@ -14,3 +12,4 @@ Route125_Layout:: .4byte Route125_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc index b7f2e3e3c4..859d025a5d 100644 --- a/data/layouts/Route126/layout.inc +++ b/data/layouts/Route126/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route126_MapBorder:: .incbin "data/layouts/Route126/border.bin" - .align 2 Route126_MapBlockdata:: .incbin "data/layouts/Route126/map.bin" @@ -14,3 +12,4 @@ Route126_Layout:: .4byte Route126_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc index 637bd29b69..767330aff8 100644 --- a/data/layouts/Route127/layout.inc +++ b/data/layouts/Route127/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route127_MapBorder:: .incbin "data/layouts/Route127/border.bin" - .align 2 Route127_MapBlockdata:: .incbin "data/layouts/Route127/map.bin" @@ -14,3 +12,4 @@ Route127_Layout:: .4byte Route127_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc index 09265d8115..16624fa023 100644 --- a/data/layouts/Route128/layout.inc +++ b/data/layouts/Route128/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route128_MapBorder:: .incbin "data/layouts/Route128/border.bin" - .align 2 Route128_MapBlockdata:: .incbin "data/layouts/Route128/map.bin" @@ -14,3 +12,4 @@ Route128_Layout:: .4byte Route128_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc index 926213af44..9b7d6af1de 100644 --- a/data/layouts/Route129/layout.inc +++ b/data/layouts/Route129/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route129_MapBorder:: .incbin "data/layouts/Route129/border.bin" - .align 2 Route129_MapBlockdata:: .incbin "data/layouts/Route129/map.bin" @@ -14,3 +12,4 @@ Route129_Layout:: .4byte Route129_MapBlockdata .4byte gTileset_General .4byte gTileset_Mossdeep + diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc index 30a1053bf4..41db11cb41 100644 --- a/data/layouts/Route130/layout.inc +++ b/data/layouts/Route130/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route130_MapBorder:: .incbin "data/layouts/Route130/border.bin" - .align 2 Route130_MapBlockdata:: .incbin "data/layouts/Route130/map.bin" @@ -14,3 +12,4 @@ Route130_Layout:: .4byte Route130_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc index 0762566a8d..7fae261cc8 100644 --- a/data/layouts/Route131/layout.inc +++ b/data/layouts/Route131/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route131_MapBorder:: .incbin "data/layouts/Route131/border.bin" - .align 2 Route131_MapBlockdata:: .incbin "data/layouts/Route131/map.bin" @@ -14,3 +12,4 @@ Route131_Layout:: .4byte Route131_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc index 3838b85bc4..afaa7fb58b 100644 --- a/data/layouts/Route132/layout.inc +++ b/data/layouts/Route132/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route132_MapBorder:: .incbin "data/layouts/Route132/border.bin" - .align 2 Route132_MapBlockdata:: .incbin "data/layouts/Route132/map.bin" @@ -14,3 +12,4 @@ Route132_Layout:: .4byte Route132_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc index c380a9ca18..5ff11108b9 100644 --- a/data/layouts/Route133/layout.inc +++ b/data/layouts/Route133/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route133_MapBorder:: .incbin "data/layouts/Route133/border.bin" - .align 2 Route133_MapBlockdata:: .incbin "data/layouts/Route133/map.bin" @@ -14,3 +12,4 @@ Route133_Layout:: .4byte Route133_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc index 46c4ea9dc2..9eeca6cc9a 100644 --- a/data/layouts/Route134/layout.inc +++ b/data/layouts/Route134/layout.inc @@ -1,8 +1,6 @@ - .align 2 Route134_MapBorder:: .incbin "data/layouts/Route134/border.bin" - .align 2 Route134_MapBlockdata:: .incbin "data/layouts/Route134/map.bin" @@ -14,3 +12,4 @@ Route134_Layout:: .4byte Route134_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc index e1451aff60..00c45dcc25 100644 --- a/data/layouts/RustboroCity/layout.inc +++ b/data/layouts/RustboroCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_MapBorder:: .incbin "data/layouts/RustboroCity/border.bin" - .align 2 RustboroCity_MapBlockdata:: .incbin "data/layouts/RustboroCity/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Layout:: .4byte RustboroCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc index a0df178335..0c86dede9a 100644 --- a/data/layouts/RustboroCity_CuttersHouse/layout.inc +++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_CuttersHouse_MapBorder:: .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" - .align 2 RustboroCity_CuttersHouse_MapBlockdata:: .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" @@ -14,3 +12,4 @@ RustboroCity_CuttersHouse_Layout:: .4byte RustboroCity_CuttersHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc index 6662b05c9c..dbf6b388e1 100644 --- a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_DevonCorp_1F_MapBorder:: .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin" - .align 2 RustboroCity_DevonCorp_1F_MapBlockdata:: .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_1F_Layout:: .4byte RustboroCity_DevonCorp_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc index f6331ab386..34d581ae54 100644 --- a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_DevonCorp_2F_MapBorder:: .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin" - .align 2 RustboroCity_DevonCorp_2F_MapBlockdata:: .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_2F_Layout:: .4byte RustboroCity_DevonCorp_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc index 2d265b6c8b..64c555be55 100644 --- a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc +++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_DevonCorp_3F_MapBorder:: .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin" - .align 2 RustboroCity_DevonCorp_3F_MapBlockdata:: .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_DevonCorp_3F_Layout:: .4byte RustboroCity_DevonCorp_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_Facility + diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc index fc61a42016..b904524a6f 100644 --- a/data/layouts/RustboroCity_Flat1_1F/layout.inc +++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat1_1F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin" - .align 2 RustboroCity_Flat1_1F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat1_1F_Layout:: .4byte RustboroCity_Flat1_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc index b80a343223..aa6e3ebdf9 100644 --- a/data/layouts/RustboroCity_Flat1_2F/layout.inc +++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat1_2F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin" - .align 2 RustboroCity_Flat1_2F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat1_2F_Layout:: .4byte RustboroCity_Flat1_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc index 55c38f906b..8e44c97b70 100644 --- a/data/layouts/RustboroCity_Flat2_1F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat2_1F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin" - .align 2 RustboroCity_Flat2_1F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat2_1F_Layout:: .4byte RustboroCity_Flat2_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc index c099b5f9ab..ffcba8d17e 100644 --- a/data/layouts/RustboroCity_Flat2_2F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat2_2F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin" - .align 2 RustboroCity_Flat2_2F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat2_2F_Layout:: .4byte RustboroCity_Flat2_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc index 5e938f7d69..77775b4e02 100644 --- a/data/layouts/RustboroCity_Flat2_3F/layout.inc +++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Flat2_3F_MapBorder:: .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin" - .align 2 RustboroCity_Flat2_3F_MapBlockdata:: .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Flat2_3F_Layout:: .4byte RustboroCity_Flat2_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc index cd9b907fb5..8c064171bf 100644 --- a/data/layouts/RustboroCity_Gym/layout.inc +++ b/data/layouts/RustboroCity_Gym/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_Gym_MapBorder:: .incbin "data/layouts/RustboroCity_Gym/border.bin" - .align 2 RustboroCity_Gym_MapBlockdata:: .incbin "data/layouts/RustboroCity_Gym/map.bin" @@ -14,3 +12,4 @@ RustboroCity_Gym_Layout:: .4byte RustboroCity_Gym_MapBlockdata .4byte gTileset_Building .4byte gTileset_RustboroGym + diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc index 80f658fcdf..b1b90daee9 100644 --- a/data/layouts/RustboroCity_House/layout.inc +++ b/data/layouts/RustboroCity_House/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_House_MapBorder:: .incbin "data/layouts/RustboroCity_House/border.bin" - .align 2 RustboroCity_House_MapBlockdata:: .incbin "data/layouts/RustboroCity_House/map.bin" @@ -14,3 +12,4 @@ RustboroCity_House_Layouts:: .4byte RustboroCity_House_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc index f88e3a80b5..27893f2fb0 100644 --- a/data/layouts/RustboroCity_House1/layout.inc +++ b/data/layouts/RustboroCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_House1_MapBorder:: .incbin "data/layouts/RustboroCity_House1/border.bin" - .align 2 RustboroCity_House1_MapBlockdata:: .incbin "data/layouts/RustboroCity_House1/map.bin" @@ -14,3 +12,4 @@ RustboroCity_House1_Layout:: .4byte RustboroCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc index 470baa66e7..2c4eb3977c 100644 --- a/data/layouts/RustboroCity_PokemonSchool/layout.inc +++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc @@ -1,8 +1,6 @@ - .align 2 RustboroCity_PokemonSchool_MapBorder:: .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" - .align 2 RustboroCity_PokemonSchool_MapBlockdata:: .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" @@ -14,3 +12,4 @@ RustboroCity_PokemonSchool_Layout:: .4byte RustboroCity_PokemonSchool_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonSchool + diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc index feb5b0fc09..7a063b922c 100644 --- a/data/layouts/RusturfTunnel/layout.inc +++ b/data/layouts/RusturfTunnel/layout.inc @@ -1,8 +1,6 @@ - .align 2 RusturfTunnel_MapBorder:: .incbin "data/layouts/RusturfTunnel/border.bin" - .align 2 RusturfTunnel_MapBlockdata:: .incbin "data/layouts/RusturfTunnel/map.bin" @@ -14,3 +12,4 @@ RusturfTunnel_Layout:: .4byte RusturfTunnel_MapBlockdata .4byte gTileset_General .4byte gTileset_RusturfTunnel + diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc index 8180f0a4d3..bcc034ecd9 100644 --- a/data/layouts/SSTidalCorridor/layout.inc +++ b/data/layouts/SSTidalCorridor/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalCorridor_MapBorder:: .incbin "data/layouts/SSTidalCorridor/border.bin" - .align 2 SSTidalCorridor_MapBlockdata:: .incbin "data/layouts/SSTidalCorridor/map.bin" @@ -14,3 +12,4 @@ SSTidalCorridor_Layout:: .4byte SSTidalCorridor_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc index ece1a572e4..807da09a18 100644 --- a/data/layouts/SSTidalLowerDeck/layout.inc +++ b/data/layouts/SSTidalLowerDeck/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalLowerDeck_MapBorder:: .incbin "data/layouts/SSTidalLowerDeck/border.bin" - .align 2 SSTidalLowerDeck_MapBlockdata:: .incbin "data/layouts/SSTidalLowerDeck/map.bin" @@ -14,3 +12,4 @@ SSTidalLowerDeck_Layout:: .4byte SSTidalLowerDeck_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc index 8cd255d8ca..e44aac53c9 100644 --- a/data/layouts/SSTidalRooms/layout.inc +++ b/data/layouts/SSTidalRooms/layout.inc @@ -1,8 +1,6 @@ - .align 2 SSTidalRooms_MapBorder:: .incbin "data/layouts/SSTidalRooms/border.bin" - .align 2 SSTidalRooms_MapBlockdata:: .incbin "data/layouts/SSTidalRooms/map.bin" @@ -14,3 +12,4 @@ SSTidalRooms_Layout:: .4byte SSTidalRooms_MapBlockdata .4byte gTileset_General .4byte gTileset_InsideShip + diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc index f539c2cede..c6986540fe 100644 --- a/data/layouts/SafariZone_North/layout.inc +++ b/data/layouts/SafariZone_North/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_North_MapBorder:: .incbin "data/layouts/SafariZone_North/border.bin" - .align 2 SafariZone_North_MapBlockdata:: .incbin "data/layouts/SafariZone_North/map.bin" @@ -14,3 +12,4 @@ SafariZone_North_Layout:: .4byte SafariZone_North_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc index 903a6c9e0c..026e4a7c76 100644 --- a/data/layouts/SafariZone_Northeast/layout.inc +++ b/data/layouts/SafariZone_Northeast/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Northeast_MapBorder:: .incbin "data/layouts/SafariZone_Northeast/border.bin" - .align 2 SafariZone_Northeast_MapBlockdata:: .incbin "data/layouts/SafariZone_Northeast/map.bin" @@ -14,3 +12,4 @@ SafariZone_Northeast_Layout:: .4byte SafariZone_Northeast_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc index 469e256178..09d8bd4829 100644 --- a/data/layouts/SafariZone_Northwest/layout.inc +++ b/data/layouts/SafariZone_Northwest/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Northwest_MapBorder:: .incbin "data/layouts/SafariZone_Northwest/border.bin" - .align 2 SafariZone_Northwest_MapBlockdata:: .incbin "data/layouts/SafariZone_Northwest/map.bin" @@ -14,3 +12,4 @@ SafariZone_Northwest_Layout:: .4byte SafariZone_Northwest_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc index 7cb2387190..4176cb370f 100644 --- a/data/layouts/SafariZone_RestHouse/layout.inc +++ b/data/layouts/SafariZone_RestHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_RestHouse_MapBorder:: .incbin "data/layouts/SafariZone_RestHouse/border.bin" - .align 2 SafariZone_RestHouse_MapBlockdata:: .incbin "data/layouts/SafariZone_RestHouse/map.bin" @@ -14,3 +12,4 @@ SafariZone_RestHouse_Layout:: .4byte SafariZone_RestHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc index 6431c6c014..ec83ba5b01 100644 --- a/data/layouts/SafariZone_South/layout.inc +++ b/data/layouts/SafariZone_South/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_South_MapBorder:: .incbin "data/layouts/SafariZone_South/border.bin" - .align 2 SafariZone_South_MapBlockdata:: .incbin "data/layouts/SafariZone_South/map.bin" @@ -14,3 +12,4 @@ SafariZone_South_Layout:: .4byte SafariZone_South_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc index 450efcd07b..e55309b46a 100644 --- a/data/layouts/SafariZone_Southeast/layout.inc +++ b/data/layouts/SafariZone_Southeast/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Southeast_MapBorder:: .incbin "data/layouts/SafariZone_Southeast/border.bin" - .align 2 SafariZone_Southeast_MapBlockdata:: .incbin "data/layouts/SafariZone_Southeast/map.bin" @@ -14,3 +12,4 @@ SafariZone_Southeast_Layout:: .4byte SafariZone_Southeast_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc index 559736b9f7..1236d4d4bf 100644 --- a/data/layouts/SafariZone_Southwest/layout.inc +++ b/data/layouts/SafariZone_Southwest/layout.inc @@ -1,8 +1,6 @@ - .align 2 SafariZone_Southwest_MapBorder:: .incbin "data/layouts/SafariZone_Southwest/border.bin" - .align 2 SafariZone_Southwest_MapBlockdata:: .incbin "data/layouts/SafariZone_Southwest/map.bin" @@ -14,3 +12,4 @@ SafariZone_Southwest_Layout:: .4byte SafariZone_Southwest_MapBlockdata .4byte gTileset_General .4byte gTileset_Lilycove + diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc index e9f30c74c5..897d873abe 100644 --- a/data/layouts/ScorchedSlab/layout.inc +++ b/data/layouts/ScorchedSlab/layout.inc @@ -1,8 +1,6 @@ - .align 2 ScorchedSlab_MapBorder:: .incbin "data/layouts/ScorchedSlab/border.bin" - .align 2 ScorchedSlab_MapBlockdata:: .incbin "data/layouts/ScorchedSlab/map.bin" @@ -14,3 +12,4 @@ ScorchedSlab_Layout:: .4byte ScorchedSlab_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc index eaed336bca..1d6ce495b6 100644 --- a/data/layouts/SeafloorCavern_Entrance/layout.inc +++ b/data/layouts/SeafloorCavern_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Entrance_MapBorder:: .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" - .align 2 SeafloorCavern_Entrance_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Entrance_Layout:: .4byte SeafloorCavern_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc index 6deb54493a..7f7cf0570d 100644 --- a/data/layouts/SeafloorCavern_Room1/layout.inc +++ b/data/layouts/SeafloorCavern_Room1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room1_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room1/border.bin" - .align 2 SeafloorCavern_Room1_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room1/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room1_Layout:: .4byte SeafloorCavern_Room1_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc index c0dfdcedcf..89f4e6a792 100644 --- a/data/layouts/SeafloorCavern_Room2/layout.inc +++ b/data/layouts/SeafloorCavern_Room2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room2_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room2/border.bin" - .align 2 SeafloorCavern_Room2_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room2/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room2_Layout:: .4byte SeafloorCavern_Room2_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc index 58ce10cdf7..070842a9f5 100644 --- a/data/layouts/SeafloorCavern_Room3/layout.inc +++ b/data/layouts/SeafloorCavern_Room3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room3_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room3/border.bin" - .align 2 SeafloorCavern_Room3_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room3/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room3_Layout:: .4byte SeafloorCavern_Room3_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc index f4ff113ff1..6c984109df 100644 --- a/data/layouts/SeafloorCavern_Room4/layout.inc +++ b/data/layouts/SeafloorCavern_Room4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room4_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room4/border.bin" - .align 2 SeafloorCavern_Room4_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room4/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room4_Layout:: .4byte SeafloorCavern_Room4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc index 69218f64b2..c48b00dbaa 100644 --- a/data/layouts/SeafloorCavern_Room5/layout.inc +++ b/data/layouts/SeafloorCavern_Room5/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room5_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room5/border.bin" - .align 2 SeafloorCavern_Room5_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room5/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room5_Layout:: .4byte SeafloorCavern_Room5_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc index d18506d6bb..f729d0b1b2 100644 --- a/data/layouts/SeafloorCavern_Room6/layout.inc +++ b/data/layouts/SeafloorCavern_Room6/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room6_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room6/border.bin" - .align 2 SeafloorCavern_Room6_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room6/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room6_Layout:: .4byte SeafloorCavern_Room6_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc index 6e953c06e7..784b9bbb95 100644 --- a/data/layouts/SeafloorCavern_Room7/layout.inc +++ b/data/layouts/SeafloorCavern_Room7/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room7_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room7/border.bin" - .align 2 SeafloorCavern_Room7_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room7/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room7_Layout:: .4byte SeafloorCavern_Room7_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc index 1a0477b686..8f3d826c77 100644 --- a/data/layouts/SeafloorCavern_Room8/layout.inc +++ b/data/layouts/SeafloorCavern_Room8/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room8_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room8/border.bin" - .align 2 SeafloorCavern_Room8_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room8/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room8_Layout:: .4byte SeafloorCavern_Room8_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc index 115db570bf..a5039da8f3 100644 --- a/data/layouts/SeafloorCavern_Room9/layout.inc +++ b/data/layouts/SeafloorCavern_Room9/layout.inc @@ -1,8 +1,6 @@ - .align 2 SeafloorCavern_Room9_MapBorder:: .incbin "data/layouts/SeafloorCavern_Room9/border.bin" - .align 2 SeafloorCavern_Room9_MapBlockdata:: .incbin "data/layouts/SeafloorCavern_Room9/map.bin" @@ -14,3 +12,4 @@ SeafloorCavern_Room9_Layout:: .4byte SeafloorCavern_Room9_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc index 3de6298e26..7a064d5f0c 100644 --- a/data/layouts/SealedChamber_InnerRoom/layout.inc +++ b/data/layouts/SealedChamber_InnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 SealedChamber_InnerRoom_MapBorder:: .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" - .align 2 SealedChamber_InnerRoom_MapBlockdata:: .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" @@ -14,3 +12,4 @@ SealedChamber_InnerRoom_Layout:: .4byte SealedChamber_InnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc index b966d00efd..bc6afaf291 100644 --- a/data/layouts/SealedChamber_OuterRoom/layout.inc +++ b/data/layouts/SealedChamber_OuterRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 SealedChamber_OuterRoom_MapBorder:: .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" - .align 2 SealedChamber_OuterRoom_MapBlockdata:: .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" @@ -14,3 +12,4 @@ SealedChamber_OuterRoom_Layout:: .4byte SealedChamber_OuterRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc index 7e3110f483..ec138440a4 100644 --- a/data/layouts/SecretBase_BlueCave1/layout.inc +++ b/data/layouts/SecretBase_BlueCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave1_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave1/border.bin" - .align 2 SecretBase_BlueCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave1_Layout:: .4byte SecretBase_BlueCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc index 7a32288323..8c2b48661e 100644 --- a/data/layouts/SecretBase_BlueCave2/layout.inc +++ b/data/layouts/SecretBase_BlueCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave2_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave2/border.bin" - .align 2 SecretBase_BlueCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave2_Layout:: .4byte SecretBase_BlueCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc index a1921a475b..0ac8bee1be 100644 --- a/data/layouts/SecretBase_BlueCave3/layout.inc +++ b/data/layouts/SecretBase_BlueCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave3_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave3/border.bin" - .align 2 SecretBase_BlueCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave3_Layout:: .4byte SecretBase_BlueCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc index 81509d18cf..d0e5ed45fa 100644 --- a/data/layouts/SecretBase_BlueCave4/layout.inc +++ b/data/layouts/SecretBase_BlueCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BlueCave4_MapBorder:: .incbin "data/layouts/SecretBase_BlueCave4/border.bin" - .align 2 SecretBase_BlueCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_BlueCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_BlueCave4_Layout:: .4byte SecretBase_BlueCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBlueCave + diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc index e1bec323ac..9044fd6d1e 100644 --- a/data/layouts/SecretBase_BrownCave1/layout.inc +++ b/data/layouts/SecretBase_BrownCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave1_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave1/border.bin" - .align 2 SecretBase_BrownCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave1_Layout:: .4byte SecretBase_BrownCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc index 52d5952125..7cfb9573ba 100644 --- a/data/layouts/SecretBase_BrownCave2/layout.inc +++ b/data/layouts/SecretBase_BrownCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave2_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave2/border.bin" - .align 2 SecretBase_BrownCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave2_Layout:: .4byte SecretBase_BrownCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc index 4fa22e613b..5ad1bf5269 100644 --- a/data/layouts/SecretBase_BrownCave3/layout.inc +++ b/data/layouts/SecretBase_BrownCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave3_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave3/border.bin" - .align 2 SecretBase_BrownCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave3_Layout:: .4byte SecretBase_BrownCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc index 65566a482f..6094a38322 100644 --- a/data/layouts/SecretBase_BrownCave4/layout.inc +++ b/data/layouts/SecretBase_BrownCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_BrownCave4_MapBorder:: .incbin "data/layouts/SecretBase_BrownCave4/border.bin" - .align 2 SecretBase_BrownCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_BrownCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_BrownCave4_Layout:: .4byte SecretBase_BrownCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseBrownCave + diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc index f9dcde8805..a4664d5098 100644 --- a/data/layouts/SecretBase_RedCave1/layout.inc +++ b/data/layouts/SecretBase_RedCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave1_MapBorder:: .incbin "data/layouts/SecretBase_RedCave1/border.bin" - .align 2 SecretBase_RedCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave1_Layout:: .4byte SecretBase_RedCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc index 667a744ad7..7999395d85 100644 --- a/data/layouts/SecretBase_RedCave2/layout.inc +++ b/data/layouts/SecretBase_RedCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave2_MapBorder:: .incbin "data/layouts/SecretBase_RedCave2/border.bin" - .align 2 SecretBase_RedCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave2_Layout:: .4byte SecretBase_RedCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc index 39a079d2be..6a3cc123b6 100644 --- a/data/layouts/SecretBase_RedCave3/layout.inc +++ b/data/layouts/SecretBase_RedCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave3_MapBorder:: .incbin "data/layouts/SecretBase_RedCave3/border.bin" - .align 2 SecretBase_RedCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave3_Layout:: .4byte SecretBase_RedCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc index 890c1c3b5f..665f44709c 100644 --- a/data/layouts/SecretBase_RedCave4/layout.inc +++ b/data/layouts/SecretBase_RedCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_RedCave4_MapBorder:: .incbin "data/layouts/SecretBase_RedCave4/border.bin" - .align 2 SecretBase_RedCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_RedCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_RedCave4_Layout:: .4byte SecretBase_RedCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseRedCave + diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc index 835028c64a..2bcc9f58a5 100644 --- a/data/layouts/SecretBase_Shrub1/layout.inc +++ b/data/layouts/SecretBase_Shrub1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub1_MapBorder:: .incbin "data/layouts/SecretBase_Shrub1/border.bin" - .align 2 SecretBase_Shrub1_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub1/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub1_Layout:: .4byte SecretBase_Shrub1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc index cd1fe61196..e94376c3b9 100644 --- a/data/layouts/SecretBase_Shrub2/layout.inc +++ b/data/layouts/SecretBase_Shrub2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub2_MapBorder:: .incbin "data/layouts/SecretBase_Shrub2/border.bin" - .align 2 SecretBase_Shrub2_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub2/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub2_Layout:: .4byte SecretBase_Shrub2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc index 721df1201d..449f1a11f0 100644 --- a/data/layouts/SecretBase_Shrub3/layout.inc +++ b/data/layouts/SecretBase_Shrub3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub3_MapBorder:: .incbin "data/layouts/SecretBase_Shrub3/border.bin" - .align 2 SecretBase_Shrub3_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub3/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub3_Layout:: .4byte SecretBase_Shrub3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc index 71a2495adb..139a820503 100644 --- a/data/layouts/SecretBase_Shrub4/layout.inc +++ b/data/layouts/SecretBase_Shrub4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Shrub4_MapBorder:: .incbin "data/layouts/SecretBase_Shrub4/border.bin" - .align 2 SecretBase_Shrub4_MapBlockdata:: .incbin "data/layouts/SecretBase_Shrub4/map.bin" @@ -14,3 +12,4 @@ SecretBase_Shrub4_Layout:: .4byte SecretBase_Shrub4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseShrub + diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc index 45889b4497..73e6e41a61 100644 --- a/data/layouts/SecretBase_Tree1/layout.inc +++ b/data/layouts/SecretBase_Tree1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree1_MapBorder:: .incbin "data/layouts/SecretBase_Tree1/border.bin" - .align 2 SecretBase_Tree1_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree1/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree1_Layout:: .4byte SecretBase_Tree1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc index ca1106b26c..95b122220d 100644 --- a/data/layouts/SecretBase_Tree2/layout.inc +++ b/data/layouts/SecretBase_Tree2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree2_MapBorder:: .incbin "data/layouts/SecretBase_Tree2/border.bin" - .align 2 SecretBase_Tree2_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree2/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree2_Layout:: .4byte SecretBase_Tree2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc index 28a4ecbcc1..66716a4045 100644 --- a/data/layouts/SecretBase_Tree3/layout.inc +++ b/data/layouts/SecretBase_Tree3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree3_MapBorder:: .incbin "data/layouts/SecretBase_Tree3/border.bin" - .align 2 SecretBase_Tree3_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree3/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree3_Layout:: .4byte SecretBase_Tree3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc index 6f869a74e3..20d4c3e018 100644 --- a/data/layouts/SecretBase_Tree4/layout.inc +++ b/data/layouts/SecretBase_Tree4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_Tree4_MapBorder:: .incbin "data/layouts/SecretBase_Tree4/border.bin" - .align 2 SecretBase_Tree4_MapBlockdata:: .incbin "data/layouts/SecretBase_Tree4/map.bin" @@ -14,3 +12,4 @@ SecretBase_Tree4_Layout:: .4byte SecretBase_Tree4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseTree + diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc index d34c182c3d..7fa3aa8237 100644 --- a/data/layouts/SecretBase_YellowCave1/layout.inc +++ b/data/layouts/SecretBase_YellowCave1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave1_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave1/border.bin" - .align 2 SecretBase_YellowCave1_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave1/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave1_Layout:: .4byte SecretBase_YellowCave1_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc index fc58138580..0ae872e081 100644 --- a/data/layouts/SecretBase_YellowCave2/layout.inc +++ b/data/layouts/SecretBase_YellowCave2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave2_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave2/border.bin" - .align 2 SecretBase_YellowCave2_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave2/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave2_Layout:: .4byte SecretBase_YellowCave2_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc index 005af813a3..f42d889208 100644 --- a/data/layouts/SecretBase_YellowCave3/layout.inc +++ b/data/layouts/SecretBase_YellowCave3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave3_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave3/border.bin" - .align 2 SecretBase_YellowCave3_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave3/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave3_Layout:: .4byte SecretBase_YellowCave3_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc index 5dfaa435cc..b7a11df5a3 100644 --- a/data/layouts/SecretBase_YellowCave4/layout.inc +++ b/data/layouts/SecretBase_YellowCave4/layout.inc @@ -1,8 +1,6 @@ - .align 2 SecretBase_YellowCave4_MapBorder:: .incbin "data/layouts/SecretBase_YellowCave4/border.bin" - .align 2 SecretBase_YellowCave4_MapBlockdata:: .incbin "data/layouts/SecretBase_YellowCave4/map.bin" @@ -14,3 +12,4 @@ SecretBase_YellowCave4_Layout:: .4byte SecretBase_YellowCave4_MapBlockdata .4byte gTileset_SecretBase .4byte gTileset_SecretBaseYellowCave + diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc index 43df2d4956..a52425e15c 100644 --- a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc +++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_HighTideEntranceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" - .align 2 ShoalCave_HighTideEntranceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_HighTideEntranceRoom_Layout:: .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc index 22fde10c60..2d323b9e07 100644 --- a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc +++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_HighTideInnerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" - .align 2 ShoalCave_HighTideInnerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_HighTideInnerRoom_Layout:: .4byte ShoalCave_HighTideInnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc index c471d40ed5..0a1eee113e 100644 --- a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideEntranceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" - .align 2 ShoalCave_LowTideEntranceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideEntranceRoom_Layout:: .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc index 3dea1135c4..6d7a515750 100644 --- a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideIceRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" - .align 2 ShoalCave_LowTideIceRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideIceRoom_Layout:: .4byte ShoalCave_LowTideIceRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc index 090a783c43..f66fc97239 100644 --- a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideInnerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" - .align 2 ShoalCave_LowTideInnerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideInnerRoom_Layout:: .4byte ShoalCave_LowTideInnerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc index 364c026b2f..79cc82e8c8 100644 --- a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideLowerRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" - .align 2 ShoalCave_LowTideLowerRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideLowerRoom_Layout:: .4byte ShoalCave_LowTideLowerRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc index 4195e34d8b..62dbff40ee 100644 --- a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc +++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 ShoalCave_LowTideStairsRoom_MapBorder:: .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" - .align 2 ShoalCave_LowTideStairsRoom_MapBlockdata:: .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" @@ -14,3 +12,4 @@ ShoalCave_LowTideStairsRoom_Layout:: .4byte ShoalCave_LowTideStairsRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc index 59ec3c3c78..f42855de8a 100644 --- a/data/layouts/SingleBattleColosseum/layout.inc +++ b/data/layouts/SingleBattleColosseum/layout.inc @@ -1,8 +1,6 @@ - .align 2 SingleBattleColosseum_MapBorder:: .incbin "data/layouts/SingleBattleColosseum/border.bin" - .align 2 SingleBattleColosseum_MapBlockdata:: .incbin "data/layouts/SingleBattleColosseum/map.bin" @@ -14,3 +12,4 @@ SingleBattleColosseum_Layout:: .4byte SingleBattleColosseum_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc index e0f3550ed0..235f049352 100644 --- a/data/layouts/SkyPillar_1F/layout.inc +++ b/data/layouts/SkyPillar_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_1F_MapBorder:: .incbin "data/layouts/SkyPillar_1F/border.bin" - .align 2 SkyPillar_1F_MapBlockdata:: .incbin "data/layouts/SkyPillar_1F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_1F_Layout:: .4byte SkyPillar_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc index 2ce0b52807..368fcd518e 100644 --- a/data/layouts/SkyPillar_2F/layout.inc +++ b/data/layouts/SkyPillar_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_2F_MapBorder:: .incbin "data/layouts/SkyPillar_2F/border.bin" - .align 2 SkyPillar_2F_MapBlockdata:: .incbin "data/layouts/SkyPillar_2F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_2F_Layout:: .4byte SkyPillar_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc index 0bf2ad939e..32ac95143a 100644 --- a/data/layouts/SkyPillar_3F/layout.inc +++ b/data/layouts/SkyPillar_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_3F_MapBorder:: .incbin "data/layouts/SkyPillar_3F/border.bin" - .align 2 SkyPillar_3F_MapBlockdata:: .incbin "data/layouts/SkyPillar_3F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_3F_Layout:: .4byte SkyPillar_3F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc index 35b7b61d1d..055abf133c 100644 --- a/data/layouts/SkyPillar_4F/layout.inc +++ b/data/layouts/SkyPillar_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_4F_MapBorder:: .incbin "data/layouts/SkyPillar_4F/border.bin" - .align 2 SkyPillar_4F_MapBlockdata:: .incbin "data/layouts/SkyPillar_4F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_4F_Layout:: .4byte SkyPillar_4F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc index dbef0083e6..3f3bb5bc10 100644 --- a/data/layouts/SkyPillar_5F/layout.inc +++ b/data/layouts/SkyPillar_5F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_5F_MapBorder:: .incbin "data/layouts/SkyPillar_5F/border.bin" - .align 2 SkyPillar_5F_MapBlockdata:: .incbin "data/layouts/SkyPillar_5F/map.bin" @@ -14,3 +12,4 @@ SkyPillar_5F_Layout:: .4byte SkyPillar_5F_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc index ed0d1dedd6..1313bd196f 100644 --- a/data/layouts/SkyPillar_Entrance/layout.inc +++ b/data/layouts/SkyPillar_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Entrance_MapBorder:: .incbin "data/layouts/SkyPillar_Entrance/border.bin" - .align 2 SkyPillar_Entrance_MapBlockdata:: .incbin "data/layouts/SkyPillar_Entrance/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Entrance_Layout:: .4byte SkyPillar_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc index ae4184ea97..5eb9df563b 100644 --- a/data/layouts/SkyPillar_Outside/layout.inc +++ b/data/layouts/SkyPillar_Outside/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Outside_MapBorder:: .incbin "data/layouts/SkyPillar_Outside/border.bin" - .align 2 SkyPillar_Outside_MapBlockdata:: .incbin "data/layouts/SkyPillar_Outside/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Outside_Layout:: .4byte SkyPillar_Outside_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc index f9e7f24a44..646c6f95f8 100644 --- a/data/layouts/SkyPillar_Top/layout.inc +++ b/data/layouts/SkyPillar_Top/layout.inc @@ -1,8 +1,6 @@ - .align 2 SkyPillar_Top_MapBorder:: .incbin "data/layouts/SkyPillar_Top/border.bin" - .align 2 SkyPillar_Top_MapBlockdata:: .incbin "data/layouts/SkyPillar_Top/map.bin" @@ -14,3 +12,4 @@ SkyPillar_Top_Layout:: .4byte SkyPillar_Top_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc index 5cc1b12760..dfa184764d 100644 --- a/data/layouts/SlateportCity/layout.inc +++ b/data/layouts/SlateportCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_MapBorder:: .incbin "data/layouts/SlateportCity/border.bin" - .align 2 SlateportCity_MapBlockdata:: .incbin "data/layouts/SlateportCity/map.bin" @@ -14,3 +12,4 @@ SlateportCity_Layout:: .4byte SlateportCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Slateport + diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc index 957e233203..f921eb5fcc 100644 --- a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc +++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_OceanicMuseum_1F_MapBorder:: .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin" - .align 2 SlateportCity_OceanicMuseum_1F_MapBlockdata:: .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_OceanicMuseum_1F_Layout:: .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_OceanicMuseum + diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc index 0072fe2c5a..7a69989875 100644 --- a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc +++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_OceanicMuseum_2F_MapBorder:: .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin" - .align 2 SlateportCity_OceanicMuseum_2F_MapBlockdata:: .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_OceanicMuseum_2F_Layout:: .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_OceanicMuseum + diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc index 789c78b673..44f9a559f0 100644 --- a/data/layouts/SlateportCity_PokemonFanClub/layout.inc +++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_PokemonFanClub_MapBorder:: .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" - .align 2 SlateportCity_PokemonFanClub_MapBlockdata:: .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" @@ -14,3 +12,4 @@ SlateportCity_PokemonFanClub_Layout:: .4byte SlateportCity_PokemonFanClub_MapBlockdata .4byte gTileset_Building .4byte gTileset_PokemonFanClub + diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc index 5ffddafa6f..00d5840c67 100644 --- a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc +++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_SternsShipyard_1F_MapBorder:: .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin" - .align 2 SlateportCity_SternsShipyard_1F_MapBlockdata:: .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_SternsShipyard_1F_Layout:: .4byte SlateportCity_SternsShipyard_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc index fe76a83e83..01a969a3a2 100644 --- a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc +++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SlateportCity_SternsShipyard_2F_MapBorder:: .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin" - .align 2 SlateportCity_SternsShipyard_2F_MapBlockdata:: .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" @@ -14,3 +12,4 @@ SlateportCity_SternsShipyard_2F_Layout:: .4byte SlateportCity_SternsShipyard_2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Facility + diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc index 91a877c38b..400a29cbd5 100644 --- a/data/layouts/SootopolisCity/layout.inc +++ b/data/layouts/SootopolisCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_MapBorder:: .incbin "data/layouts/SootopolisCity/border.bin" - .align 2 SootopolisCity_MapBlockdata:: .incbin "data/layouts/SootopolisCity/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_Layout:: .4byte SootopolisCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Sootopolis + diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc index ce7a15e5e1..4c6a6eeef9 100644 --- a/data/layouts/SootopolisCity_Gym_1F/layout.inc +++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_Gym_1F_MapBorder:: .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin" - .align 2 SootopolisCity_Gym_1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_Gym_1F_Layout:: .4byte SootopolisCity_Gym_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_SootopolisGym + diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc index a97138cd59..7eb90fb71e 100644 --- a/data/layouts/SootopolisCity_Gym_B1F/layout.inc +++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_Gym_B1F_MapBorder:: .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin" - .align 2 SootopolisCity_Gym_B1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_Gym_B1F_Layout:: .4byte SootopolisCity_Gym_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_SootopolisGym + diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc index 5c37828ef8..1ad9cc41c9 100644 --- a/data/layouts/SootopolisCity_House1/layout.inc +++ b/data/layouts/SootopolisCity_House1/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House1_MapBorder:: .incbin "data/layouts/SootopolisCity_House1/border.bin" - .align 2 SootopolisCity_House1_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House1/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House1_Layout:: .4byte SootopolisCity_House1_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc index ffa3c5ad18..9007d584bc 100644 --- a/data/layouts/SootopolisCity_House2/layout.inc +++ b/data/layouts/SootopolisCity_House2/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House2_MapBorder:: .incbin "data/layouts/SootopolisCity_House2/border.bin" - .align 2 SootopolisCity_House2_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House2/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House2_Layout:: .4byte SootopolisCity_House2_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc index 3d1fa421cf..540f4306cd 100644 --- a/data/layouts/SootopolisCity_House3/layout.inc +++ b/data/layouts/SootopolisCity_House3/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_House3_MapBorder:: .incbin "data/layouts/SootopolisCity_House3/border.bin" - .align 2 SootopolisCity_House3_MapBlockdata:: .incbin "data/layouts/SootopolisCity_House3/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_House3_Layout:: .4byte SootopolisCity_House3_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc index 1a0e7b4187..152563eb60 100644 --- a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc +++ b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_LotadAndSeedotHouse_MapBorder:: .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" - .align 2 SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_LotadAndSeedotHouse_Layout:: .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc index 127128a2e5..0b846950ed 100644 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_MysteryEventsHouse_1F_MapBorder:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin" - .align 2 SootopolisCity_MysteryEventsHouse_1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_MysteryEventsHouse_1F_Layout:: .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc index 951b90582e..1bb92b9339 100644 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc +++ b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 SootopolisCity_MysteryEventsHouse_B1F_MapBorder:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin" - .align 2 SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata:: .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" @@ -14,3 +12,4 @@ SootopolisCity_MysteryEventsHouse_B1F_Layout:: .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc index e5747d2e9f..4a62cd3f5d 100644 --- a/data/layouts/SouthernIsland_Exterior/layout.inc +++ b/data/layouts/SouthernIsland_Exterior/layout.inc @@ -1,8 +1,6 @@ - .align 2 SouthernIsland_Exterior_MapBorder:: .incbin "data/layouts/SouthernIsland_Exterior/border.bin" - .align 2 SouthernIsland_Exterior_MapBlockdata:: .incbin "data/layouts/SouthernIsland_Exterior/map.bin" @@ -14,3 +12,4 @@ SouthernIsland_Exterior_Layout:: .4byte SouthernIsland_Exterior_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc index 3ac1a6a824..b4d9a35d29 100644 --- a/data/layouts/SouthernIsland_Interior/layout.inc +++ b/data/layouts/SouthernIsland_Interior/layout.inc @@ -1,8 +1,6 @@ - .align 2 SouthernIsland_Interior_MapBorder:: .incbin "data/layouts/SouthernIsland_Interior/border.bin" - .align 2 SouthernIsland_Interior_MapBlockdata:: .incbin "data/layouts/SouthernIsland_Interior/map.bin" @@ -14,3 +12,4 @@ SouthernIsland_Interior_Layout:: .4byte SouthernIsland_Interior_MapBlockdata .4byte gTileset_General .4byte gTileset_Rustboro + diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc index 42ba6309ba..0865a8e5bb 100644 --- a/data/layouts/TerraCave_End/layout.inc +++ b/data/layouts/TerraCave_End/layout.inc @@ -1,8 +1,6 @@ - .align 2 TerraCave_End_MapBorder:: .incbin "data/layouts/TerraCave_End/border.bin" - .align 2 TerraCave_End_MapBlockdata:: .incbin "data/layouts/TerraCave_End/map.bin" @@ -14,3 +12,4 @@ TerraCave_End_Layout:: .4byte TerraCave_End_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc index 8b0a096504..19d50ef442 100644 --- a/data/layouts/TerraCave_Entrance/layout.inc +++ b/data/layouts/TerraCave_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 TerraCave_Entrance_MapBorder:: .incbin "data/layouts/TerraCave_Entrance/border.bin" - .align 2 TerraCave_Entrance_MapBlockdata:: .incbin "data/layouts/TerraCave_Entrance/map.bin" @@ -14,3 +12,4 @@ TerraCave_Entrance_Layout:: .4byte TerraCave_Entrance_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc index 59d257c624..5e0297e7ad 100644 --- a/data/layouts/TradeCenter/layout.inc +++ b/data/layouts/TradeCenter/layout.inc @@ -1,8 +1,6 @@ - .align 2 TradeCenter_MapBorder:: .incbin "data/layouts/TradeCenter/border.bin" - .align 2 TradeCenter_MapBlockdata:: .incbin "data/layouts/TradeCenter/map.bin" @@ -14,3 +12,4 @@ TradeCenter_Layout:: .4byte TradeCenter_MapBlockdata .4byte gTileset_Building .4byte gTileset_CableClub + diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc index 0cb5fee4a9..2009cd49e5 100644 --- a/data/layouts/TrainerHill_1F/layout.inc +++ b/data/layouts/TrainerHill_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_1F_MapBorder:: .incbin "data/layouts/TrainerHill_1F/border.bin" - .align 2 TrainerHill_1F_MapBlockdata:: .incbin "data/layouts/TrainerHill_1F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_1F_Layout:: .4byte TrainerHill_1F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc index 25ac09eb9e..f67b54bf1d 100644 --- a/data/layouts/TrainerHill_2F/layout.inc +++ b/data/layouts/TrainerHill_2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_2F_MapBorder:: .incbin "data/layouts/TrainerHill_2F/border.bin" - .align 2 TrainerHill_2F_MapBlockdata:: .incbin "data/layouts/TrainerHill_2F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_2F_Layout:: .4byte TrainerHill_2F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc index 2b9f74cc7d..280517f410 100644 --- a/data/layouts/TrainerHill_3F/layout.inc +++ b/data/layouts/TrainerHill_3F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_3F_MapBorder:: .incbin "data/layouts/TrainerHill_3F/border.bin" - .align 2 TrainerHill_3F_MapBlockdata:: .incbin "data/layouts/TrainerHill_3F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_3F_Layout:: .4byte TrainerHill_3F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc index 8664a3c90c..eed0b01209 100644 --- a/data/layouts/TrainerHill_4F/layout.inc +++ b/data/layouts/TrainerHill_4F/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_4F_MapBorder:: .incbin "data/layouts/TrainerHill_4F/border.bin" - .align 2 TrainerHill_4F_MapBlockdata:: .incbin "data/layouts/TrainerHill_4F/map.bin" @@ -14,3 +12,4 @@ TrainerHill_4F_Layout:: .4byte TrainerHill_4F_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc index 0fc549f46d..896f43e0d4 100644 --- a/data/layouts/TrainerHill_Entrance/layout.inc +++ b/data/layouts/TrainerHill_Entrance/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_Entrance_MapBorder:: .incbin "data/layouts/TrainerHill_Entrance/border.bin" - .align 2 TrainerHill_Entrance_MapBlockdata:: .incbin "data/layouts/TrainerHill_Entrance/map.bin" @@ -14,3 +12,4 @@ TrainerHill_Entrance_Layout:: .4byte TrainerHill_Entrance_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc index bfa1aeb35e..9477dceda9 100644 --- a/data/layouts/TrainerHill_Roof/layout.inc +++ b/data/layouts/TrainerHill_Roof/layout.inc @@ -1,8 +1,6 @@ - .align 2 TrainerHill_Roof_MapBorder:: .incbin "data/layouts/TrainerHill_Roof/border.bin" - .align 2 TrainerHill_Roof_MapBlockdata:: .incbin "data/layouts/TrainerHill_Roof/map.bin" @@ -14,3 +12,4 @@ TrainerHill_Roof_Layout:: .4byte TrainerHill_Roof_MapBlockdata .4byte gTileset_Building .4byte gTileset_TrainerHill + diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc index f2b61dfbc3..8e027bbd28 100644 --- a/data/layouts/Underwater1/layout.inc +++ b/data/layouts/Underwater1/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater1_MapBorder:: .incbin "data/layouts/Underwater1/border.bin" - .align 2 Underwater1_MapBlockdata:: .incbin "data/layouts/Underwater1/map.bin" @@ -14,3 +12,4 @@ Underwater1_Layout:: .4byte Underwater1_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc index ab8892c860..ac6350d474 100644 --- a/data/layouts/Underwater2/layout.inc +++ b/data/layouts/Underwater2/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater2_MapBorder:: .incbin "data/layouts/Underwater2/border.bin" - .align 2 Underwater2_MapBlockdata:: .incbin "data/layouts/Underwater2/map.bin" @@ -14,3 +12,4 @@ Underwater2_Layout:: .4byte Underwater2_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc index b1238bc1f8..c365b6b8f5 100644 --- a/data/layouts/Underwater3/layout.inc +++ b/data/layouts/Underwater3/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater3_MapBorder:: .incbin "data/layouts/Underwater3/border.bin" - .align 2 Underwater3_MapBlockdata:: .incbin "data/layouts/Underwater3/map.bin" @@ -14,3 +12,4 @@ Underwater3_Layout:: .4byte Underwater3_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc index ed46c9f5b6..9e22e4e409 100644 --- a/data/layouts/Underwater4/layout.inc +++ b/data/layouts/Underwater4/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater4_MapBorder:: .incbin "data/layouts/Underwater4/border.bin" - .align 2 Underwater4_MapBlockdata:: .incbin "data/layouts/Underwater4/map.bin" @@ -14,3 +12,4 @@ Underwater4_Layout:: .4byte Underwater4_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc index cef2c5d766..6394eec544 100644 --- a/data/layouts/Underwater5/layout.inc +++ b/data/layouts/Underwater5/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater5_MapBorder:: .incbin "data/layouts/Underwater5/border.bin" - .align 2 Underwater5_MapBlockdata:: .incbin "data/layouts/Underwater5/map.bin" @@ -14,3 +12,4 @@ Underwater5_Layout:: .4byte Underwater5_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc index c6f8b9742d..247af44bdb 100644 --- a/data/layouts/Underwater6/layout.inc +++ b/data/layouts/Underwater6/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater6_MapBorder:: .incbin "data/layouts/Underwater6/border.bin" - .align 2 Underwater6_MapBlockdata:: .incbin "data/layouts/Underwater6/map.bin" @@ -14,3 +12,4 @@ Underwater6_Layout:: .4byte Underwater6_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc index e910152e49..5c2670b111 100644 --- a/data/layouts/Underwater7/layout.inc +++ b/data/layouts/Underwater7/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater7_MapBorder:: .incbin "data/layouts/Underwater7/border.bin" - .align 2 Underwater7_MapBlockdata:: .incbin "data/layouts/Underwater7/map.bin" @@ -14,3 +12,4 @@ Underwater7_Layout:: .4byte Underwater7_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc index c51bbeb35e..52a3a7851c 100644 --- a/data/layouts/Underwater_MarineCave/layout.inc +++ b/data/layouts/Underwater_MarineCave/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_MarineCave_MapBorder:: .incbin "data/layouts/Underwater_MarineCave/border.bin" - .align 2 Underwater_MarineCave_MapBlockdata:: .incbin "data/layouts/Underwater_MarineCave/map.bin" @@ -14,3 +12,4 @@ Underwater_MarineCave_Layout:: .4byte Underwater_MarineCave_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc index a4bcf2043a..1534564a46 100644 --- a/data/layouts/Underwater_Route134/layout.inc +++ b/data/layouts/Underwater_Route134/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_Route134_MapBorder:: .incbin "data/layouts/Underwater_Route134/border.bin" - .align 2 Underwater_Route134_MapBlockdata:: .incbin "data/layouts/Underwater_Route134/map.bin" @@ -14,3 +12,4 @@ Underwater_Route134_Layout:: .4byte Underwater_Route134_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc index 5d610efb1e..5bce06a6b1 100644 --- a/data/layouts/Underwater_SeafloorCavern/layout.inc +++ b/data/layouts/Underwater_SeafloorCavern/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SeafloorCavern_MapBorder:: .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" - .align 2 Underwater_SeafloorCavern_MapBlockdata:: .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" @@ -14,3 +12,4 @@ Underwater_SeafloorCavern_Layout:: .4byte Underwater_SeafloorCavern_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc index a6f924c188..5baf5dde85 100644 --- a/data/layouts/Underwater_SealedChamber/layout.inc +++ b/data/layouts/Underwater_SealedChamber/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SealedChamber_MapBorder:: .incbin "data/layouts/Underwater_SealedChamber/border.bin" - .align 2 Underwater_SealedChamber_MapBlockdata:: .incbin "data/layouts/Underwater_SealedChamber/map.bin" @@ -14,3 +12,4 @@ Underwater_SealedChamber_Layout:: .4byte Underwater_SealedChamber_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc index 22d42167e0..4a1b0aa026 100644 --- a/data/layouts/Underwater_SootopolisCity/layout.inc +++ b/data/layouts/Underwater_SootopolisCity/layout.inc @@ -1,8 +1,6 @@ - .align 2 Underwater_SootopolisCity_MapBorder:: .incbin "data/layouts/Underwater_SootopolisCity/border.bin" - .align 2 Underwater_SootopolisCity_MapBlockdata:: .incbin "data/layouts/Underwater_SootopolisCity/map.bin" @@ -14,3 +12,4 @@ Underwater_SootopolisCity_Layout:: .4byte Underwater_SootopolisCity_MapBlockdata .4byte gTileset_General .4byte gTileset_Underwater + diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc index 2c7e821a9b..0c2a065a55 100644 --- a/data/layouts/UnionRoom/layout.inc +++ b/data/layouts/UnionRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnionRoom_MapBorder:: .incbin "data/layouts/UnionRoom/border.bin" - .align 2 UnionRoom_MapBlockdata:: .incbin "data/layouts/UnionRoom/map.bin" @@ -14,3 +12,4 @@ UnionRoom_Layout:: .4byte UnionRoom_MapBlockdata .4byte gTileset_Building .4byte gTileset_UnionRoom + diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc index 0f3b5504de..41e954b4ed 100644 --- a/data/layouts/UnknownMap_08417FC4/layout.inc +++ b/data/layouts/UnknownMap_08417FC4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08417FC4_MapBorder:: .incbin "data/layouts/UnknownMap_08417FC4/border.bin" - .align 2 UnknownMap_08417FC4_MapBlockdata:: .incbin "data/layouts/UnknownMap_08417FC4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08417FC4_Layout:: .4byte UnknownMap_08417FC4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc index 603919b424..f1695ec66b 100644 --- a/data/layouts/UnknownMap_08428450/layout.inc +++ b/data/layouts/UnknownMap_08428450/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08428450_MapBorder:: .incbin "data/layouts/UnknownMap_08428450/border.bin" - .align 2 UnknownMap_08428450_MapBlockdata:: .incbin "data/layouts/UnknownMap_08428450/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08428450_Layout:: .4byte UnknownMap_08428450_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc index 3e565369ae..f19bd682d7 100644 --- a/data/layouts/UnknownMap_084294C4/layout.inc +++ b/data/layouts/UnknownMap_084294C4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084294C4_MapBorder:: .incbin "data/layouts/UnknownMap_084294C4/border.bin" - .align 2 UnknownMap_084294C4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084294C4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084294C4_Layout:: .4byte UnknownMap_084294C4_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc index fd157b9991..e351524e16 100644 --- a/data/layouts/UnknownMap_084294E8/layout.inc +++ b/data/layouts/UnknownMap_084294E8/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084294E8_MapBorder:: .incbin "data/layouts/UnknownMap_084294E8/border.bin" - .align 2 UnknownMap_084294E8_MapBlockdata:: .incbin "data/layouts/UnknownMap_084294E8/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084294E8_Layout:: .4byte UnknownMap_084294E8_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc index 9cc060b768..fd01ddc105 100644 --- a/data/layouts/UnknownMap_0843E6C0/layout.inc +++ b/data/layouts/UnknownMap_0843E6C0/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E6C0_MapBorder:: .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" - .align 2 UnknownMap_0843E6C0_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E6C0_Layout:: .4byte UnknownMap_0843E6C0_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc index 5651df7df7..80ad931275 100644 --- a/data/layouts/UnknownMap_0843E6E4/layout.inc +++ b/data/layouts/UnknownMap_0843E6E4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E6E4_MapBorder:: .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" - .align 2 UnknownMap_0843E6E4_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E6E4_Layout:: .4byte UnknownMap_0843E6E4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc index b79c2d34b4..16d4e400ca 100644 --- a/data/layouts/UnknownMap_0843E708/layout.inc +++ b/data/layouts/UnknownMap_0843E708/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E708_MapBorder:: .incbin "data/layouts/UnknownMap_0843E708/border.bin" - .align 2 UnknownMap_0843E708_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E708/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E708_Layout:: .4byte UnknownMap_0843E708_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc index 36aee8b80c..c6541b3ea9 100644 --- a/data/layouts/UnknownMap_0843E72C/layout.inc +++ b/data/layouts/UnknownMap_0843E72C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E72C_MapBorder:: .incbin "data/layouts/UnknownMap_0843E72C/border.bin" - .align 2 UnknownMap_0843E72C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E72C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E72C_Layout:: .4byte UnknownMap_0843E72C_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc index c233955f1b..e566a93b71 100644 --- a/data/layouts/UnknownMap_0843E750/layout.inc +++ b/data/layouts/UnknownMap_0843E750/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E750_MapBorder:: .incbin "data/layouts/UnknownMap_0843E750/border.bin" - .align 2 UnknownMap_0843E750_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E750/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E750_Layout:: .4byte UnknownMap_0843E750_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc index bc2c238f33..ce1a438eb0 100644 --- a/data/layouts/UnknownMap_0843E774/layout.inc +++ b/data/layouts/UnknownMap_0843E774/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E774_MapBorder:: .incbin "data/layouts/UnknownMap_0843E774/border.bin" - .align 2 UnknownMap_0843E774_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E774/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E774_Layout:: .4byte UnknownMap_0843E774_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc index 352db474d4..179e0d881d 100644 --- a/data/layouts/UnknownMap_0843E798/layout.inc +++ b/data/layouts/UnknownMap_0843E798/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E798_MapBorder:: .incbin "data/layouts/UnknownMap_0843E798/border.bin" - .align 2 UnknownMap_0843E798_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E798/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E798_Layout:: .4byte UnknownMap_0843E798_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc index c0edd37eb1..907ec6266d 100644 --- a/data/layouts/UnknownMap_0843E7BC/layout.inc +++ b/data/layouts/UnknownMap_0843E7BC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E7BC_MapBorder:: .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" - .align 2 UnknownMap_0843E7BC_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E7BC_Layout:: .4byte UnknownMap_0843E7BC_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc index b421cf6629..c56046ef18 100644 --- a/data/layouts/UnknownMap_0843E7E0/layout.inc +++ b/data/layouts/UnknownMap_0843E7E0/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E7E0_MapBorder:: .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" - .align 2 UnknownMap_0843E7E0_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E7E0_Layout:: .4byte UnknownMap_0843E7E0_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc index d8bc1cfb09..49e32dbc76 100644 --- a/data/layouts/UnknownMap_0843E804/layout.inc +++ b/data/layouts/UnknownMap_0843E804/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E804_MapBorder:: .incbin "data/layouts/UnknownMap_0843E804/border.bin" - .align 2 UnknownMap_0843E804_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E804/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E804_Layout:: .4byte UnknownMap_0843E804_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc index dddd408cc4..3cbe672998 100644 --- a/data/layouts/UnknownMap_0843E828/layout.inc +++ b/data/layouts/UnknownMap_0843E828/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E828_MapBorder:: .incbin "data/layouts/UnknownMap_0843E828/border.bin" - .align 2 UnknownMap_0843E828_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E828/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E828_Layout:: .4byte UnknownMap_0843E828_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc index 34c5282d5a..7449536bf7 100644 --- a/data/layouts/UnknownMap_0843E84C/layout.inc +++ b/data/layouts/UnknownMap_0843E84C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E84C_MapBorder:: .incbin "data/layouts/UnknownMap_0843E84C/border.bin" - .align 2 UnknownMap_0843E84C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E84C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E84C_Layout:: .4byte UnknownMap_0843E84C_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc index 0ddc0f858d..23880a79c7 100644 --- a/data/layouts/UnknownMap_0843E870/layout.inc +++ b/data/layouts/UnknownMap_0843E870/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0843E870_MapBorder:: .incbin "data/layouts/UnknownMap_0843E870/border.bin" - .align 2 UnknownMap_0843E870_MapBlockdata:: .incbin "data/layouts/UnknownMap_0843E870/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0843E870_Layout:: .4byte UnknownMap_0843E870_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc index 0b3cc16977..e42bfcdd96 100755 --- a/data/layouts/UnknownMap_0843E894/layout.inc +++ b/data/layouts/UnknownMap_0843E894/layout.inc @@ -1,4 +1,3 @@ - .align 2 UnknownMap_0843E894_MapBorder:: .incbin "data/layouts/UnknownMap_0843E894/border.bin" @@ -13,3 +12,4 @@ UnknownMap_0843E894_Layout:: .4byte UnknownMap_0843E894_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc index ea5e6288d2..39d7bb18ab 100644 --- a/data/layouts/UnknownMap_08447028/layout.inc +++ b/data/layouts/UnknownMap_08447028/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08447028_MapBorder:: .incbin "data/layouts/UnknownMap_08447028/border.bin" - .align 2 UnknownMap_08447028_MapBlockdata:: .incbin "data/layouts/UnknownMap_08447028/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08447028_Layout:: .4byte UnknownMap_08447028_MapBlockdata .4byte gTileset_General .4byte 0 + diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc index d9951db4db..a180340f8b 100644 --- a/data/layouts/UnknownMap_0845A394/layout.inc +++ b/data/layouts/UnknownMap_0845A394/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845A394_MapBorder:: .incbin "data/layouts/UnknownMap_0845A394/border.bin" - .align 2 UnknownMap_0845A394_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845A394/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845A394_Layout:: .4byte UnknownMap_0845A394_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc index 36421f5031..ce6a4c819a 100644 --- a/data/layouts/UnknownMap_0845D470/layout.inc +++ b/data/layouts/UnknownMap_0845D470/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845D470_MapBorder:: .incbin "data/layouts/UnknownMap_0845D470/border.bin" - .align 2 UnknownMap_0845D470_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845D470/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845D470_Layout:: .4byte UnknownMap_0845D470_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc index ca018989b9..535c4a6e9a 100644 --- a/data/layouts/UnknownMap_0845ECB4/layout.inc +++ b/data/layouts/UnknownMap_0845ECB4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0845ECB4_MapBorder:: .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" - .align 2 UnknownMap_0845ECB4_MapBlockdata:: .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0845ECB4_Layout:: .4byte UnknownMap_0845ECB4_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc index babdb2c61b..22191c61cf 100644 --- a/data/layouts/UnknownMap_08469200/layout.inc +++ b/data/layouts/UnknownMap_08469200/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08469200_MapBorder:: .incbin "data/layouts/UnknownMap_08469200/border.bin" - .align 2 UnknownMap_08469200_MapBlockdata:: .incbin "data/layouts/UnknownMap_08469200/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08469200_Layout:: .4byte UnknownMap_08469200_MapBlockdata .4byte gTileset_General .4byte gTileset_Sootopolis + diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc index f4b882fdef..0106c666a5 100644 --- a/data/layouts/UnknownMap_084693AC/layout.inc +++ b/data/layouts/UnknownMap_084693AC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084693AC_MapBorder:: .incbin "data/layouts/UnknownMap_084693AC/border.bin" - .align 2 UnknownMap_084693AC_MapBlockdata:: .incbin "data/layouts/UnknownMap_084693AC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084693AC_Layout:: .4byte UnknownMap_084693AC_MapBlockdata .4byte gTileset_Building .4byte gTileset_BattlePike + diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc index f1a0e90eaa..671127587d 100644 --- a/data/layouts/UnknownMap_08470BD8/layout.inc +++ b/data/layouts/UnknownMap_08470BD8/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08470BD8_MapBorder:: .incbin "data/layouts/UnknownMap_08470BD8/border.bin" - .align 2 UnknownMap_08470BD8_MapBlockdata:: .incbin "data/layouts/UnknownMap_08470BD8/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08470BD8_Layout:: .4byte UnknownMap_08470BD8_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc index 8239461fcd..b440362392 100644 --- a/data/layouts/UnknownMap_08480DAC/layout.inc +++ b/data/layouts/UnknownMap_08480DAC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08480DAC_MapBorder:: .incbin "data/layouts/UnknownMap_08480DAC/border.bin" - .align 2 UnknownMap_08480DAC_MapBlockdata:: .incbin "data/layouts/UnknownMap_08480DAC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08480DAC_Layout:: .4byte UnknownMap_08480DAC_MapBlockdata .4byte gTileset_Building .4byte gTileset_Lab + diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc index 6916f61aed..4593a8ba47 100644 --- a/data/layouts/UnknownMap_08480F54/layout.inc +++ b/data/layouts/UnknownMap_08480F54/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08480F54_MapBorder:: .incbin "data/layouts/UnknownMap_08480F54/border.bin" - .align 2 UnknownMap_08480F54_MapBlockdata:: .incbin "data/layouts/UnknownMap_08480F54/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08480F54_Layout:: .4byte UnknownMap_08480F54_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc index 6e0116512c..6b73bfdcee 100644 --- a/data/layouts/UnknownMap_084810FC/layout.inc +++ b/data/layouts/UnknownMap_084810FC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084810FC_MapBorder:: .incbin "data/layouts/UnknownMap_084810FC/border.bin" - .align 2 UnknownMap_084810FC_MapBlockdata:: .incbin "data/layouts/UnknownMap_084810FC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084810FC_Layout:: .4byte UnknownMap_084810FC_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc index 3f7a2770d9..a394c8ef3f 100644 --- a/data/layouts/UnknownMap_084812A4/layout.inc +++ b/data/layouts/UnknownMap_084812A4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084812A4_MapBorder:: .incbin "data/layouts/UnknownMap_084812A4/border.bin" - .align 2 UnknownMap_084812A4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084812A4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084812A4_Layout:: .4byte UnknownMap_084812A4_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc index fe7f90b16b..cabe0b25b2 100644 --- a/data/layouts/UnknownMap_0848144C/layout.inc +++ b/data/layouts/UnknownMap_0848144C/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_0848144C_MapBorder:: .incbin "data/layouts/UnknownMap_0848144C/border.bin" - .align 2 UnknownMap_0848144C_MapBlockdata:: .incbin "data/layouts/UnknownMap_0848144C/map.bin" @@ -14,3 +12,4 @@ UnknownMap_0848144C_Layout:: .4byte UnknownMap_0848144C_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc index a501c6cc66..73ed49c79a 100644 --- a/data/layouts/UnknownMap_084815F4/layout.inc +++ b/data/layouts/UnknownMap_084815F4/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_084815F4_MapBorder:: .incbin "data/layouts/UnknownMap_084815F4/border.bin" - .align 2 UnknownMap_084815F4_MapBlockdata:: .incbin "data/layouts/UnknownMap_084815F4/map.bin" @@ -14,3 +12,4 @@ UnknownMap_084815F4_Layout:: .4byte UnknownMap_084815F4_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc index 52a6a8acf8..250528be04 100644 --- a/data/layouts/UnknownMap_08481B24/layout.inc +++ b/data/layouts/UnknownMap_08481B24/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08481B24_MapBorder:: .incbin "data/layouts/UnknownMap_08481B24/border.bin" - .align 2 UnknownMap_08481B24_MapBlockdata:: .incbin "data/layouts/UnknownMap_08481B24/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08481B24_Layout:: .4byte UnknownMap_08481B24_MapBlockdata .4byte gTileset_General .4byte gTileset_Pacifidlog + diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc index 314a94b885..465b92dc82 100644 --- a/data/layouts/UnknownMap_08481DBC/layout.inc +++ b/data/layouts/UnknownMap_08481DBC/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_08481DBC_MapBorder:: .incbin "data/layouts/UnknownMap_08481DBC/border.bin" - .align 2 UnknownMap_08481DBC_MapBlockdata:: .incbin "data/layouts/UnknownMap_08481DBC/map.bin" @@ -14,3 +12,4 @@ UnknownMap_08481DBC_Layout:: .4byte UnknownMap_08481DBC_MapBlockdata .4byte gTileset_Building .4byte gTileset_MysteryEventsHouse + diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc index 30eb032e48..bb7002a20e 100644 --- a/data/layouts/UnknownMap_25_29/layout.inc +++ b/data/layouts/UnknownMap_25_29/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_29_MapBorder:: .incbin "data/layouts/UnknownMap_25_29/border.bin" - .align 2 UnknownMap_25_29_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_29/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_29_Layout:: .4byte UnknownMap_25_29_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc index 3423735c3a..5937a21952 100644 --- a/data/layouts/UnknownMap_25_30/layout.inc +++ b/data/layouts/UnknownMap_25_30/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_30_MapBorder:: .incbin "data/layouts/UnknownMap_25_30/border.bin" - .align 2 UnknownMap_25_30_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_30/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_30_Layout:: .4byte UnknownMap_25_30_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc index 20fbdc9c8d..3dcbc7986a 100644 --- a/data/layouts/UnknownMap_25_31/layout.inc +++ b/data/layouts/UnknownMap_25_31/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_31_MapBorder:: .incbin "data/layouts/UnknownMap_25_31/border.bin" - .align 2 UnknownMap_25_31_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_31/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_31_Layout:: .4byte UnknownMap_25_31_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc index 2efcab4e06..0ffe4c0b7c 100644 --- a/data/layouts/UnknownMap_25_32/layout.inc +++ b/data/layouts/UnknownMap_25_32/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_32_MapBorder:: .incbin "data/layouts/UnknownMap_25_32/border.bin" - .align 2 UnknownMap_25_32_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_32/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_32_Layout:: .4byte UnknownMap_25_32_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc index 4d27276dcf..3f8113a6fb 100644 --- a/data/layouts/UnknownMap_25_33/layout.inc +++ b/data/layouts/UnknownMap_25_33/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_33_MapBorder:: .incbin "data/layouts/UnknownMap_25_33/border.bin" - .align 2 UnknownMap_25_33_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_33/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_33_Layout:: .4byte UnknownMap_25_33_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc index 3dea1f9af4..6001d8fe79 100644 --- a/data/layouts/UnknownMap_25_34/layout.inc +++ b/data/layouts/UnknownMap_25_34/layout.inc @@ -1,8 +1,6 @@ - .align 2 UnknownMap_25_34_MapBorder:: .incbin "data/layouts/UnknownMap_25_34/border.bin" - .align 2 UnknownMap_25_34_MapBlockdata:: .incbin "data/layouts/UnknownMap_25_34/map.bin" @@ -14,3 +12,4 @@ UnknownMap_25_34_Layout:: .4byte UnknownMap_25_34_MapBlockdata .4byte gTileset_Building .4byte gTileset_Contest + diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc index 2f329b9303..ce58c0798e 100644 --- a/data/layouts/VerdanturfTown/layout.inc +++ b/data/layouts/VerdanturfTown/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_MapBorder:: .incbin "data/layouts/VerdanturfTown/border.bin" - .align 2 VerdanturfTown_MapBlockdata:: .incbin "data/layouts/VerdanturfTown/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_Layout:: .4byte VerdanturfTown_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc index 89d82169cc..21fca69535 100644 --- a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc +++ b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_BattleTentBattleRoom_MapBorder:: .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" - .align 2 VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_BattleTentBattleRoom_Layout:: .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata .4byte gTileset_General .4byte gTileset_BattleTent + diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc index 8791f34bb2..ae5d1a7cf6 100644 --- a/data/layouts/VerdanturfTown_WandasHouse/layout.inc +++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc @@ -1,8 +1,6 @@ - .align 2 VerdanturfTown_WandasHouse_MapBorder:: .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" - .align 2 VerdanturfTown_WandasHouse_MapBlockdata:: .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" @@ -14,3 +12,4 @@ VerdanturfTown_WandasHouse_Layout:: .4byte VerdanturfTown_WandasHouse_MapBlockdata .4byte gTileset_Building .4byte gTileset_GenericBuilding + diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc index 9ef50f7430..31e0fede38 100644 --- a/data/layouts/VictoryRoad_1F/layout.inc +++ b/data/layouts/VictoryRoad_1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_1F_MapBorder:: .incbin "data/layouts/VictoryRoad_1F/border.bin" - .align 2 VictoryRoad_1F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_1F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_1F_Layout:: .4byte VictoryRoad_1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc index fed9804feb..9ce7223e1e 100644 --- a/data/layouts/VictoryRoad_B1F/layout.inc +++ b/data/layouts/VictoryRoad_B1F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_B1F_MapBorder:: .incbin "data/layouts/VictoryRoad_B1F/border.bin" - .align 2 VictoryRoad_B1F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_B1F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_B1F_Layout:: .4byte VictoryRoad_B1F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc index 77a9542f96..23c500cbe4 100644 --- a/data/layouts/VictoryRoad_B2F/layout.inc +++ b/data/layouts/VictoryRoad_B2F/layout.inc @@ -1,8 +1,6 @@ - .align 2 VictoryRoad_B2F_MapBorder:: .incbin "data/layouts/VictoryRoad_B2F/border.bin" - .align 2 VictoryRoad_B2F_MapBlockdata:: .incbin "data/layouts/VictoryRoad_B2F/map.bin" @@ -14,3 +12,4 @@ VictoryRoad_B2F_Layout:: .4byte VictoryRoad_B2F_MapBlockdata .4byte gTileset_General .4byte gTileset_Cave + diff --git a/data/layouts_table.inc b/data/layouts_table.inc index 3f94138fbb..bd67fb6f97 100644 --- a/data/layouts_table.inc +++ b/data/layouts_table.inc @@ -1,5 +1,5 @@ - .align 2 -gMapLayouts:: @ 8481DD4 + .align 2 +gMapLayouts:: .4byte PetalburgCity_Layout .4byte SlateportCity_Layout .4byte MauvilleCity_Layout @@ -159,9 +159,9 @@ gMapLayouts:: @ 8481DD4 .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_B1F_Layout + .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout + .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout + .4byte CaveOfOrigin_B1F_Layout .4byte VictoryRoad_1F_Layout .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideInnerRoom_Layout @@ -169,20 +169,20 @@ gMapLayouts:: @ 8481DD4 .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideInnerRoom_Layout - .4byte UnknownMap_0843E6C0_Layout @ unused maps - .4byte UnknownMap_0843E6E4_Layout - .4byte UnknownMap_0843E708_Layout - .4byte UnknownMap_0843E72C_Layout - .4byte UnknownMap_0843E750_Layout - .4byte UnknownMap_0843E774_Layout - .4byte UnknownMap_0843E798_Layout - .4byte UnknownMap_0843E7BC_Layout - .4byte UnknownMap_0843E7E0_Layout - .4byte UnknownMap_0843E804_Layout - .4byte UnknownMap_0843E828_Layout - .4byte UnknownMap_0843E84C_Layout - .4byte UnknownMap_0843E870_Layout - .4byte UnknownMap_0843E894_Layout + .4byte UnknownMap_0843E6C0_Layout + .4byte UnknownMap_0843E6E4_Layout + .4byte UnknownMap_0843E708_Layout + .4byte UnknownMap_0843E72C_Layout + .4byte UnknownMap_0843E750_Layout + .4byte UnknownMap_0843E774_Layout + .4byte UnknownMap_0843E798_Layout + .4byte UnknownMap_0843E7BC_Layout + .4byte UnknownMap_0843E7E0_Layout + .4byte UnknownMap_0843E804_Layout + .4byte UnknownMap_0843E828_Layout + .4byte UnknownMap_0843E84C_Layout + .4byte UnknownMap_0843E870_Layout + .4byte UnknownMap_0843E894_Layout .4byte NewMauville_Entrance_Layout .4byte NewMauville_Inside_Layout .4byte AbandonedShip_Deck_Layout @@ -241,8 +241,8 @@ gMapLayouts:: @ 8481DD4 .4byte SafariZone_North_Layout .4byte SafariZone_Southwest_Layout .4byte SafariZone_South_Layout - .4byte UnknownMap_08447028_Layout - .4byte Route109_SeashoreHouse_Layout + .4byte UnknownMap_08447028_Layout + .4byte Route109_SeashoreHouse_Layout .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseCorridor_Layout @@ -331,114 +331,113 @@ gMapLayouts:: @ 8481DD4 .4byte SafariZone_RestHouse_Layout .4byte SkyPillar_5F_Layout .4byte SkyPillar_Top_Layout - .4byte BattleFrontier_BattleDomeLobby_Layout - .4byte BattleFrontier_BattleDomeCorridor_Layout - .4byte BattleFrontier_BattleDomePreBattleRoom_Layout - .4byte BattleFrontier_BattleDomeBattleRoom_Layout - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_2F_1R_Layout - .4byte MagmaHideout_2F_2R_Layout - .4byte MagmaHideout_3F_1R_Layout - .4byte MagmaHideout_3F_2R_Layout - .4byte MagmaHideout_4F_Layout - .4byte BattleFrontier_BattlePalaceLobby_Layout - .4byte BattleFrontier_BattlePalaceCorridor_Layout - .4byte BattleFrontier_BattlePalaceBattleRoom_Layout - .4byte BattleFrontier_OutsideEast_Layout - .4byte BattleFrontier_BattleFactoryLobby_Layout - .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryBattleRoom_Layout - .4byte BattleFrontier_BattlePikeLobby_Layout - .4byte BattleFrontier_BattlePikeCorridor_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeRandomRoom1_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattleArenaLobby_Layout - .4byte BattleFrontier_BattleArenaCorridor_Layout - .4byte BattleFrontier_BattleArenaBattleRoom_Layout - .4byte UnknownMap_08469200_Layout - .4byte BattleFrontier_BattlePikeRandomRoom3_Layout - .4byte UnknownMap_084693AC_Layout - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattlePyramidSquare01_Layout - .4byte BattlePyramidSquare02_Layout - .4byte BattlePyramidSquare03_Layout - .4byte BattlePyramidSquare04_Layout - .4byte BattlePyramidSquare05_Layout - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare07_Layout - .4byte BattlePyramidSquare08_Layout - .4byte BattlePyramidSquare09_Layout - .4byte BattlePyramidSquare10_Layout - .4byte BattlePyramidSquare11_Layout - .4byte BattlePyramidSquare12_Layout - .4byte BattlePyramidSquare13_Layout - .4byte BattlePyramidSquare14_Layout - .4byte BattlePyramidSquare15_Layout - .4byte BattlePyramidSquare16_Layout - .4byte BattleFrontier_BattlePyramidTop_Layout - .4byte MagmaHideout_3F_3R_Layout - .4byte MagmaHideout_2F_3R_Layout - .4byte MirageTower_1F_Layout - .4byte MirageTower_2F_Layout - .4byte MirageTower_3F_Layout - .4byte BattleTentLobby_Layout - .4byte BattleTentCorridor_Layout - .4byte BattleTentBattleRoom_Layout - .4byte VerdanturfTown_BattleTentBattleRoom_Layout - .4byte MirageTower_4F_Layout - .4byte DesertUnderpass_Layout - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout - .4byte BattleFrontier_BattleTowerCorridor2_Layout - .4byte UnknownMap_08470BD8_Layout - .4byte UnionRoom_Layout - .4byte SafariZone_Northeast_Layout - .4byte SafariZone_Southeast_Layout - .4byte BattleFrontier_RankingHall_Layout - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout - .4byte BattleFrontier_ReceptionGate_Layout - .4byte ArtisanCave_B1F_Layout - .4byte ArtisanCave_1F_Layout - .4byte FarawayIsland_Entrance_Layout - .4byte FarawayIsland_Interior_Layout - .4byte BirthIsland_Exterior_Layout - .4byte IslandHarbor_Layout - .4byte Underwater_MarineCave_Layout - .4byte MarineCave_Entrance_Layout - .4byte TerraCave_Entrance_Layout - .4byte TerraCave_End_Layout - .4byte Underwater6_Layout - .4byte Underwater7_Layout - .4byte Underwater5_Layout - .4byte MarineCave_End_Layout - .4byte TrainerHill_Entrance_Layout - .4byte TrainerHill_1F_Layout - .4byte TrainerHill_2F_Layout - .4byte TrainerHill_3F_Layout - .4byte TrainerHill_4F_Layout - .4byte TrainerHill_Roof_Layout - .4byte AlteringCave_Layout - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_Entrance_Layout - .4byte NavelRock_Top_Layout - .4byte NavelRock_Bottom_Layout - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_B1F_Layout - .4byte NavelRock_Fork_Layout - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_ScottsHouse_Layout - .4byte MeteorFalls_StevensCave_Layout - .4byte UnknownMap_08480DAC_Layout - .4byte UnknownMap_08480F54_Layout - .4byte UnknownMap_084810FC_Layout - .4byte UnknownMap_084812A4_Layout - .4byte UnknownMap_0848144C_Layout - .4byte UnknownMap_084815F4_Layout - .4byte UnknownMap_08481B24_Layout - .4byte SootopolisCity_MysteryEventsHouse_1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout - .4byte UnknownMap_08481DBC_Layout - + .4byte BattleFrontier_BattleDomeLobby_Layout + .4byte BattleFrontier_BattleDomeCorridor_Layout + .4byte BattleFrontier_BattleDomePreBattleRoom_Layout + .4byte BattleFrontier_BattleDomeBattleRoom_Layout + .4byte MagmaHideout_1F_Layout + .4byte MagmaHideout_2F_1R_Layout + .4byte MagmaHideout_2F_2R_Layout + .4byte MagmaHideout_3F_1R_Layout + .4byte MagmaHideout_3F_2R_Layout + .4byte MagmaHideout_4F_Layout + .4byte BattleFrontier_BattlePalaceLobby_Layout + .4byte BattleFrontier_BattlePalaceCorridor_Layout + .4byte BattleFrontier_BattlePalaceBattleRoom_Layout + .4byte BattleFrontier_OutsideEast_Layout + .4byte BattleFrontier_BattleFactoryLobby_Layout + .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout + .4byte BattleFrontier_BattleFactoryBattleRoom_Layout + .4byte BattleFrontier_BattlePikeLobby_Layout + .4byte BattleFrontier_BattlePikeCorridor_Layout + .4byte BattleFrontier_BattlePikeThreePathRoom_Layout + .4byte BattleFrontier_BattlePikeRandomRoom1_Layout + .4byte BattleFrontier_BattlePikeRandomRoom2_Layout + .4byte BattleFrontier_BattleArenaLobby_Layout + .4byte BattleFrontier_BattleArenaCorridor_Layout + .4byte BattleFrontier_BattleArenaBattleRoom_Layout + .4byte UnknownMap_08469200_Layout + .4byte BattleFrontier_BattlePikeRandomRoom3_Layout + .4byte UnknownMap_084693AC_Layout + .4byte BattleFrontier_BattlePyramidLobby_Layout + .4byte BattleFrontier_BattlePyramidEmptySquare_Layout + .4byte BattlePyramidSquare01_Layout + .4byte BattlePyramidSquare02_Layout + .4byte BattlePyramidSquare03_Layout + .4byte BattlePyramidSquare04_Layout + .4byte BattlePyramidSquare05_Layout + .4byte BattlePyramidSquare06_Layout + .4byte BattlePyramidSquare07_Layout + .4byte BattlePyramidSquare08_Layout + .4byte BattlePyramidSquare09_Layout + .4byte BattlePyramidSquare10_Layout + .4byte BattlePyramidSquare11_Layout + .4byte BattlePyramidSquare12_Layout + .4byte BattlePyramidSquare13_Layout + .4byte BattlePyramidSquare14_Layout + .4byte BattlePyramidSquare15_Layout + .4byte BattlePyramidSquare16_Layout + .4byte BattleFrontier_BattlePyramidTop_Layout + .4byte MagmaHideout_3F_3R_Layout + .4byte MagmaHideout_2F_3R_Layout + .4byte MirageTower_1F_Layout + .4byte MirageTower_2F_Layout + .4byte MirageTower_3F_Layout + .4byte BattleTentLobby_Layout + .4byte BattleTentCorridor_Layout + .4byte BattleTentBattleRoom_Layout + .4byte VerdanturfTown_BattleTentBattleRoom_Layout + .4byte MirageTower_4F_Layout + .4byte DesertUnderpass_Layout + .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout + .4byte BattleFrontier_BattleTowerCorridor2_Layout + .4byte UnknownMap_08470BD8_Layout + .4byte UnionRoom_Layout + .4byte SafariZone_Northeast_Layout + .4byte SafariZone_Southeast_Layout + .4byte BattleFrontier_RankingHall_Layout + .4byte BattleFrontier_Lounge1_Layout + .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout + .4byte BattleFrontier_ReceptionGate_Layout + .4byte ArtisanCave_B1F_Layout + .4byte ArtisanCave_1F_Layout + .4byte FarawayIsland_Entrance_Layout + .4byte FarawayIsland_Interior_Layout + .4byte BirthIsland_Exterior_Layout + .4byte IslandHarbor_Layout + .4byte Underwater_MarineCave_Layout + .4byte MarineCave_Entrance_Layout + .4byte TerraCave_Entrance_Layout + .4byte TerraCave_End_Layout + .4byte Underwater6_Layout + .4byte Underwater7_Layout + .4byte Underwater5_Layout + .4byte MarineCave_End_Layout + .4byte TrainerHill_Entrance_Layout + .4byte TrainerHill_1F_Layout + .4byte TrainerHill_2F_Layout + .4byte TrainerHill_3F_Layout + .4byte TrainerHill_4F_Layout + .4byte TrainerHill_Roof_Layout + .4byte AlteringCave_Layout + .4byte NavelRock_Exterior_Layout + .4byte NavelRock_Entrance_Layout + .4byte NavelRock_Top_Layout + .4byte NavelRock_Bottom_Layout + .4byte NavelRock_LadderRoom1_Layout + .4byte NavelRock_LadderRoom2_Layout + .4byte NavelRock_B1F_Layout + .4byte NavelRock_Fork_Layout + .4byte BattleFrontier_Lounge2_Layout + .4byte BattleFrontier_ScottsHouse_Layout + .4byte MeteorFalls_StevensCave_Layout + .4byte UnknownMap_08480DAC_Layout + .4byte UnknownMap_08480F54_Layout + .4byte UnknownMap_084810FC_Layout + .4byte UnknownMap_084812A4_Layout + .4byte UnknownMap_0848144C_Layout + .4byte UnknownMap_084815F4_Layout + .4byte UnknownMap_08481B24_Layout + .4byte SootopolisCity_MysteryEventsHouse_1F_Layout + .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout + .4byte UnknownMap_08481DBC_Layout From 5434db2fc6f4e7ebd8cb6bc76115d5c3b6b5807e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:22:09 +0200 Subject: [PATCH 8/9] use region map constants --- src/battle_tent.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/battle_tent.c b/src/battle_tent.c index 85640e8e5b..64eba1658e 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -9,6 +9,7 @@ #include "random.h" #include "item.h" #include "constants/items.h" +#include "constants/region_map_sections.h" // this file's functions void sub_81B99D4(void); @@ -262,6 +263,6 @@ void sub_81B9E88(void) bool8 sub_81B9E94(void) { - return (gMapHeader.regionMapSectionId == 8 + return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY && ((gMapHeader.mapDataId == 385) | (gMapHeader.mapDataId == 386))); } From 97712ec931febe390861f2234e26a66f15c9c295 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 30 Jun 2018 14:52:13 +0200 Subject: [PATCH 9/9] change mapDataId to mapLayoutId --- src/battle_tent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_tent.c b/src/battle_tent.c index 64eba1658e..68d7c5e83d 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -264,5 +264,5 @@ void sub_81B9E88(void) bool8 sub_81B9E94(void) { return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY - && ((gMapHeader.mapDataId == 385) | (gMapHeader.mapDataId == 386))); + && ((gMapHeader.mapLayoutId == 385) | (gMapHeader.mapLayoutId == 386))); }